Fix use of mutex in threaded grep

diff --git a/git-rebase.sh b/git-rebase.sh
index 3de0942c0fa604fd0aed8561e3f2727c0a7887e5..fb4fef7b1d6f7abb08fca562ecaad6e36f671768 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -52,6 +52,7 @@ diffstat=$(git config --bool rebase.stat)
 git_am_opt=
 rebase_root=
 force_rebase=
+allow_rerere_autoupdate=
 
 continue_merge () {
        test -n "$prev_head" || die "prev_head must be defined"
@@ -84,10 +85,8 @@ continue_merge () {
                        printf "Already applied: %0${prec}d " $msgnum
                fi
        fi
-       if test -z "$GIT_QUIET"
-       then
-               git rev-list --pretty=oneline -1 "$cmt" | sed -e 's/^[^ ]* //'
-       fi
+       test -z "$GIT_QUIET" &&
+       GIT_PAGER='' git log --format=%s -1 "$cmt"
 
        prev_head=`git rev-parse HEAD^0`
        # save the resulting commit so we can read-tree on it later
@@ -120,7 +119,7 @@ call_merge () {
                return
                ;;
        1)
-               git rerere
+               git rerere $allow_rerere_autoupdate
                die "$RESOLVEMSG"
                ;;
        2)
@@ -351,6 +350,9 @@ do
        -f|--f|--fo|--for|--forc|force|--force-r|--force-re|--force-reb|--force-reba|--force-rebas|--force-rebase)
                force_rebase=t
                ;;
+       --rerere-autoupdate|--no-rerere-autoupdate)
+               allow_rerere_autoupdate="$1"
+               ;;
        -*)
                usage
                ;;