Merge branch 'jc/squash'

[git.git] / git-rebase.sh

diff --git a/git-rebase.sh b/git-rebase.sh
index b9ce1125d855273e499b57173d4281507e656fdd..9ad1c44d4816f8c4f52eddc525bc24cd6bfe92d2 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -59,30 +59,31 @@ continue_merge () {
 
        if test -n "`git-diff-index HEAD`"
        then
+               printf "Committed: %0${prec}d" $msgnum
                git-commit -C "`cat $dotest/current`"
        else
-               echo "Previous merge succeeded automatically"
+               printf "Already applied: %0${prec}d" $msgnum
        fi
+       echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
+                               sed 's/^[a-f0-9]\+ //'`
 
        prev_head=`git-rev-parse HEAD^0`
-
        # save the resulting commit so we can read-tree on it later
-       echo "$prev_head" > "$dotest/`printf %0${prec}d $msgnum`.result"
        echo "$prev_head" > "$dotest/prev_head"
 
        # onto the next patch:
        msgnum=$(($msgnum + 1))
-       printf "%0${prec}d" "$msgnum" > "$dotest/msgnum"
+       echo "$msgnum" >"$dotest/msgnum"
 }
 
 call_merge () {
-       cmt="$(cat $dotest/`printf %0${prec}d $1`)"
+       cmt="$(cat $dotest/cmt.$1)"
        echo "$cmt" > "$dotest/current"
        git-merge-$strategy "$cmt^" -- HEAD "$cmt"
        rv=$?
        case "$rv" in
        0)
-               git-commit -C "$cmt" || die "commit failed: $MRESOLVEMSG"
+               return
                ;;
        1)
                test -d "$GIT_DIR/rr-cache" && git-rerere
@@ -100,26 +101,6 @@ call_merge () {
 }
 
 finish_rb_merge () {
-       set -e
-
-       msgnum=1
-       echo "Finalizing rebased commits..."
-       git-reset --hard "`cat $dotest/onto`"
-       end="`cat $dotest/end`"
-       while test "$msgnum" -le "$end"
-       do
-               msgnum=`printf "%0${prec}d" "$msgnum"`
-               printf "%0${prec}d" "$msgnum" > "$dotest/msgnum"
-
-               git-read-tree `cat "$dotest/$msgnum.result"`
-               git-checkout-index -q -f -u -a
-               git-commit -C "`cat $dotest/$msgnum`"
-
-               echo "Committed $msgnum"
-               echo '    '`git-rev-list --pretty=oneline -1 HEAD | \
-                                       sed 's/^[a-f0-9]\+ //'`
-               msgnum=$(($msgnum + 1))
-       done
        rm -r "$dotest"
        echo "All done."
 }
@@ -156,7 +137,18 @@ do
        --skip)
                if test -d "$dotest"
                then
-                       die "--skip is not supported when using --merge"
+                       prev_head="`cat $dotest/prev_head`"
+                       end="`cat $dotest/end`"
+                       msgnum="`cat $dotest/msgnum`"
+                       msgnum=$(($msgnum + 1))
+                       onto="`cat $dotest/onto`"
+                       while test "$msgnum" -le "$end"
+                       do
+                               call_merge "$msgnum"
+                               continue_merge
+                       done
+                       finish_rb_merge
+                       exit
                fi
                git am -3 --skip --resolvemsg="$RESOLVEMSG"
                exit
@@ -322,11 +314,11 @@ for cmt in `git-rev-list --no-merges "$upstream"..ORIG_HEAD \
                        | perl -e 'print reverse <>'`
 do
        msgnum=$(($msgnum + 1))
-       echo "$cmt" > "$dotest/`printf "%0${prec}d" $msgnum`"
+       echo "$cmt" > "$dotest/cmt.$msgnum"
 done
 
-printf "%0${prec}d" 1 > "$dotest/msgnum"
-printf "%0${prec}d" "$msgnum" > "$dotest/end"
+echo 1 >"$dotest/msgnum"
+echo $msgnum >"$dotest/end"
 
 end=$msgnum
 msgnum=1