diff options
| author | Junio C Hamano <gitster@pobox.com> | 2022-02-18 13:53:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2022-02-18 13:53:27 -0800 |
| commit | bcd020f88e1e22f38422ac3f73ab06b34ec4bef1 (patch) | |
| tree | 8d4f05578a57b57868c9b0168de87c66cf871c81 /builtin/merge.c | |
| parent | 867b520301cc5e719b575edde7736ebe70a19298 (diff) | |
| parent | 38c541ce94048cf72aa4f465be9314423a57f445 (diff) | |
| download | git-bcd020f88e1e22f38422ac3f73ab06b34ec4bef1.tar.gz | |
Merge branch 'pw/use-in-process-checkout-in-rebase'
Use an internal call to reset_head() helper function instead of
spawning "git checkout" in "rebase", and update code paths that are
involved in the change.
* pw/use-in-process-checkout-in-rebase:
rebase -m: don't fork git checkout
rebase --apply: set ORIG_HEAD correctly
rebase --apply: fix reflog
reset_head(): take struct rebase_head_opts
rebase: cleanup reset_head() calls
create_autostash(): remove unneeded parameter
reset_head(): make default_reflog_action optional
reset_head(): factor out ref updates
reset_head(): remove action parameter
rebase --apply: don't run post-checkout hook if there is an error
rebase: do not remove untracked files on checkout
rebase: pass correct arguments to post-checkout hook
t5403: refactor rebase post-checkout hook tests
rebase: factor out checkout for up to date branch
Diffstat (limited to 'builtin/merge.c')
| -rw-r--r-- | builtin/merge.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/builtin/merge.c b/builtin/merge.c index 133831d42f..a94a03384a 100644 --- a/builtin/merge.c +++ b/builtin/merge.c @@ -1568,8 +1568,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (autostash) create_autostash(the_repository, - git_path_merge_autostash(the_repository), - "merge"); + git_path_merge_autostash(the_repository)); if (checkout_fast_forward(the_repository, &head_commit->object.oid, &commit->object.oid, @@ -1640,8 +1639,7 @@ int cmd_merge(int argc, const char **argv, const char *prefix) if (autostash) create_autostash(the_repository, - git_path_merge_autostash(the_repository), - "merge"); + git_path_merge_autostash(the_repository)); /* We are going to make a new commit. */ git_committer_info(IDENT_STRICT); |