Merge branch 'nd/upload-pack-shallow-must-be-commit'
authorJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:15:44 +0000 (08:15 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 14 Jan 2013 16:15:44 +0000 (08:15 -0800)
A minor consistency check patch that does not have much relevance
to the real world.

* nd/upload-pack-shallow-must-be-commit:
  upload-pack: only accept commits from "shallow" line

1  2 
upload-pack.c

diff --cc upload-pack.c
Simple merge