diff options
| author | Phillip Wood <phillip.wood@dunelm.org.uk> | 2017-05-18 11:02:33 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-20 18:24:28 +0900 |
| commit | 79a62269815264165da265eeb8a65feb47dcf671 (patch) | |
| tree | cf048df5bc43f4be0f66887a1cc8075584036504 | |
| parent | 4ab867b8fc8c19ae99c5414ffcbf57fb1609c94f (diff) | |
| download | git-79a62269815264165da265eeb8a65feb47dcf671.tar.gz | |
rebase -i: silence stash apply
The shell version of rebase -i silences the status output from 'git
stash apply' when restoring the autostashed changes. The C version
does not.
Having the output from git stash apply on the screen is
distracting as it makes it difficult to find the message from git
rebase saying that the rebase succeeded. Also the status information
that git stash prints talks about looking in .git/rebase-merge/done to
see which commits have been applied. As .git/rebase-merge is removed
shortly after the message is printed before rebase -i exits this is
confusing.
Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | sequencer.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sequencer.c b/sequencer.c index 907319d089..2456246822 100644 --- a/sequencer.c +++ b/sequencer.c @@ -1898,6 +1898,8 @@ static int apply_autostash(struct replay_opts *opts) strbuf_trim(&stash_sha1); child.git_cmd = 1; + child.no_stdout = 1; + child.no_stderr = 1; argv_array_push(&child.args, "stash"); argv_array_push(&child.args, "apply"); argv_array_push(&child.args, stash_sha1.buf); |