sequencer (rebase -i): write the 'done' file
In the interactive rebase, commands that were successfully processed are not simply discarded, but appended to the 'done' file instead. This is used e.g. to display the current state to the user in the output of `git status` or the progress. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Jan 2, 2017 at 16:27 UTC
1df6df0c18d068a80010e137b5f1d1dcc2bda600
1 file changed
+23
sequencer.c
+23
@@ -40,6 +40,12 @@ static GIT_PATH_FUNC(rebase_path, "rebase-merge")
40
* file and written to the tail of 'done'.
41
*/
42
static GIT_PATH_FUNC(rebase_path_todo, "rebase-merge/git-rebase-todo")
43
+/*
44
+ * The rebase command lines that have already been processed. A line
45
+ * is moved here when it is first handled, before any associated user
46
+ * actions.
47
+ */
48
+static GIT_PATH_FUNC(rebase_path_done, "rebase-merge/done")
49
/*
50
* A script to set the GIT_AUTHOR_NAME, GIT_AUTHOR_EMAIL, and
51
* GIT_AUTHOR_DATE that will be used for the commit that is currently
@@ -1296,6 +1302,23 @@ static int save_todo(struct todo_list *todo_list, struct replay_opts *opts)
1302
return error_errno(_("could not write to '%s'"), todo_path);
1303
if (commit_lock_file(&todo_lock) < 0)
1304
return error(_("failed to finalize '%s'."), todo_path);
1305
+
1306
+ if (is_rebase_i(opts)) {
1307
+ const char *done_path = rebase_path_done();
1308
+ int fd = open(done_path, O_CREAT | O_WRONLY | O_APPEND, 0666);
1309
+ int prev_offset = !next ? 0 :
1310
+ todo_list->items[next - 1].offset_in_buf;
1311
+
1312
+ if (fd >= 0 && offset > prev_offset &&
1313
+ write_in_full(fd, todo_list->buf.buf + prev_offset,
1314
+ offset - prev_offset) < 0) {
1315
+ close(fd);
1316
+ return error_errno(_("could not write to '%s'"),
1317
+ done_path);
1318
+ }
1319
+ if (fd >= 0)
1320
+ close(fd);
1321
+ }
1322
return 0;
1323
}
1324