global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-02-01 21:40:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

sequencer (rebase -i): remove CHERRY_PICK_HEAD when no longer needed

Browse Source 
The scripted version of the interactive rebase already does that.

Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
Johannes Schindelin
2016-04-09 16:29:21 +02:00
parent c5471f7063
commit 4ea31ad34a
1 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
sequencer.c
View File

@@ -1814,8 +1814,13 @@ static int commit_staged_changes(struct replay_opts *opts)
if (has_unstaged_changes(1))
return error(_("Cannot rebase: You have unstaged changes."));
if (!has_uncommitted_changes(0))
if (!has_uncommitted_changes(0)) {
const char *cherry_pick_head = git_path("CHERRY_PICK_HEAD");
if (file_exists(cherry_pick_head) && unlink(cherry_pick_head))
return error("Could not remove CHERRY_PICK_HEAD");
return 0;
}
if (file_exists(rebase_path_amend())) {
struct strbuf rev = STRBUF_INIT;