Be git-describe friendly.
This patch tags commits on the original (release/hotfix branch) instead
of tagging the merge commit on the master branch. This keeps the
history git-describe friendly. (For related discussions, see #49, #85,
diff --git a/git-flow-hotfix b/git-flow-hotfix
index e667417..a3bcfd1 100644
--- a/git-flow-hotfix
+++ b/git-flow-hotfix
@@ -294,7 +294,7 @@
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
[ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
[ "$FLAGS_messagefile" != "" ] && opts="$opts -F '$FLAGS_messagefile'"
- eval git tag $opts "$VERSION_PREFIX$VERSION" || \
+ eval git tag $opts "$VERSION_PREFIX$VERSION" "$BRANCH" || \
die "Tagging failed. Please run finish again to retry."
fi
fi
diff --git a/git-flow-release b/git-flow-release
index 62fb8b7..2d81ed6 100644
--- a/git-flow-release
+++ b/git-flow-release
@@ -250,7 +250,7 @@
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
[ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
[ "$FLAGS_messagefile" != "" ] && opts="$opts -F '$FLAGS_messagefile'"
- eval git tag $opts "$tagname" || \
+ eval git tag $opts "$tagname" "$BRANCH" || \
die "Tagging failed. Please run finish again to retry."
fi
fi