Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
sequencer: move stale comment into correct location
author
Johannes Schindelin
<johannes.schindelin@gmx.de>
Wed, 13 Mar 2019 10:16:33 +0000
(
03:16
-0700)
committer
Junio C Hamano
<gitster@pobox.com>
Thu, 14 Mar 2019 03:46:29 +0000
(12:46 +0900)
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
sequencer.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
8b637cd
)
diff --git
a/sequencer.c
b/sequencer.c
index f91062718dd9ddfbf9e49ad2844485edeb1af1a8..79a046d748300d76ec66f5fd4cd0cb0e681b5651 100644
(file)
--- a/
sequencer.c
+++ b/
sequencer.c
@@
-3641,7
+3641,6
@@
static int pick_commits(struct repository *r,
res = do_exec(r, item->arg);
*end_of_arg = saved;
- /* Reread the todo file if it has changed. */
if (res) {
if (opts->reschedule_failed_exec)
reschedule = 1;
@@
-3649,6
+3648,7
@@
static int pick_commits(struct repository *r,
res = error_errno(_("could not stat '%s'"),
get_todo_path(opts));
else if (match_stat_data(&todo_list->stat, &st)) {
+ /* Reread the todo file if it has changed. */
todo_list_release(todo_list);
if (read_populate_todo(r, todo_list, opts))
res = -1; /* message was printed */