Skip to content

Commit 84d7900

Browse files
committed
Merge branch 'ds/upload-pack-error-sequence-fix'
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
2 parents 2f8aa2c + 5f33a84 commit 84d7900

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

upload-pack.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -801,11 +801,12 @@ static void check_non_tip(struct upload_pack_data *data)
801801
for (i = 0; i < data->want_obj.nr; i++) {
802802
struct object *o = data->want_obj.objects[i].item;
803803
if (!is_our_ref(o, data->allow_uor)) {
804+
error("git upload-pack: not our ref %s",
805+
oid_to_hex(&o->oid));
804806
packet_writer_error(&data->writer,
805807
"upload-pack: not our ref %s",
806808
oid_to_hex(&o->oid));
807-
die("git upload-pack: not our ref %s",
808-
oid_to_hex(&o->oid));
809+
exit(128);
809810
}
810811
}
811812
}

0 commit comments

Comments
 (0)