diff options
| author | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:51 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2017-05-29 12:34:51 +0900 |
| commit | 2becdbd47e14aad542875450e8f9c8e114109bfd (patch) | |
| tree | 416774080eecd6e5371aeed2ac57781196f6a562 /sequencer.c | |
| parent | 8d3abeada9e1be49be75115f49f2af76506c0746 (diff) | |
| parent | d096d7f1ef81f5c52d0c9d3070ad82b66de9c981 (diff) | |
| download | git-2becdbd47e14aad542875450e8f9c8e114109bfd.tar.gz | |
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
Diffstat (limited to 'sequencer.c')
| -rw-r--r-- | sequencer.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sequencer.c b/sequencer.c index 9dfedbc243..a23b948ac1 100644 --- a/sequencer.c +++ b/sequencer.c @@ -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 @@ cleanup_head_ref: 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; |