Skip to content

Commit

Permalink
Annotated the code with some TODO-notes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@nvie
nvie committed Feb 8, 2010
1 parent 5fa4758 commit d29e315
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 0 deletions.
2 changes: 2 additions & 0 deletions git-flow-hotfix
View file
Expand Up @@ -201,6 +201,8 @@ cmd_finish() {
git checkout $DEVELOP_BRANCH || \ git checkout $DEVELOP_BRANCH || \
die "Could not check out $DEVELOP_BRANCH." die "Could not check out $DEVELOP_BRANCH."


# TODO: Actually, accounting for 'git describe' pays, so we should
# ideally git merge --no-ff $tagname here, instead!
git merge --no-ff $BRANCH || \ git merge --no-ff $BRANCH || \
die "There were merge conflicts." die "There were merge conflicts."
# TODO: What do we do now? # TODO: What do we do now?
Expand Down
3 changes: 3 additions & 0 deletions git-flow-release
View file
Expand Up @@ -206,6 +206,9 @@ cmd_finish() {
if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then if ! gitflow_is_branch_merged_into $BRANCH $DEVELOP_BRANCH; then
git checkout $DEVELOP_BRANCH || \ git checkout $DEVELOP_BRANCH || \
die "Could not check out $DEVELOP_BRANCH." die "Could not check out $DEVELOP_BRANCH."

# TODO: Actually, accounting for 'git describe' pays, so we should
# ideally git merge --no-ff $tagname here, instead!

This comment has been minimized.

Sign in to view

Copy link
@snaewe

snaewe Apr 9, 2010

Is there any reason why you don't do 'git merge -no-ff $tagname' here ?

This comment has been minimized.

Sign in to view

Copy link
@nvie

nvie Apr 9, 2010

Author Owner

Mostly to keep it in line with the original model blog post for now. Maybe in the future I will make a version 2 of the model that uses this strategy, and some other improvements. The only thing keeping me from doing it right now is (lack of) time, really.

This comment has been minimized.

Sign in to view

Copy link
@putermancer

putermancer Dec 7, 2010

Contributor

So, aside from matching it up with the model in the original blog post, did you discover any real tricky problems, or other reasons not to do this?

I'm strongly considering making this change in a fork of my own so we can use it at my org, but thought I'd ask if there were some stumbling blocks you already came across that would sway me from doing so.
git merge --no-ff $BRANCH || \ git merge --no-ff $BRANCH || \
die "There were merge conflicts." die "There were merge conflicts."
# TODO: What do we do now? # TODO: What do we do now?
Expand Down

0 comments on commit d29e315

Please sign in to comment.