Merge branch 'ew/rebase'

diff --git a/git-rebase.sh b/git-rebase.sh
index bce7bf84d6d1eca8c245e2ca89764ed8a4062191..91594775e6aad4ebe924506e779c51ea5333ad37 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -67,16 +67,16 @@ continue_merge () {
        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/cmt.$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=$?
@@ -108,15 +108,12 @@ finish_rb_merge () {
        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-read-tree `cat "$dotest/cmt.$msgnum.result"`
                git-checkout-index -q -f -u -a
-               git-commit -C "`cat $dotest/$msgnum`"
+               git-commit -C "`cat $dotest/cmt.$msgnum`"
 
-               echo "Committed $msgnum"
-               echo '    '`git-rev-list --pretty=oneline -1 HEAD | \
+               printf "Committed %0${prec}d" $msgnum
+               echo ' '`git-rev-list --pretty=oneline -1 HEAD | \
                                        sed 's/^[a-f0-9]\+ //'`
                msgnum=$(($msgnum + 1))
        done
@@ -300,6 +297,15 @@ then
        exit $?
 fi
 
+if test "@@NO_PYTHON@@" && test "$strategy" = "recursive"
+then
+       die 'The recursive merge strategy currently relies on Python,
+which this installation of git was not configured with.  Please consider
+a different merge strategy (e.g. octopus, resolve, stupid, ours)
+or install Python and git with Python support.'
+
+fi
+
 # start doing a rebase with git-merge
 # this is rename-aware if the recursive (default) strategy is used
 
@@ -313,11 +319,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