From: "Johannes Schindelin via GitGitGadget" <gitgitgadget@gmail.com>
To: git@vger.kernel.org
Cc: Junio C Hamano <gitster@pobox.com>
Subject: [PATCH v2 0/2] Make git rebase work with --rebase-merges and --exec
Date: Mon, 06 Aug 2018 02:52:51 -0700 (PDT) [thread overview]
Message-ID: <pull.13.v2.git.gitgitgadget@gmail.com> (raw)
In-Reply-To: <pull.13.git.gitgitgadget@gmail.com>
It was reported via IRC that the exec lines are inserted in the wrong spots
when using --rebase-merges.
The reason is that we used a simple, incorrect implementation that happened
to work as long as the generated todo list only contains pick, fixup and
squash commands. Which is not the case with--rebase-merges.
Fix this issue by using a correct, if longer and slightly more complex
implementation instead.
Johannes Schindelin (2):
t3430: demonstrate what -r, --autosquash & --exec should do
rebase --exec: make it work with --rebase-merges
sequencer.c | 37 +++++++++++++++++++++++++++----------
t/t3430-rebase-merges.sh | 17 +++++++++++++++++
2 files changed, 44 insertions(+), 10 deletions(-)
base-commit: 1d89318c48d233d52f1db230cf622935ac3c69fa
Published-As: https://github.com/gitgitgadget/git/releases/tags/pr-13%2Fdscho%2Frebase-merges-and-exec-commands-v2
Fetch-It-Via: git fetch https://github.com/gitgitgadget/git pr-13/dscho/rebase-merges-and-exec-commands-v2
Pull-Request: https://github.com/gitgitgadget/git/pull/13
Range-diff vs v1:
1: 1d82eb450 = 1: 1d82eb450 t3430: demonstrate what -r, --autosquash & --exec should do
2: b29c4d979 ! 2: 7ca441a89 rebase --exec: make it work with --rebase-merges
@@ -38,7 +38,7 @@
struct strbuf *buf = &todo_list.buf;
size_t offset = 0, commands_len = strlen(commands);
- int i, first;
-+ int i, insert_final_commands;
++ int i, insert;
if (strbuf_read_file(&todo_list.buf, todo_file, 0) < 0)
return error(_("could not read '%s'."), todo_file);
@@ -52,59 +52,38 @@
- if (item->command == TODO_PICK && !first) {
- strbuf_insert(buf, item->offset_in_buf + offset,
- commands, commands_len);
-- offset += 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_final_commands = 1;
-+ for (i = 0; i < todo_list.nr; ) {
++ insert = -1;
++ for (i = 0; i < todo_list.nr; i++) {
+ enum todo_command command = todo_list.items[i].command;
-+ int j = 0;
+
-+ if (command != TODO_PICK && command != TODO_MERGE) {
-+ i++;
-+ continue;
-+ }
-+
-+ /* skip fixup/squash chain, if any */
-+ for (i++; i < todo_list.nr; i++, j = 0) {
-+ command = todo_list.items[i].command;
-+
-+ if (is_fixup(command))
++ if (insert >= 0) {
++ /* skip fixup/squash chains */
++ if (command == TODO_COMMENT)
+ continue;
-+
-+ if (command != TODO_COMMENT)
-+ break;
-+
-+ /* skip comment if followed by any fixup/squash */
-+ for (j = i + 1; j < todo_list.nr; j++)
-+ if (todo_list.items[j].command != TODO_COMMENT)
-+ break;
-+ if (j < todo_list.nr &&
-+ is_fixup(todo_list.items[j].command)) {
-+ i = j;
++ else if (is_fixup(command)) {
++ insert = i + 1;
+ continue;
+ }
-+ break;
++ strbuf_insert(buf,
++ todo_list.items[insert].offset_in_buf +
++ offset, commands, commands_len);
+ offset += commands_len;
++ insert = -1;
}
- first = 0;
+
-+ if (i >= todo_list.nr) {
-+ insert_final_commands = 1;
-+ break;
-+ }
-+
-+ strbuf_insert(buf, todo_list.items[i].offset_in_buf + offset,
-+ commands, commands_len);
-+ offset += commands_len;
-+ insert_final_commands = 0;
++ if (command == TODO_PICK || command == TODO_MERGE)
++ insert = i + 1;
}
/* append final <commands> */
- strbuf_add(buf, commands, commands_len);
-+ if (insert_final_commands)
++ if (insert >= 0 || !offset)
+ strbuf_add(buf, commands, commands_len);
i = write_message(buf->buf, buf->len, todo_file, 0);
--
gitgitgadget
next prev parent reply other threads:[~2018-08-06 9:52 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-03 17:42 [PATCH 0/2] Make git rebase work with --rebase-merges and --exec Johannes Schindelin via GitGitGadget
2018-08-03 17:42 ` [PATCH 1/2] t3430: demonstrate what -r, --autosquash & --exec should do Johannes Schindelin via GitGitGadget
2018-08-03 17:42 ` [PATCH 2/2] rebase --exec: make it work with --rebase-merges Johannes Schindelin via GitGitGadget
2018-08-03 18:28 ` Junio C Hamano
2018-08-06 9:34 ` Johannes Schindelin
2018-08-06 9:50 ` Johannes Schindelin
2018-08-06 15:12 ` Junio C Hamano
2018-08-03 20:26 ` Junio C Hamano
2018-08-06 9:36 ` Johannes Schindelin
2018-08-06 9:52 ` Johannes Schindelin via GitGitGadget [this message]
2018-08-06 9:52 ` [PATCH v2 1/2] t3430: demonstrate what -r, --autosquash & --exec should do Johannes Schindelin via GitGitGadget
2018-08-06 9:52 ` [PATCH v2 2/2] rebase --exec: make it work with --rebase-merges Johannes Schindelin via GitGitGadget
2018-08-06 15:23 ` Phillip Wood
2018-08-06 16:00 ` Phillip Wood
2018-08-09 9:22 ` Johannes Schindelin
2018-08-09 10:04 ` Phillip Wood
2018-08-09 13:30 ` Johannes Schindelin
2018-08-06 10:08 ` [PATCH v2 0/2] Make git rebase work with --rebase-merges and --exec Johannes Schindelin
2018-08-09 9:41 ` [PATCH v3 " Johannes Schindelin via GitGitGadget
2018-08-09 9:41 ` [PATCH v3 1/2] t3430: demonstrate what -r, --autosquash & --exec should do Johannes Schindelin via GitGitGadget
2018-08-09 9:41 ` [PATCH v3 2/2] rebase --exec: make it work with --rebase-merges Johannes Schindelin via GitGitGadget
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=pull.13.v2.git.gitgitgadget@gmail.com \
--to=gitgitgadget@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).