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>
Martin von Zweigbergk committed
Feb 6, 2011 at 13:43 UTC
7b37a7c6204998faa80a4bdc1e1ab824bd37d941
2 files changed
+4
-4
git-rebase--interactive.sh
-2
@@ -585,7 +585,6 @@ skip_unnecessary_picks () {
585
get_saved_options () {
586
test -d "$rewritten" && preserve_merges=t
587
test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)"
588
- test -f "$state_dir"/verbose && verbose=t
588
test -f "$state_dir"/rebase-root && rebase_root=t
589
}
590
@@ -715,7 +714,6 @@ case "$rebase_root" in
714
: >"$state_dir"/rebase-root ;;
715
esac
716
test -z "$strategy" || echo "$strategy" > "$state_dir"/strategy
718
-test t = "$verbose" && : > "$state_dir"/verbose
717
if test t = "$preserve_merges"
718
then
719
if test -z "$rebase_root"
git-rebase.sh
+4
-2
@@ -79,14 +79,16 @@ read_basic_state () {
79
else
80
orig_head=$(cat "$state_dir"/head)
81
fi &&
82
- GIT_QUIET=$(cat "$state_dir"/quiet)
82
+ GIT_QUIET=$(cat "$state_dir"/quiet) &&
83
+ test -f "$state_dir"/verbose && verbose=t
84
}
85
86
write_basic_state () {
87
echo "$head_name" > "$state_dir"/head-name &&
88
echo "$onto" > "$state_dir"/onto &&
89
echo "$orig_head" > "$state_dir"/orig-head &&
89
- echo "$GIT_QUIET" > "$state_dir"/quiet
90
+ echo "$GIT_QUIET" > "$state_dir"/quiet &&
91
+ test t = "$verbose" && : > "$state_dir"/verbose
92
}
93
94
output () {