mirror of
https://github.com/git/git.git
synced 2024-11-27 12:03:55 +08:00
sequencer: move stale comment into correct location
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
8b637cdab0
commit
01710d0a3f
@ -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 */
|
||||
|
Loading…
Reference in New Issue
Block a user