diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-02-06 22:05:20 -0800 |
| commit | 8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38 (patch) | |
| tree | f33b9ec70cc3d7e7a068d7ef24a6895d69accf00 /git-rebase--common.sh | |
| parent | Fifth batch for 2.21 (diff) | |
| parent | rebase: implement --merge via the interactive machinery (diff) | |
| download | git-8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38.tar.gz git-8fe9c3f21dff206acb464d86cbd3bf4dbbb94f38.zip | |
Merge branch 'en/rebase-merge-on-sequencer'
"git rebase --merge" as been reimplemented by reusing the internal
machinery used for "git rebase -i".
* en/rebase-merge-on-sequencer:
rebase: implement --merge via the interactive machinery
rebase: define linearization ordering and enforce it
git-legacy-rebase: simplify unnecessary triply-nested if
git-rebase, sequencer: extend --quiet option for the interactive machinery
am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
t5407: add a test demonstrating how interactive handles --skip differently
rebase: fix incompatible options error message
rebase: make builtin and legacy script error messages the same
Diffstat (limited to 'git-rebase--common.sh')
| -rw-r--r-- | git-rebase--common.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/git-rebase--common.sh b/git-rebase--common.sh index a8a44608e0..f00e13e5d0 100644 --- a/git-rebase--common.sh +++ b/git-rebase--common.sh @@ -10,7 +10,7 @@ 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 && + test t = "$GIT_QUIET" && : > "$state_dir"/quiet test t = "$verbose" && : > "$state_dir"/verbose test -n "$strategy" && echo "$strategy" > "$state_dir"/strategy test -n "$strategy_opts" && echo "$strategy_opts" > \ |