Skip to content

Commit 29bf38f

Browse files
derrickstoleedscho
authored andcommitted
upload-pack: fix race condition in error messages
Test t5516-fetch-push.sh has a test 'deny fetch unreachable SHA1, allowtipsha1inwant=true' that checks stderr for a specific error string from the remote. In some build environments the error sent over the remote connection gets mingled with the error from the die() statement. Since both signals are being output to the same file descriptor (but from parent and child processes), the output we are matching with grep gets split. To reduce the risk of this failure, follow this process instead: 1. Write an error message to stderr. 2. Write an error message across the connection. 3. exit(1). This reorders the events so the error is written entirely before the client receives a message from the remote, removing the race condition. Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
1 parent 98c7fc4 commit 29bf38f

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+
warning("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(1);
809810
}
810811
}
811812
}

0 commit comments

Comments
 (0)