aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael S. Tsirkin <mst@redhat.com>2014-05-15 16:41:53 +0300
committerMichael S. Tsirkin <mst@redhat.com>2014-05-18 23:39:35 +0300
commita7ffb3f00e7f84fe769541ac50e5983891b8a13d (patch)
treeba363e568133497ab1b8df8e8ff2aa09a31dad12
parent1027a5c21f1fa1ec94a9687917d9ff34eb8fb1dc (diff)
downloadgit-a7ffb3f00e7f84fe769541ac50e5983891b8a13d.tar.gz
git-am: fix up new -s
-rwxr-xr-xgit-am.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/git-am.sh b/git-am.sh
index b26eaec28b..7ffcde3279 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -8,6 +8,7 @@ OPTIONS_STUCKLONG=t
if test "$(git config --bool --get am.signoff)" = true
then
signoff="="
+ signoff_pattern="=*"
fi
OPTIONS_SPEC="\
git am [options] [(<mbox>|<Maildir>)...]
@@ -401,9 +402,11 @@ it will be removed. Please do not use it anymore."
;;
-3|--3way)
threeway=t ;;
- -s|--signoff)
+ -s$signoff_pattern|--signoff$signoff_pattern)
sign=t
- ack=$2
+ ack=$1
+ ack="${ack#-s=}"
+ ack="${ack#--signoff=}"
acks=$(git config --get-all am.${ack}.signoff)
if test "acks"
then