rebase: cleanup rebasing with --merge
authorEric Wong <normalperson@yhbt.net>
Sun, 25 Jun 2006 01:29:48 +0000 (18:29 -0700)
committerJunio C Hamano <junkio@cox.net>
Sun, 25 Jun 2006 07:38:34 +0000 (00:38 -0700)
We no longer have to recommit each patch to remove the parent
information we're rebasing since we're using the low-level merge
strategies directly instead of git-merge.

Signed-off-by: Eric Wong <normalperson@yhbt.net>
Signed-off-by: Junio C Hamano <junkio@cox.net>
git-rebase.sh

index 53fb14e..a95ada6 100755 (executable)
@@ -59,15 +59,16 @@ 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/cmt.$msgnum.result"
        echo "$prev_head" > "$dotest/prev_head"
 
        # onto the next patch:
@@ -82,10 +83,7 @@ call_merge () {
        rv=$?
        case "$rv" in
        0)
-               if test -n "`git-diff-index HEAD`"
-               then
-                       git-commit -C "$cmt" || die "commit failed: $MRESOLVEMSG"
-               fi
+               return
                ;;
        1)
                test -d "$GIT_DIR/rr-cache" && git-rerere
@@ -103,27 +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
-               git-read-tree `cat "$dotest/cmt.$msgnum.result"`
-               git-checkout-index -q -f -u -a
-               if test -n "`git-diff-index HEAD`"
-               then
-                       git-commit -C "`cat $dotest/cmt.$msgnum`"
-                       printf "Committed %0${prec}d" $msgnum
-               else
-                       printf "Already applied: %0${prec}d" $msgnum
-               fi
-               echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
-                                       sed 's/^[a-f0-9]\+ //'`
-               msgnum=$(($msgnum + 1))
-       done
        rm -r "$dotest"
        echo "All done."
 }