diff options
| author |  Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-12-07 19:26:31 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-12-07 13:25:15 -0800 |
| commit | adcd4d4c6f9352bef53058161db36bb1ccd5cd9d (patch) | |
| tree | a16a84bb6a05d9c19c00b30931bd2e29a6ea11a8 | |
| parent | usage.c API users: use die_message() for "fatal :" + exit 128 (diff) | |
| download | tgif-adcd4d4c6f9352bef53058161db36bb1ccd5cd9d.tar.xz | |
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>
| -rw-r--r-- | builtin/notes.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/builtin/notes.c b/builtin/notes.c index 71c59583a1..2812d1eac4 100644 --- a/builtin/notes.c +++ b/builtin/notes.c @@ -201,11 +201,12 @@ static void prepare_note_data(const struct object_id *object, struct note_data * static void write_note_data(struct note_data *d, struct object_id *oid) { if (write_object_file(d->buf.buf, d->buf.len, blob_type, oid)) { - error(_("unable to write note object")); + int status = die_message(_("unable to write note object")); + if (d->edit_path) - error(_("the note contents have been left in %s"), - d->edit_path); - exit(128); + die_message(_("the note contents have been left in %s"), + d->edit_path); + exit(status); } } |