sequencer: rectify empty hint in call of require_clean_work_tree()
The canonical way to represent "no error hint" is making it NULL, which shortcuts the error() call altogether. This fixes the output by removing the line which said just "error:", which would appear when the worktree is dirtied while editing the initial rebase todo file. This was introduced by 97e1873 (rebase -i: rewrite complete_action() in C, 2018-08-28), which did a somewhat inaccurate conversion from shell. To avoid that such bugs re-appear, test for the condition in require_clean_work_tree(). Signed-off-by: Oswald Buddenhagen <oswald.buddenhagen@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Oswald Buddenhagen committed
Aug 24, 2023 at 17:00 UTC
a9b5955e07793ceadaad05315c1599226d01292f
2 files changed
+6
-2
sequencer.c
+1
-1
@@ -6172,7 +6172,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla
6172
if (checkout_onto(r, opts, onto_name, &oid, orig_head))
6173
goto cleanup;
6174
6175
- if (require_clean_work_tree(r, "rebase", "", 1, 1))
6175
+ if (require_clean_work_tree(r, "rebase", NULL, 1, 1))
6176
goto cleanup;
6177
6178
todo_list_write_total_nr(&new_todo);
wt-status.c
+5
-1
@@ -2651,8 +2651,12 @@ int require_clean_work_tree(struct repository *r,
2651
}
2652
2653
if (err) {
2654
- if (hint)
2654
+ if (hint) {
2655
+ if (!*hint)
2656
+ BUG("empty hint passed to require_clean_work_tree();"
2657
+ " use NULL instead");
2658
error("%s", hint);
2659
+ }
2660
if (!gently)
2661
exit(128);
2662
}