[PATCH] Documentation for git-clone-dumb-http.

[git.git] / git-rebase-script

diff --git a/git-rebase-script b/git-rebase-script
index 026225a..b0893cc 100755 (executable)
--- a/git-rebase-script
+++ b/git-rebase-script
@@ -17,40 +17,52 @@ case "$#,$1" in
     shift ;;
 esac
 
+git-update-cache --refresh || exit
+
 case "$#" in
-1) upstream=`git-rev-parse --verify "$1"` &&
-   ours=`git-rev-parse --verify HEAD` || exit
-   ;;
-2) upstream=`git-rev-parse --verify "$1"` &&
-   ours=`git-rev-parse --verify "$2"` || exit
-   ;;
-*) echo >&2 "$usage"; exit 1 ;;
+1) ours_symbolic=HEAD ;;
+2) ours_symbolic="$2" ;;
+*) die "$usage" ;;
 esac
 
+upstream=`git-rev-parse --verify "$1"` &&
+ours=`git-rev-parse --verify "$ours_symbolic"` || exit
+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 &&
 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