Skip to content

Commit 79a6226

Browse files
phillipwoodgitster
authored andcommitted
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 <[email protected]> Acked-by: Johannes Schindelin <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 4ab867b commit 79a6226

File tree

1 file changed

+2
-0
lines changed

1 file changed

+2
-0
lines changed

sequencer.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1898,6 +1898,8 @@ static int apply_autostash(struct replay_opts *opts)
18981898
strbuf_trim(&stash_sha1);
18991899

19001900
child.git_cmd = 1;
1901+
child.no_stdout = 1;
1902+
child.no_stderr = 1;
19011903
argv_array_push(&child.args, "stash");
19021904
argv_array_push(&child.args, "apply");
19031905
argv_array_push(&child.args, stash_sha1.buf);

0 commit comments

Comments
 (0)