Skip to content

Commit 19a23d6

Browse files
committed
Merge branch 'pw/rebase-i-regression-fix' into maint
Just the first one of three? new tests that follows up a regression fix. * 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 b06d364 + d096d7f commit 19a23d6

1 file changed

Lines changed: 4 additions & 1 deletion

File tree

sequencer.c

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

19151915
child.git_cmd = 1;
1916+
child.no_stdout = 1;
1917+
child.no_stderr = 1;
19161918
argv_array_push(&child.args, "stash");
19171919
argv_array_push(&child.args, "apply");
19181920
argv_array_push(&child.args, stash_sha1.buf);
19191921
if (!run_command(&child))
1920-
printf(_("Applied autostash."));
1922+
printf(_("Applied autostash.\n"));
19211923
else {
19221924
struct child_process store = CHILD_PROCESS_INIT;
19231925

@@ -2088,6 +2090,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
20882090
res = error(_("could not read orig-head"));
20892091
goto cleanup_head_ref;
20902092
}
2093+
strbuf_reset(&buf);
20912094
if (!read_oneliner(&buf, rebase_path_onto(), 0)) {
20922095
res = error(_("could not read 'onto'"));
20932096
goto cleanup_head_ref;

0 commit comments

Comments
 (0)