diff options
| author | Martin von Zweigbergk <martin.von.zweigbergk@gmail.com> | 2011-02-06 18:43:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-02-10 22:08:09 (GMT) |
| commit | 7b37a7c6204998faa80a4bdc1e1ab824bd37d941 (patch) | |
| tree | 51bcbc859077969e088411169e00e8ecec84ca3d | |
| parent | 84df4560ed92a771d38081ecca2d40ca35811907 (diff) | |
| download | git-7b37a7c6204998faa80a4bdc1e1ab824bd37d941.zip git-7b37a7c6204998faa80a4bdc1e1ab824bd37d941.tar.gz git-7b37a7c6204998faa80a4bdc1e1ab824bd37d941.tar.bz2 | |
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>
| -rwxr-xr-x | git-rebase--interactive.sh | 2 | ||||
| -rwxr-xr-x | git-rebase.sh | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 437cc52..f076a6e 100755 --- 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 5a399aa..8a36e7a 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 () { |