Skip to content

G
gitflow
Commit adfd408c authored by Vincent Driessen's avatar Vincent Driessen
Browse files
Options

Merge pull request #160 from Zoramite/feature/Issue50 

Adding the `eval` to force variable expansion.
parents bb1becd6 f66eba89
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
git-flow-hotfix
View file @ adfd408c
...@@ -269,7 +269,7 @@ cmd_finish() { ...@@ -269,7 +269,7 @@ cmd_finish() {
flag sign && opts="$opts -s" flag sign && opts="$opts -s"
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'" [ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
[ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'" [ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
git tag $opts "$VERSION_PREFIX$VERSION" || \ eval git tag $opts "$VERSION_PREFIX$VERSION" || \
die "Tagging failed. Please run finish again to retry." die "Tagging failed. Please run finish again to retry."
fi fi
fi fi
......
git-flow-release
View file @ adfd408c
...@@ -239,7 +239,7 @@ cmd_finish() { ...@@ -239,7 +239,7 @@ cmd_finish() {
flag sign && opts="$opts -s" flag sign && opts="$opts -s"
[ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'" [ "$FLAGS_signingkey" != "" ] && opts="$opts -u '$FLAGS_signingkey'"
[ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'" [ "$FLAGS_message" != "" ] && opts="$opts -m '$FLAGS_message'"
git tag $opts "$tagname" || \ eval git tag $opts "$tagname" || \
die "Tagging failed. Please run finish again to retry." die "Tagging failed. Please run finish again to retry."
fi fi
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment