diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:32 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-30 04:19:32 (GMT) |
| commit | 974bdb02058a82b57bcfebe184f57ebe74eecac5 (patch) | |
| tree | bc8e05ab280e94161f026f5e0bf533e07693b5db /builtin | |
| parent | 9755f70fe6498a4eaae2b9c63e91caa0fd97cb5a (diff) | |
| parent | bf1e28e0ad9b1d0d04203ebc43b9008de1969503 (diff) | |
| download | git-974bdb02058a82b57bcfebe184f57ebe74eecac5.zip git-974bdb02058a82b57bcfebe184f57ebe74eecac5.tar.gz git-974bdb02058a82b57bcfebe184f57ebe74eecac5.tar.bz2 | |
Merge branch 'bw/rebase-autostash-keep-current-branch'
"git rebase --autostash <upstream> <branch>", when <branch> is
different from the current branch, incorrectly moved the tip of the
current branch, which has been corrected.
* bw/rebase-autostash-keep-current-branch:
builtin/rebase.c: Remove pointless message
builtin/rebase.c: make sure the active branch isn't moved when autostashing
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/rebase.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/builtin/rebase.c b/builtin/rebase.c index f730b15..4a20582 100644 --- a/builtin/rebase.c +++ b/builtin/rebase.c @@ -2002,9 +2002,6 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) state_dir_path("autostash", &options); struct child_process stash = CHILD_PROCESS_INIT; struct object_id oid; - struct commit *head = - lookup_commit_reference(the_repository, - &options.orig_head); argv_array_pushl(&stash.args, "stash", "create", "autostash", NULL); @@ -2025,17 +2022,9 @@ int cmd_rebase(int argc, const char **argv, const char *prefix) options.state_dir); write_file(autostash, "%s", oid_to_hex(&oid)); printf(_("Created autostash: %s\n"), buf.buf); - if (reset_head(&head->object.oid, "reset --hard", + if (reset_head(NULL, "reset --hard", NULL, RESET_HEAD_HARD, NULL, NULL) < 0) die(_("could not reset --hard")); - printf(_("HEAD is now at %s"), - find_unique_abbrev(&head->object.oid, - DEFAULT_ABBREV)); - strbuf_reset(&buf); - pp_commit_easy(CMIT_FMT_ONELINE, head, &buf); - if (buf.len > 0) - printf(" %s", buf.buf); - putchar('\n'); if (discard_index(the_repository->index) < 0 || repo_read_index(the_repository) < 0) |