git am --skip: clean the index while preserving local changes

[thirdparty/git.git] / git-am.sh

diff --git a/git-am.sh b/git-am.sh
index fcbffb2ba130833c7a6d5d665c9c7451f609989a..7864b5f58826a6964f85feae5d8ab90cfcfe59af 100755 (executable)
--- a/git-am.sh
+++ b/git-am.sh
@@ -202,8 +202,15 @@ then
        die "previous rebase directory $dotest still exists but mbox given."
        resume=yes
 
-       case "$abort" in
-       t)
+       case "$skip,$abort" in
+       t,)
+               git rerere clear
+               git read-tree --reset -u HEAD HEAD
+               orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
+               git reset HEAD
+               git update-ref ORIG_HEAD $orig_head
+               ;;
+       ,t)
                git rerere clear
                git read-tree --reset -u HEAD ORIG_HEAD
                git reset ORIG_HEAD
@@ -297,7 +304,6 @@ last=`cat "$dotest/last"`
 this=`cat "$dotest/next"`
 if test "$skip" = t
 then
-       git rerere clear
        this=`expr "$this" + 1`
        resume=
 fi