Merge branch 'jk/shallow-update-fix'
authorJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2014 19:33:29 +0000 (21 12:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 21 Mar 2014 19:33:29 +0000 (21 12:33 -0700)
Serving objects from a shallow repository needs to write a
new file to hold the temporary shallow boundaries but it was not
cleaned when we exit due to die() or a signal.

* jk/shallow-update-fix:
  shallow: verify shallow file after taking lock
  shallow: automatically clean up shallow tempfiles
  shallow: use stat_validity to check for up-to-date file

1  2 
fetch-pack.c
upload-pack.c

diff --cc fetch-pack.c
Simple merge
diff --cc upload-pack.c
Simple merge