summaryrefslogtreecommitdiff
path: root/sequencer.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-02-14 20:54:20 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-02-14 20:54:21 (GMT)
commitd8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1 (patch)
treed7433bfd5fbf38f9f2282be27007ecd03019e09e /sequencer.c
parent251187084d5ebdb3ba898ba4a8f9b005b7626655 (diff)
parent767a9c417eb2109dda71995c8fb8a884d3a35e6f (diff)
downloadgit-d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1.zip
git-d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1.tar.gz
git-d8b8d59054ed5ba2f79d3cb2fad0b5f0bfeb3ac1.tar.bz2
Merge branch 'ag/rebase-avoid-unneeded-checkout'
"git rebase -i" (and friends) used to unnecessarily check out the tip of the branch to be rebased, which has been corrected. * ag/rebase-avoid-unneeded-checkout: rebase -i: stop checking out the tip of the branch to rebase
Diffstat (limited to 'sequencer.c')
-rw-r--r--sequencer.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/sequencer.c b/sequencer.c
index df6d18f..18b2b1f 100644
--- a/sequencer.c
+++ b/sequencer.c
@@ -3716,20 +3716,6 @@ static int run_git_checkout(struct repository *r, struct replay_opts *opts,
return ret;
}
-int prepare_branch_to_be_rebased(struct repository *r, struct replay_opts *opts,
- const char *commit)
-{
- const char *action;
-
- if (commit && *commit) {
- action = reflog_message(opts, "start", "checkout %s", commit);
- if (run_git_checkout(r, opts, commit, action))
- return error(_("could not checkout %s"), commit);
- }
-
- return 0;
-}
-
static int checkout_onto(struct repository *r, struct replay_opts *opts,
const char *onto_name, const struct object_id *onto,
const char *orig_head)