kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2023-11-02 16:53:20 +09:00
parent c78718c4b3 5f33a843de
commit 9ae84d2e7f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
upload-pack.c
View File

@ -801,11 +801,12 @@ error:
for (i = 0; i < data->want_obj.nr; i++) { for (i = 0; i < data->want_obj.nr; i++) {
struct object *o = data->want_obj.objects[i].item; struct object *o = data->want_obj.objects[i].item;
if (!is_our_ref(o, data->allow_uor)) { 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, packet_writer_error(&data->writer,
"upload-pack: not our ref %s", "upload-pack: not our ref %s",
oid_to_hex(&o->oid)); oid_to_hex(&o->oid));
die("git upload-pack: not our ref %s", exit(128);
oid_to_hex(&o->oid));
} }
} }
} }