Skip to content

Commit 2becdbd

Browse files
committed
Merge branch 'pw/rebase-i-regression-fix'
Regression fix to topic recently merged to 'master'. * pw/rebase-i-regression-fix: rebase -i: add missing newline to end of message rebase -i: silence stash apply rebase -i: fix reflog message
2 parents 8d3abea + d096d7f commit 2becdbd

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

sequencer.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1915,11 +1915,13 @@ static int apply_autostash(struct replay_opts *opts)
19151915
strbuf_trim(&stash_sha1);
19161916

19171917
child.git_cmd = 1;
1918+
child.no_stdout = 1;
1919+
child.no_stderr = 1;
19181920
argv_array_push(&child.args, "stash");
19191921
argv_array_push(&child.args, "apply");
19201922
argv_array_push(&child.args, stash_sha1.buf);
19211923
if (!run_command(&child))
1922-
printf(_("Applied autostash."));
1924+
printf(_("Applied autostash.\n"));
19231925
else {
19241926
struct child_process store = CHILD_PROCESS_INIT;
19251927

@@ -2090,6 +2092,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
20902092
res = error(_("could not read orig-head"));
20912093
goto cleanup_head_ref;
20922094
}
2095+
strbuf_reset(&buf);
20932096
if (!read_oneliner(&buf, rebase_path_onto(), 0)) {
20942097
res = error(_("could not read 'onto'"));
20952098
goto cleanup_head_ref;

0 commit comments

Comments
 (0)