]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c3cb52 362d8b6)
Merge branch 'sb/http-flaky-test-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:49 +0000 (14:32 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2015 21:32:49 +0000 (14:32 -0700)
A test script for the HTTP service had a timing dependent bug,
which was fixed.

* sb/http-flaky-test-fix:
  t5561: get rid of racy appending to logfile

1  2 
t/t5560-http-backend-noserver.sh patch | diff1 | diff2 | blob | history
t/t5561-http-backend.sh patch | diff1 | diff2 | blob | history

diff --cc t/t5560-http-backend-noserver.sh
Simple merge
diff --cc t/t5561-http-backend.sh
Simple merge
Unnamed repository; edit this file 'description' to name the repository.