development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-03 23:29:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pw/rebase-i-regression-fix'

Browse source 
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
This commit is contained in:
Junio C Hamano 2017-05-29 12:34:51 +09:00
parent 8d3abeada9 d096d7f1ef
commit 2becdbd47e
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sequencer.c
View file

@ -1915,11 +1915,13 @@ 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);
if (!run_command(&child))
printf(_("Applied autostash."));
printf(_("Applied autostash.\n"));
else {
struct child_process store = CHILD_PROCESS_INIT;
@ -2090,6 +2092,7 @@ static int pick_commits(struct todo_list *todo_list, struct replay_opts *opts)
res = error(_("could not read orig-head"));
goto cleanup_head_ref;
}
strbuf_reset(&buf);
if (!read_oneliner(&buf, rebase_path_onto(), 0)) {
res = error(_("could not read 'onto'"));
goto cleanup_head_ref;