rebase -i: remember the settings of -v, -s and -p when interrupted

After interruption, be that an edit, or a conflicting commit, reset
the variables VERBOSE, STRATEGY and PRESERVE_MERGES, so that the
user does not have to respecify them with "rebase --continue".

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index 1a064af381acac60df01c89953a9a1fc727ea2ca..ac4d559f07ed656ff08f75a00c028bb515f7a8af 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -23,6 +23,9 @@ REWRITTEN="$DOTEST"/rewritten
 PRESERVE_MERGES=
 STRATEGY=
 VERBOSE=
 PRESERVE_MERGES=
 STRATEGY=
 VERBOSE=

+test -d "$REWRITTEN" && PRESERVE_MERGES=t
+test -f "$DOTEST"/strategy && STRATEGY="$(cat "$DOTEST"/strategy)"
+test -f "$DOTEST"/verbose && VERBOSE=t

 
 warn () {
        echo "$*" >&2
 
 warn () {
        echo "$*" >&2


@@ -366,6 +369,7 @@ do
                echo $HEAD > "$DOTEST"/head
                echo $UPSTREAM > "$DOTEST"/upstream
                echo $ONTO > "$DOTEST"/onto
                echo $HEAD > "$DOTEST"/head
                echo $UPSTREAM > "$DOTEST"/upstream
                echo $ONTO > "$DOTEST"/onto

+               test -z "$STRATEGY" || echo "$STRATEGY" > "$DOTEST"/strategy

                test t = "$VERBOSE" && : > "$DOTEST"/verbose
                if [ t = "$PRESERVE_MERGES" ]
                then
                test t = "$VERBOSE" && : > "$DOTEST"/verbose
                if [ t = "$PRESERVE_MERGES" ]
                then

diff --git a/t/t3404-rebase-interactive.sh b/t/t3404-rebase-interactive.sh
index c25133699a97e3e0e453dd62101e6f35558f8ceb..43a6675caa3a57c0ad5a2b177d8b437e660525af 100755 (executable)
--- a/t/t3404-rebase-interactive.sh
+++ b/t/t3404-rebase-interactive.sh
@@ -202,4 +202,14 @@ test_expect_success '--continue tries to commit' '
        git show HEAD | grep chouette
 '
 
        git show HEAD | grep chouette
 '
 

+test_expect_success 'verbose flag is heeded, even after --continue' '
+       git reset --hard HEAD@{1} &&
+       test_tick &&
+       ! git rebase -v -i --onto new-branch1 HEAD^ &&
+       echo resolved > file1 &&
+       git add file1 &&
+       git rebase --continue > output &&
+       grep "^ file1 |    2 +-$" output
+'
+

 test_done
 test_done