undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'js/log-protocol-version'

Browse Source 
Debugging aid.

* js/log-protocol-version:
  connect, protocol: log negotiated protocol version
This commit is contained in:
Junio C Hamano 2021-08-30 16:06:02 -07:00
commit b81a85ecd8
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
connect.c
View File

@ -164,6 +164,8 @@ enum protocol_version discover_version(struct packet_reader *reader)
BUG("unknown protocol version"); BUG("unknown protocol version");
} }
trace2_data_intmax("transfer", NULL, "negotiated-version", version);
return version; return version;
} }

2
protocol.c
View File

@ -73,6 +73,8 @@ enum protocol_version determine_protocol_version_server(void)
string_list_clear(&list, 0); string_list_clear(&list, 0);
} }
trace2_data_intmax("transfer", NULL, "negotiated-version", version);
return version; return version;
} }

11
t/t5705-session-id-in-capabilities.sh
View File

@ -73,6 +73,17 @@ do
grep \"key\":\"server-sid\" tr2-client-events && grep \"key\":\"server-sid\" tr2-client-events &&
grep \"key\":\"client-sid\" tr2-server-events grep \"key\":\"client-sid\" tr2-server-events
' '
test_expect_success "client & server log negotiated version (v${PROTO})" '
test_when_finished "rm -rf local tr2-client-events tr2-server-events" &&
cp -r "$LOCAL_PRISTINE" local &&
GIT_TRACE2_EVENT="$(pwd)/tr2-client-events" \
git -c protocol.version=$PROTO -C local fetch \
--upload-pack "GIT_TRACE2_EVENT=\"$(pwd)/tr2-server-events\" git-upload-pack" \
origin &&
grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-client-events &&
grep \"key\":\"negotiated-version\",\"value\":\"$PROTO\" tr2-server-events
'
done done
test_done test_done