usage.c API users: use die_message() for error() + exit 128
Continue the migration of code that printed a message and exited with 128. In this case the caller used "error()", so we'll be changing the output from "error: " to "fatal: ". This change is intentional and desired. This code is dying, so it should emit "fatal", the only reason it didn't do so was because before the existence of "die_message()" it would have needed to craft its own "fatal: " message. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Dec 7, 2021 at 19:26 UTC
adcd4d4c6f9352bef53058161db36bb1ccd5cd9d
1 file changed
+5
-4
builtin/notes.c
+5
-4
@@ -201,11 +201,12 @@ static void prepare_note_data(const struct object_id *object, struct note_data *
201
static void write_note_data(struct note_data *d, struct object_id *oid)
202
{
203
if (write_object_file(d->buf.buf, d->buf.len, blob_type, oid)) {
204
- error(_("unable to write note object"));
204
+ int status = die_message(_("unable to write note object"));
205
+
206
if (d->edit_path)
206
- error(_("the note contents have been left in %s"),
207
- d->edit_path);
208
- exit(128);
207
+ die_message(_("the note contents have been left in %s"),
208
+ d->edit_path);
209
+ exit(status);
210
}
211
}
212