From: Oswald Buddenhagen Date: Mon, 07 Aug 2023 17:09:35 GMT Subject: [PATCH v2] sequencer: rectify empty hint in call of require_clean_work_tree() Message-ID: <20230807170935.2336730-1-oswald.buddenhagen@gmx.de> In-Reply-To: <20230323162234.995514-1-oswald.buddenhagen@gmx.de> 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:". Alternatively, one could make the function treat empty strings like null strings, which would make it resemble its original script implementation more closely, but that doesn't seem like a worthwhile goal. If anything, I'd go in the opposite direction and assert() that the argument is not an empty string. Signed-off-by: Oswald Buddenhagen --- v2: - expanded commit message Cc: Junio C Hamano --- sequencer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sequencer.c b/sequencer.c index cc9821ece2..d15a7409d8 100644 --- a/sequencer.c +++ b/sequencer.c @@ -6182,7 +6182,7 @@ int complete_action(struct repository *r, struct replay_opts *opts, unsigned fla if (checkout_onto(r, opts, onto_name, &oid, orig_head)) goto cleanup; - if (require_clean_work_tree(r, "rebase", "", 1, 1)) + if (require_clean_work_tree(r, "rebase", NULL, 1, 1)) goto cleanup; todo_list_write_total_nr(&new_todo); -- 2.40.0.152.g15d061e6df