Skip to content

Avoid bad rebase amend #582

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Avoid bad rebase amend #582

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ddad363
sequencer.c: define a file path to store hash of a commit
ParthGala2k Mar 10, 2020
c11ad1c
sequencer.c: write commit hash to file rebase_merge/avoid_bad_fixup
ParthGala2k Mar 13, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
47 changes: 44 additions & 3 deletions sequencer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,16 @@ GIT_PATH_FUNC(rebase_path_dropped, "rebase-merge/dropped")
* actions.
*/
static GIT_PATH_FUNC(rebase_path_done, "rebase-merge/done")
/*
* This file stores info of the commit at a pick before a pick-fixup/squash
* chain eg. for this series of commands
* p1---p---f1---s---f....
* The commit info for HEAD corresponding to pick p1 will be stored in file
* here. Although the name suggests bad_fixup it is actually pick p that
* has merge conflicts with the base here and we want to avoid amending
* f1 onto p1 if p is skipped.
*/
static GIT_PATH_FUNC(rebase_path_avoid_bad_fixup, "rebase-merge/avoid-bad-fixup")
/*
* The file to keep track of how many commands were already processed (e.g.
* for the prompt).
Expand Down Expand Up @@ -3860,13 +3870,44 @@ static int pick_commits(struct repository *r,
}
}
if (item->command <= TODO_SQUASH) {
struct object_id head, previous_head;

res = 0;

if (is_rebase_i(opts))
setenv("GIT_REFLOG_ACTION", reflog_message(opts,
command_to_string(item->command), NULL),
1);
res = do_pick_commit(r, item->command, item->commit,
opts, is_final_fixup(todo_list),
&check_todo);

if (is_fixup(item->command)) {
struct strbuf buf = STRBUF_INIT;

if (read_oneliner(&buf, rebase_path_avoid_bad_fixup(), 1)) {
if (get_oid(buf.buf, &previous_head)) {
error(_("invalid file contents '%s' of '%s'"),
buf.buf, rebase_path_avoid_bad_fixup());
strbuf_release(&buf);
}
strbuf_release(&buf);
if (get_oid("HEAD", &head))
return error(_("could not read HEAD"));
if (oideq(&head, &previous_head))
res = error(_("commit to fix up was skipped")); /* reschedule */
}
} else if ((is_pick_or_similar(item->command)) &&
is_fixup(peek_command(todo_list, 1))) {
char hex[GIT_MAX_HEXSZ + 1];

if (get_oid("HEAD", &head))
return error(_("cannot read HEAD"));
oid_to_hex_r(hex, &head);
write_message(hex, the_hash_algo->hexsz, rebase_path_avoid_bad_fixup(), 0);
}

if (!res)
res = do_pick_commit(r, item->command, item->commit,
opts, is_final_fixup(todo_list),
&check_todo);
if (is_rebase_i(opts) && res < 0) {
/* Reschedule */
advise(_(rescheduled_advice),
Expand Down