development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-10-30 04:01:21 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'js/rebase-merges-exec-fix'

Browse source 
The "--exec" option to "git rebase --rebase-merges" placed the exec
commands at wrong places, which has been corrected.

* js/rebase-merges-exec-fix:
  rebase --exec: make it work with --rebase-merges
  t3430: demonstrate what -r, --autosquash & --exec should do
This commit is contained in:
Junio C Hamano 2018-08-20 11:33:48 -07:00
commit 750eb11d8f
2 changed files with 48 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
sequencer.c
View file

@ -4255,10 +4255,9 @@ int sequencer_add_exec_commands(const char *commands)
{ {
const char *todo_file = rebase_path_todo(); const char *todo_file = rebase_path_todo();
struct todo_list todo_list = TODO_LIST_INIT; struct todo_list todo_list = TODO_LIST_INIT;
struct todo_item *item;
struct strbuf *buf = &todo_list.buf; struct strbuf *buf = &todo_list.buf;
size_t offset = 0, commands_len = strlen(commands); 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) if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
return error(_("could not read '%s'."), todo_file); return error(_("could not read '%s'."), todo_file);
@ -4268,18 +4267,39 @@ int sequencer_add_exec_commands(const char *commands)
return error(_("unusable todo list: '%s'"), todo_file); return error(_("unusable todo list: '%s'"), todo_file);
} }
first = 1; /*
/* insert <commands> before every pick except the first one */ * Insert <commands> after every pick. Here, fixup/squash chains
for (item = todo_list.items, i = 0; i < todo_list.nr; i++, item++) { * are considered part of the pick, so we insert the commands *after*
if (item->command == TODO_PICK && !first) { * those chains if there are any.
strbuf_insert(buf, item->offset_in_buf + offset, */
commands, commands_len); insert = -1;
offset += commands_len; 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;
} }
first = 0; strbuf_insert(buf,
todo_list.items[insert].offset_in_buf +
offset, commands, commands_len);
offset += commands_len;
insert = -1;
} }
/* append final <commands> */ if (command == TODO_PICK || command == TODO_MERGE)
insert = i + 1;
}
/* 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); strbuf_add(buf, commands, commands_len);
i = write_message(buf->buf, buf->len, todo_file, 0); i = write_message(buf->buf, buf->len, todo_file, 0);

17
t/t3430-rebase-merges.sh
View file

@ -363,4 +363,21 @@ test_expect_success 'octopus merges' '
EOF 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 test_done