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

Closed
wants to merge 123 commits into
from

Conversation

Projects
None yet
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

nvie and others added some commits Mar 19, 2010

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>
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>
Implements do_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Add the pre and post hook calls.
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Add some documentation to the do_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Remove trailing whitespace
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
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>
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>
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>
Implements do_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
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>
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>
Remove trailing whitespace
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Signed-off-by: Vincent Driessen <vincent@3rdcloud.com>
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>
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.
Call the hooks explicitly on a per-action basis, with positional
arguments that are relevant for the action at hand.
Merge remote-tracking branch 'nvie/feature/implement-hooks' into feat…
…ure/implement-hooks

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

Conflicts:
	gitflow-common
Implements universal run_filter_hook function
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Adds filter to git flow hotfix start
Example of the filter script added.

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

Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Adds some comments to the sample scripts
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Update the version number in the script itself as well
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Adds pre/post hooks
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
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>
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>
Nicer looking Changes
Signed-off-by: Peter van der Does <peter@avirtualhome.com>
Markdown error
Signed-off-by: Peter van der Does <peter@avirtualhome.com>

petervanderdoes and others added some commits Jun 16, 2012

Clean up some typos
Some typos in the comments.
git-flow-hotfix passed an unknown variable to the post hook.
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.
Use function git_current_branch
In some cases the defined function was not used, but porcelain functions
were used to determine the current branch.
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.
Rewrite functions
Write the if statements in a one-liner.
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.
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.
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.
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
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
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
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.
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"
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
@baby-gnu

This comment has been minimized.

Show comment
Hide comment
@baby-gnu

baby-gnu Jul 9, 2012

Sorry, I wanted to pull request Peter van der Does

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