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>
Phillip Wood committed
May 18, 2017 at 11:02 UTC
79a62269815264165da265eeb8a65feb47dcf671
1 file changed
+2
sequencer.c
+2
@@ -1898,6 +1898,8 @@ static int apply_autostash(struct replay_opts *opts)
1898
strbuf_trim(&stash_sha1);
1899
1900
child.git_cmd = 1;
1901
+ child.no_stdout = 1;
1902
+ child.no_stderr = 1;
1903
argv_array_push(&child.args, "stash");
1904
argv_array_push(&child.args, "apply");
1905
argv_array_push(&child.args, stash_sha1.buf);