Merge branch 'jk/sha1-file-reduce-useless-warnings'
authorJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:40 +0000 (14:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 11 May 2015 21:23:41 +0000 (14:23 -0700)
* jk/sha1-file-reduce-useless-warnings:
sha1_file: squelch "packfile cannot be accessed" warnings

1  2 
builtin/pack-objects.c
sha1_file.c
Simple merge
diff --cc sha1_file.c
Simple merge