diff options
| author | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:20 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2023-11-02 16:53:20 +0900 |
| commit | 9ae84d2e7fc9dddec2ab0330e13b4f5c4ab7d5d0 (patch) | |
| tree | fa4cd0416c4e3dfa654c336491f6334e0d43bfd3 | |
| parent | c78718c4b3b737151e7883c0c0110933f599fd07 (diff) | |
| parent | 5f33a843de91f40ab2335e61d4373ace87301b07 (diff) | |
| download | git-9ae84d2e7fc9dddec2ab0330e13b4f5c4ab7d5d0.tar.gz | |
Merge branch 'ds/upload-pack-error-sequence-fix' into maint-2.42
Error message generation fix.
* ds/upload-pack-error-sequence-fix:
upload-pack: fix exit code when denying fetch of unreachable object ID
upload-pack: fix race condition in error messages
| -rw-r--r-- | upload-pack.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/upload-pack.c b/upload-pack.c index 94751477ab..83f3d2651a 100644 --- a/upload-pack.c +++ b/upload-pack.c @@ -801,11 +801,12 @@ error: for (i = 0; i < data->want_obj.nr; i++) { struct object *o = data->want_obj.objects[i].item; if (!is_our_ref(o, data->allow_uor)) { + error("git upload-pack: not our ref %s", + oid_to_hex(&o->oid)); packet_writer_error(&data->writer, "upload-pack: not our ref %s", oid_to_hex(&o->oid)); - die("git upload-pack: not our ref %s", - oid_to_hex(&o->oid)); + exit(128); } } } |