undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git am: Set cmdline globally

Browse Source 
Set the $cmdline variable globally, and not in stop_here_user_resolve
so it can be used in other code fragments as well.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Ramkumar Ramachandra 2010-06-02 10:33:35 +02:00 committed by Junio C Hamano
parent 225c93a3ca
commit d2c4631061
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
git-am.sh
View File

@ -52,6 +52,16 @@ else
HAS_HEAD= HAS_HEAD=
fi fi
cmdline="git am"
if test '' != "$interactive"
then
cmdline="$cmdline -i"
fi
if test '' != "$threeway"
then
cmdline="$cmdline -3"
fi
sq () { sq () {
git rev-parse --sq-quote "$@" git rev-parse --sq-quote "$@"
} }
@ -66,15 +76,6 @@ stop_here_user_resolve () {
printf '%s\n' "$resolvemsg" printf '%s\n' "$resolvemsg"
stop_here $1 stop_here $1
fi fi
cmdline="git am"
if test '' != "$interactive"
then
cmdline="$cmdline -i"
fi
if test '' != "$threeway"
then
cmdline="$cmdline -3"
fi
echo "When you have resolved this problem run \"$cmdline --resolved\"." echo "When you have resolved this problem run \"$cmdline --resolved\"."
echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"." echo "If you would prefer to skip this patch, instead run \"$cmdline --skip\"."
echo "To restore the original branch and stop patching run \"$cmdline --abort\"." echo "To restore the original branch and stop patching run \"$cmdline --abort\"."