Skip to content

hotfix/release/support start does not accept tags as base #234

Closed
wants to merge 123 commits into from

5 participants

@baby-gnu
baby-gnu commented Jul 9, 2012

Commit pointed by tags are reachable with ^0[1].

  • gitflow-common (git_is_ancestor): Dereference tags.

Footnotes:
[1] https://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html

and others added some commits Mar 19, 2010
@nvie Merge branch 'hotfix/0.2.1' f8ea3eb
@nvie Merge branch 'release/0.3' 298514b
@nvie Merge branch 'release/0.4' dc5d08d
@nvie Merge branch 'release/0.4.1' 1ffb6b1
@petervanderdoes petervanderdoes Add directory setup to the git flow init process
git flow will fail when the directories are not setup in the git config.

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
3f8934e
@petervanderdoes petervanderdoes Rename the Hooks directory variable.
Renamed so it won't be confused with the already present GITFLOW_DIR variable, which holds the dorectory info of where the gitflow scripts are located.

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
3c2852f
@petervanderdoes petervanderdoes Implements do_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
dcf0c6d
@petervanderdoes petervanderdoes Add the pre and post hook calls.
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
3b63d1f
@petervanderdoes petervanderdoes Add some documentation to the do_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
46007c5
@petervanderdoes petervanderdoes Remove trailing whitespace
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
6ec1707
@petervanderdoes petervanderdoes Makes the feature more compliant with nvie comments in #171
Renames the called hooks to new proposed naming convention.
Removes the configurable configuration/hooks directory. All hooks are to be stored in .git/hooks

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
02200f0
@petervanderdoes petervanderdoes Add directory setup to the git flow init process
git flow will fail when the directories are not setup in the git config.

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
cbe180f
@petervanderdoes petervanderdoes Rename the Hooks directory variable.
Renamed so it won't be confused with the already present GITFLOW_DIR variable, which holds the dorectory info of where the gitflow scripts are located.

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
e4e0e0c
@petervanderdoes petervanderdoes Implements do_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
178cecb
@petervanderdoes petervanderdoes Add the pre and post hook calls.
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
56ec32c
@petervanderdoes petervanderdoes Add some documentation to the do_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
c2fe6c7
@petervanderdoes petervanderdoes Remove trailing whitespace
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
7c03411
@petervanderdoes petervanderdoes Makes the feature more compliant with nvie comments in #171
Renames the called hooks to new proposed naming convention.
Removes the configurable configuration/hooks directory. All hooks are to be stored in .git/hooks

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
e93a50b
@nvie Revert all whitespace changes. 31e637d
@nvie Refactor the code a bit.
It now has explicit pre and post functions to communicate the difference
in exit code handling.  Also, allow for passing in positional arguments
that make sense on a per-action basis.
203a793
@nvie Call the hooks explicitly on a per-action basis, with positional
arguments that are relevant for the action at hand.
359db20
@nvie Add some example hook scripts. 9283eae
@petervanderdoes petervanderdoes Merge remote-tracking branch 'nvie/feature/implement-hooks' into feat…
…ure/implement-hooks

Conflicts:
	gitflow-common
db254ba
@petervanderdoes petervanderdoes Merge remote-tracking branch 'nvie/feature/implement-hooks' into feat…
…ure/implement-hooks

Conflicts:
	gitflow-common
d30411b
@petervanderdoes petervanderdoes Merge branch 'feature/implement-hooks' of github.com:petervanderdoes/…
…gitflow into feature/implement-hooks
5b17e4d
@petervanderdoes petervanderdoes Implements universal run_filter_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
54b01d5
@petervanderdoes petervanderdoes Adds filter to git flow hotfix start
Example of the filter script added.

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
22ccaed
@petervanderdoes petervanderdoes Adds filter hook version in for release start
Also adds sample script.

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
104af03
@petervanderdoes petervanderdoes Adds some comments to the sample scripts
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
a0a40e1
@petervanderdoes petervanderdoes Merge branch 'feature/implement-version-filter' into develop 62486a1
@petervanderdoes petervanderdoes Start of the AVH release of git flow d5f6706
@petervanderdoes petervanderdoes Add Peter van der Does as an author 0ab7ebd
@petervanderdoes petervanderdoes Update the version number in the script itself as well
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
10df1fb
@petervanderdoes petervanderdoes Adds pre/post hooks
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
07c40b0
@petervanderdoes petervanderdoes Add bare-bone hook scripts for feature and hotfix.
Bare bone pre and post cripts for the hooks of "git flow feature" and "git flow hotfix"

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
c488c4d
@bloveridge bloveridge set EXPR_COMPAT=1 if running inside freebsd so shFlags works correctly 4c9de67
@petervanderdoes petervanderdoes Implements hooks for git flow release
Hooks added
Bare bone scripts for git flow release added
Fixes wrong post hook call for git flow hotfix publish

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
b5dd304
@petervanderdoes petervanderdoes Merge remote-tracking branch 'bloveridge/feature/fix_freebsd_shflags'…
… into develop
d284a9d
@petervanderdoes petervanderdoes Nicer looking Changes
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
ecd4437
@petervanderdoes petervanderdoes Markdown error
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
606f695
@petervanderdoes petervanderdoes Merge branch 'feature/implement-hooks' into develop
Conflicts:
	gitflow-common
e668f69
@petervanderdoes petervanderdoes Updated instructions c150245
@petervanderdoes petervanderdoes Remove leftover merge conflict e0a5091
@petervanderdoes petervanderdoes Install hook files
The hook files are installed in doc/gitflow/hooks
e7d3fd0
@petervanderdoes petervanderdoes Remove trailing whitespace 2977037
@petervanderdoes petervanderdoes Post hook needs to run before the hotfix branch is deleted. 9308a34
@petervanderdoes petervanderdoes Post hook needs to run before the release branch is deleted. 36a61ed
@petervanderdoes petervanderdoes Merge branch 'nvie.develop' into work
Conflicts:
	AUTHORS
	README.mdown
8588f20
@petervanderdoes petervanderdoes Update to nvie develop branch.
Some missing features of the 0.4.2 version are added.
c280206
@petervanderdoes petervanderdoes Remove the submodule shFlags.
Instead of the submodule we'll just use the file.
2bad93d
@petervanderdoes petervanderdoes Update Changes.mdown 5c94f98
@petervanderdoes petervanderdoes Typo when pulling existing feature from remote. 94f6fbc
@petervanderdoes petervanderdoes Remove the Still Maintained reference
Still Maintained is no longer up.
5b5bf38
@petervanderdoes petervanderdoes Update to git-flow make-less installer for *nix systems, by Rick Osborne
Installer now pulls from the petervanderdoes/gitflow branch.
Installs the hooks as well.
9b58904
@petervanderdoes petervanderdoes No need to copy gitflow-shFlags separately. 17cad61
@petervanderdoes petervanderdoes Use the tag for back-merging when finishing a release/hotfix.
When a release or hotfix branch is tagged, the tag is never merged into the develop branch, it is preferable to have the tag in the develop branch as well, for use with git describe for example.
de9dc16
@petervanderdoes petervanderdoes Added licenses and changed the contribute reference.
As the license added to the software includes the original authors name, I've added the same license, FreeBSD, but more general formulated.

Added the needed license text for the code shFlags.

Changed the contribute reference to reflect the URL where this fork is hosted.
c7655d1
@petervanderdoes petervanderdoes No need for the debien entries in gitignore.
As the file is empty we just delete it.
6468a54
@petervanderdoes petervanderdoes Documentation update. 34cc663
@petervanderdoes petervanderdoes Markdown 0493c95
@petervanderdoes petervanderdoes Changes license info. cf4a72e
@petervanderdoes petervanderdoes Update the usage output.
The no-tagging option is missing in the output.
a1dc4d3
@petervanderdoes petervanderdoes Commentary updates. 83a0aeb
@petervanderdoes petervanderdoes Another small documentation fix. 64d749d
@petervanderdoes petervanderdoes Using the new git flow filters and hooks to bump the version.
We automatically update the version when we do a release, there's no need for this file anymore.
54cd79a
@sinbad sinbad Fixes the suggested name for the integration branch.
When git init -d is executed on a repo with multiple branches, the suggested
name for the integration branch could possibly be the same name that was
already selected for the production release branch.

If no suggested name is determined the suggested name remains empty which
leads to all sorts of other problems.
b33102c
@petervanderdoes petervanderdoes Merge branch 'sinbad/feature/fix_default_behaviour' into develop ee28376
@petervanderdoes petervanderdoes Update the Changelog.
Add several people who identified a bug, added missed changelog entry.
cfda148
@petervanderdoes petervanderdoes Missed one person. a5b8a72
@petervanderdoes petervanderdoes Setup .mailmap
This list is used by git-shortlog to fix a few botched names in the git-flow repo, either because the author's full name was messed up and/or not always written the same way, making contributions from the same person appearing not to be so.
2027ef6
@petervanderdoes petervanderdoes Update of the contributers. 36a7a27
@petervanderdoes petervanderdoes Change formatting in the files.
We change a bit of the formatting in the files.
22da604
@petervanderdoes petervanderdoes Version bump 1.0-avh 98de686
@petervanderdoes petervanderdoes Wrong variable names in the bare-bones
The wrong variable name is set, this can lead to confusing on what's passed to the script
594768a
@petervanderdoes petervanderdoes Update the Changelog 20177d8
@petervanderdoes petervanderdoes Merge branch 'release/1.0-avh' 1e7b5d5
@petervanderdoes petervanderdoes Merge tag '1.0-avh' into develop
Tagged 1.0-avh

First official release of the AVH version of git-flow
26e4bfc
@petervanderdoes petervanderdoes Preparation for new version 6d9c1e7
@petervanderdoes petervanderdoes Improve the back-merge functionality
Adds an command line option (-b), which the user can utilize if the user
doesn't want to back-merge but rather merge the release branch into
develop.
04a3636
@petervanderdoes petervanderdoes Add entry to the changelog about the new feature. f416f2d
@petervanderdoes petervanderdoes Merge branch 'feature/backmerge_master_in_develop_on_finish' into dev…
…elop
83704f4
@petervanderdoes petervanderdoes Update the Changelog 71a8204
@petervanderdoes petervanderdoes Implement the subaction delete in action feature 3053784
@petervanderdoes petervanderdoes Implement the subaction delete in action hotfix 591533c
@petervanderdoes petervanderdoes Implement the subaction delete in action release 9130144
@petervanderdoes petervanderdoes Clean up some typos
Some typos in the comments.
git-flow-hotfix passed an unknown variable to the post hook.
f6276f1
@petervanderdoes petervanderdoes Add option to also delete remote branch. 66b15df
@petervanderdoes petervanderdoes Add bare-bone hooks for delete sub action b830bae
@petervanderdoes petervanderdoes Add the -r option to the usage output. 2a733a1
@petervanderdoes petervanderdoes Update about the new feature. b0aa6a7
@petervanderdoes petervanderdoes Redundant check. c3fd1d3
@petervanderdoes petervanderdoes Version bump 1.0.6-avh 2e50ea7
@petervanderdoes petervanderdoes Merge branch 'feature/delete-branches' into develop 9ad63e4
@petervanderdoes petervanderdoes Add the new sub-action delete to the README file c08b543
@petervanderdoes petervanderdoes Remove porcelain commands, rewrite some code.
This will increase the speed up of the scripts and we don't have to
worry about changes in the layout of the output of the porcelain
commands.
6e8f266
@petervanderdoes petervanderdoes Use function git_current_branch
In some cases the defined function was not used, but porcelain functions
were used to determine the current branch.
50f9158
@petervanderdoes petervanderdoes Add new function to get prefixed branches.
Adds a new fucntion to gitflow-common to get all local branches that
start with the give prefix.
b2b13ab
@petervanderdoes petervanderdoes Rewrite functions
Write the if statements in a one-liner.
886b702
@petervanderdoes petervanderdoes Eliminante external call to sed. 60e31e9
@petervanderdoes petervanderdoes Die when branch can't be created in action start 8491b55
@petervanderdoes petervanderdoes Use function git_remote_branch_exists
Instead of using the functions has and git_remote_branches we'll be
using the new function git_remote_branch_exists.
7420485
@petervanderdoes petervanderdoes Introduce new function git_is_ancestor
When starting a release, hotfix or support, you can give a starting
base, this base needs to be an ancestor of either the develop_branch,
master_branch or master_branch respectively.
b973b48
@petervanderdoes petervanderdoes Remove majority of multi-line line.
Some lines of code were broken up by the \ character so it would fit in 80 characters. I don't need that as my screen is wide enough.
6edd55c
@petervanderdoes petervanderdoes Small cleanup f860d9e
@petervanderdoes petervanderdoes Unify the die function calls. bee5d0f
@petervanderdoes petervanderdoes Make function require_version_arg a common function.
Instead of defining the same function in multiple scripts, we created a
new common function gitflow_require_version_arg
2b82519
@petervanderdoes petervanderdoes Make function require_name_arg a common function.
Instead of defining the same function in multiple scripts, we created a
new common function gitflow_require_name_arg
e4484a7
@petervanderdoes petervanderdoes Make function require_base_arg a common function.
Instead of defining the same function in multiple scripts, we created a
new common function gitflow_require_base_arg
a8b4420
@petervanderdoes petervanderdoes No need to eval this. e5ebd41
@petervanderdoes petervanderdoes Consistency in function calling 31c7935
@petervanderdoes petervanderdoes Add Changelog entry aeb5aea
@petervanderdoes petervanderdoes Version bump 1.0.35-avh c298c3d
@petervanderdoes petervanderdoes Merge branch 'feature/clean-up-code' into develop 40c8799
@petervanderdoes petervanderdoes Text fix in Changes.mdown 4a645d1
Daniel Dehennin Fix flag test in cmd_delete()
The release, feature and hotfix delete output a test error:

    line 573: [: flag: unary operator expected

It's errornous to call "flag" in "[ ]".

* git-flow-feature (cmd_delete): Do not use "[ ]".

* git-flow-hotfix (cmd_delete): Ditoo.

* git-flow-release (cmd_delete): Ditoo.
cf2ab01
@petervanderdoes petervanderdoes Merge pull request #3 from baby-gnu/feature/fix-flag-test-in-cmd_delete
Fix flag test in cmd_delete()
02ea741
@petervanderdoes petervanderdoes Update to reflect recent changes. 0788d73
@petervanderdoes petervanderdoes Version bump 1.0.41-avh 8b7cdf7
@petervanderdoes petervanderdoes Preparation for feature Add_init()_function_git-flow-{feature,release…
…,hotfix,support}
05a5cbd
@petervanderdoes petervanderdoes Add init to git-flow-{feature,release,hotfix,support}
Fixes the relatively minor issue where 'git flow subcommand help' gives
"Not a gitflow-enabled repo yet"
c60a910
@petervanderdoes petervanderdoes Version bump 1.0.44-avh 15a3c6f
@petervanderdoes petervanderdoes Merge branch 'feature/add_init_function' into develop 714b37f
Daniel Dehennin hotfix/release/support start does not accept tags as base
Commit pointed by tags are reachable with <rev>^0[1].

* gitflow-common (git_is_ancestor): Dereference tags.

Footnotes:
[1]  https://www.kernel.org/pub/software/scm/git/docs/git-rev-parse.html

fixes: #2
c5d3125
@baby-gnu
baby-gnu commented Jul 9, 2012

Sorry, I wanted to pull request Peter van der Does

@baby-gnu baby-gnu closed this Jul 9, 2012
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Something went wrong with that request. Please try again.