git-am --whitespace: do not lose the command line option
authorJunio C Hamano <gitster@pobox.com>
Thu, 4 Dec 2008 23:03:28 +0000 (15:03 -0800)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Dec 2008 02:45:01 +0000 (18:45 -0800)
When you start "git am --whitespace=fix" and the patch application process
is interrupted by an unapplicable patch early in the series, after
fixing the offending patch, the remainder of the patch should be processed
still with --whitespace=fix when restarted with "git am --resolved" (or
dropping the offending patch with "git am --skip").

The breakage was introduced by the commit 67dad68 (add -C[NUM] to git-am,
2007-02-08); this should fix it.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
git-am.sh

index aa60261..1bf70d4 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -121,7 +121,7 @@ It does not apply to blobs recorded in its index."
 
 prec=4
 dotest="$GIT_DIR/rebase-apply"
 
 prec=4
 dotest="$GIT_DIR/rebase-apply"
-sign= utf8=t keep= skip= interactive= resolved= rebasing= abort=
+sign= utf8=t keep= skip= interactive= resolved= rebasing= abort= ws=
 resolvemsg= resume=
 git_apply_opt=
 
 resolvemsg= resume=
 git_apply_opt=
 
@@ -156,7 +156,7 @@ do
        --resolvemsg)
                shift; resolvemsg=$1 ;;
        --whitespace)
        --resolvemsg)
                shift; resolvemsg=$1 ;;
        --whitespace)
-               git_apply_opt="$git_apply_opt $1=$2"; shift ;;
+               ws="--whitespace=$2"; shift ;;
        -C|-p)
                git_apply_opt="$git_apply_opt $1$2"; shift ;;
        --)
        -C|-p)
                git_apply_opt="$git_apply_opt $1$2"; shift ;;
        --)
@@ -283,7 +283,7 @@ if test "$(cat "$dotest/keep")" = t
 then
        keep=-k
 fi
 then
        keep=-k
 fi
-ws=`cat "$dotest/whitespace"`
+ws=$(cat "$dotest/whitespace")
 if test "$(cat "$dotest/sign")" = t
 then
        SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
 if test "$(cat "$dotest/sign")" = t
 then
        SIGNOFF=`git var GIT_COMMITTER_IDENT | sed -e '
@@ -454,7 +454,7 @@ do
 
        case "$resolved" in
        '')
 
        case "$resolved" in
        '')
-               git apply $git_apply_opt --index "$dotest/patch"
+               git apply $git_apply_opt $ws --index "$dotest/patch"
                apply_status=$?
                ;;
        t)
                apply_status=$?
                ;;
        t)