Andrew's git / gitweb.git / diff
?
Merge branch 'jk/sha1-file-reduce-useless-warnings' into maint
authorJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:07 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 5 Jun 2015 19:00:07 +0000 (12:00 -0700)
* jk/sha1-file-reduce-useless-warnings:
sha1_file: squelch "packfile cannot be accessed" warnings

1  2 
builtin/pack-objects.c patch | diff1 | diff2 | blob | history
sha1_file.c patch | diff1 | diff2 | blob | history
diff --cc builtin/pack-objects.c
Simple merge
diff --cc sha1_file.c
Simple merge