X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=git-rebase-script;h=b0893cc10faa8e4ed0c9d7de815371034ef2b0a9;hb=1efdd27f54e42746c23944cfe77e568673b2a0fa;hp=5bb3bd97af8019ad31d9278fcfd27e08ca3ce1da;hpb=d430042bcf4d9da3e5f3cb9fee57c9d73bc40bff;p=git.git

diff --git a/git-rebase-script b/git-rebase-script
index 5bb3bd97..b0893cc1 100755
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -27,7 +27,9 @@ esac
 
 upstream=`git-rev-parse --verify "$1"` &&
 ours=`git-rev-parse --verify "$ours_symbolic"` || exit
-test "$(git-diff-cache --cached "$ours")" = "" || 
+different1=$(git-diff-cache --name-only --cached "$ours") &&
+different2=$(git-diff-cache --name-only "$ours") &&
+test "$different1$different2" = "" ||
 die "Your working tree does not match $ours_symbolic."
 
 git-read-tree -m -u $ours $upstream &&
@@ -35,25 +37,32 @@ git-rev-parse --verify "$upstream^0" >"$GIT_DIR/HEAD" || exit
 
 tmp=.rebase-tmp$$
 fail=$tmp-fail
-trap "rm -rf $tmp-*" 0 1 2 3 15
+trap "rm -rf $tmp-*" 1 2 3 15
 
 >$fail
 
-git-cherry $upstream $ours |
-while read sign commit
+git-cherry -v $upstream $ours |
+while read sign commit msg
 do
 	case "$sign" in
-	-) continue ;;
+	-)
+		echo >&2 "* Already applied: $msg"
+		continue ;;
 	esac
+	echo >&2 "* Applying: $msg"
 	S=`cat "$GIT_DIR/HEAD"` &&
-        GIT_EXTERNAL_DIFF=git-apply-patch-script git-diff-tree -p $commit &&
-	git-commit-script -C "$commit" || {
+	git-cherry-pick-script --replay $commit || {
+		echo >&2 "* Not applying the patch and continuing."
 		echo $commit >>$fail
-		git-read-tree --reset -u $S
+		git-reset-script --hard $S
 	}
 done
 if test -s $fail
 then
-	echo Some commits could not be rebased, check by hand:
-	cat $fail
+	echo >&2 Some commits could not be rebased, check by hand:
+	cat >&2 $fail
+	echo >&2 "(the same list of commits are found in $tmp)"
+	exit 1
+else
+	rm -f $fail
 fi