Skip to content

Make git rebase work with --rebase-merges *and* --exec #13

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

Closed
wants to merge 2 commits into from
Closed

Make git rebase work with --rebase-merges *and* --exec #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d82eb4
t3430: demonstrate what -r, --autosquash & --exec should do
dscho Aug 1, 2018
b436f67
rebase --exec: make it work with --rebase-merges
dscho Aug 1, 2018
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
42 changes: 31 additions & 11 deletions sequencer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4244,10 +4244,9 @@ int sequencer_add_exec_commands(const char *commands)
{
const char *todo_file = rebase_path_todo();
struct todo_list todo_list = TODO_LIST_INIT;
struct todo_item *item;
struct strbuf *buf = &todo_list.buf;
size_t offset = 0, commands_len = strlen(commands);
int i, first;
int i, insert;

if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
return error(_("could not read '%s'."), todo_file);
Expand All @@ -4257,19 +4256,40 @@ int sequencer_add_exec_commands(const char *commands)
return error(_("unusable todo list: '%s'"), todo_file);
}

first = 1;
/* insert <commands> before every pick except the first one */
for (item = todo_list.items, i = 0; i < todo_list.nr; i++, item++) {
if (item->command == TODO_PICK && !first) {
strbuf_insert(buf, item->offset_in_buf + offset,
commands, commands_len);
/*
* Insert <commands> after every pick. Here, fixup/squash chains
* are considered part of the pick, so we insert the commands *after*
* those chains if there are any.
*/
insert = -1;
for (i = 0; i < todo_list.nr; i++) {
enum todo_command command = todo_list.items[i].command;

if (insert >= 0) {
/* skip fixup/squash chains */
if (command == TODO_COMMENT)
continue;
else if (is_fixup(command)) {
insert = i + 1;
continue;
}
strbuf_insert(buf,
todo_list.items[insert].offset_in_buf +
offset, commands, commands_len);
offset += commands_len;
insert = -1;
}
first = 0;

if (command == TODO_PICK || command == TODO_MERGE)
insert = i + 1;
}

/* append final <commands> */
strbuf_add(buf, commands, commands_len);
/* insert or append final <commands> */
if (insert >= 0 && insert < todo_list.nr)
strbuf_insert(buf, todo_list.items[insert].offset_in_buf +
offset, commands, commands_len);
else if (insert >= 0 || !offset)
strbuf_add(buf, commands, commands_len);

i = write_message(buf->buf, buf->len, todo_file, 0);
todo_list_release(&todo_list);
Expand Down
17 changes: 17 additions & 0 deletions t/t3430-rebase-merges.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,4 +363,21 @@ test_expect_success 'octopus merges' '
EOF
'

test_expect_success 'with --autosquash and --exec' '
git checkout -b with-exec H &&
echo Booh >B.t &&
test_tick &&
git commit --fixup B B.t &&
write_script show.sh <<-\EOF &&
subject="$(git show -s --format=%s HEAD)"
content="$(git diff HEAD^! | tail -n 1)"
echo "$subject: $content"
EOF
test_tick &&
git rebase -ir --autosquash --exec ./show.sh A >actual &&
grep "B: +Booh" actual &&
grep "E: +Booh" actual &&
grep "G: +G" actual
'

test_done