development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-13 05:14:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

rebase: remember verbose option

Browse source 
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>
This commit is contained in:
Martin von Zweigbergk 2011-02-06 13:43:54 -05:00 committed by Junio C Hamano
parent 84df4560ed
commit 7b37a7c620
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
git-rebase--interactive.sh
View file

@ -585,7 +585,6 @@ skip_unnecessary_picks () {
get_saved_options () { get_saved_options () {
test -d "$rewritten" && preserve_merges=t test -d "$rewritten" && preserve_merges=t
test -f "$state_dir"/strategy && strategy="$(cat "$state_dir"/strategy)" 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 test -f "$state_dir"/rebase-root && rebase_root=t
} }
@ -715,7 +714,6 @@ case "$rebase_root" in
: >"$state_dir"/rebase-root ;; : >"$state_dir"/rebase-root ;;
esac esac
test -z "$strategy" || echo "$strategy" > "$state_dir"/strategy test -z "$strategy" || echo "$strategy" > "$state_dir"/strategy
test t = "$verbose" && : > "$state_dir"/verbose
if test t = "$preserve_merges" if test t = "$preserve_merges"
then then
if test -z "$rebase_root" if test -z "$rebase_root"

6
git-rebase.sh
View file

@ -79,14 +79,16 @@ read_basic_state () {
else else
orig_head=$(cat "$state_dir"/head) orig_head=$(cat "$state_dir"/head)
fi && fi &&
GIT_QUIET=$(cat "$state_dir"/quiet) GIT_QUIET=$(cat "$state_dir"/quiet) &&
test -f "$state_dir"/verbose && verbose=t
} }
write_basic_state () { write_basic_state () {
echo "$head_name" > "$state_dir"/head-name && echo "$head_name" > "$state_dir"/head-name &&
echo "$onto" > "$state_dir"/onto && echo "$onto" > "$state_dir"/onto &&
echo "$orig_head" > "$state_dir"/orig-head && 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 () { output () {