rebase: remember verbose option

Currently, only interactive rebase remembers the value of the '-v'
flag from the initial invocation. Make non-interactive rebase also
remember it.

Signed-off-by: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh
index a33b2463cbaff3255aecca0f475bb7cfb94341d2..78099320aeb8afc650c730b60bd24bc1bc7d93cf 100755 (executable)
--- a/git-rebase--interactive.sh
+++ b/git-rebase--interactive.sh
@@ -585,7 +585,6 @@ skip_unnecessary_picks () {
 get_saved_options () {
        test -d "$REWRITTEN" && preserve_merges=t
        test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)"
-       test -f "$state_dir"/verbose && verbose=t
        test -f "$state_dir"/rebase-root && rebase_root=t
 }
 
@@ -715,7 +714,6 @@ case "$rebase_root" in
        : >"$state_dir"/rebase-root ;;
 esac
 test -z "$strategy" || echo "$strategy" > "$state_dir"/strategy
-test t = "$verbose" && : > "$state_dir"/verbose
 if test t = "$preserve_merges"
 then
        if test -z "$rebase_root"

diff --git a/git-rebase.sh b/git-rebase.sh
index 95c0d055e366a884253cc43ddb195d9a213b1855..e5be7e5ddc616d6f0ca13d95ebda181eecfb0962 100755 (executable)
--- a/git-rebase.sh
+++ b/git-rebase.sh
@@ -76,7 +76,8 @@ read_basic_state () {
        else
                orig_head=$(cat "$state_dir"/orig-head)
        fi &&
-       GIT_QUIET=$(cat "$state_dir"/quiet)
+       GIT_QUIET=$(cat "$state_dir"/quiet) &&
+       test -f "$state_dir"/verbose && verbose=t
 }
 
 write_basic_state () {
@@ -88,7 +89,8 @@ write_basic_state () {
        else
                echo "$orig_head" > "$state_dir"/orig-head
        fi &&
-       echo "$GIT_QUIET" > "$state_dir"/quiet
+       echo "$GIT_QUIET" > "$state_dir"/quiet &&
+       test t = "$verbose" && : > "$state_dir"/verbose
 }
 
 output () {