diff options
author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 13:43:54 -0500 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 14:08:09 -0800 |
commit | 7b37a7c6204998faa80a4bdc1e1ab824bd37d941 (patch) | |
tree | 51bcbc859077969e088411169e00e8ecec84ca3d /git-rebase.sh | |
parent | 84df4560ed92a771d38081ecca2d40ca35811907 (diff) | |
download | git-7b37a7c6204998faa80a4bdc1e1ab824bd37d941.tar.gz git-7b37a7c6204998faa80a4bdc1e1ab824bd37d941.tar.xz |
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>
Diffstat (limited to 'git-rebase.sh')
-rwxr-xr-x | git-rebase.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/git-rebase.sh b/git-rebase.sh index 5a399aa4c..8a36e7a86 100755 --- a/git-rebase.sh +++ b/git-rebase.sh @@ -79,14 +79,16 @@ read_basic_state () { else orig_head=$(cat "$state_dir"/head) fi && - GIT_QUIET=$(cat "$state_dir"/quiet) + GIT_QUIET=$(cat "$state_dir"/quiet) && + test -f "$state_dir"/verbose && verbose=t } write_basic_state () { echo "$head_name" > "$state_dir"/head-name && echo "$onto" > "$state_dir"/onto && echo "$orig_head" > "$state_dir"/orig-head && - echo "$GIT_QUIET" > "$state_dir"/quiet + echo "$GIT_QUIET" > "$state_dir"/quiet && + test t = "$verbose" && : > "$state_dir"/verbose } output () { |