Merge branch 'mm/verify-filename-fix' into maint
authorJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:45:49 +0000 (12:45 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 11 Jul 2012 19:45:49 +0000 (12:45 -0700)
commit9ca724933a8d50633699acf3e5731fa392e2ff36
tree3aacdf358feb1e0bf564b8e0a62c31b8231c8d8e
parenta0ceb72f38bf841322fc8ce28ea39328e8a5aa19
parent023e37c37780d6a56f2870a979c8eb3a9ee9a44d
Merge branch 'mm/verify-filename-fix' into maint

"git diff COPYING HEAD:COPYING" gave a nonsense error message that
claimed that the treeish HEAD did not have COPYING in it.

* mm/verify-filename-fix:
  verify_filename(): ask the caller to chose the kind of diagnosis
  sha1_name: do not trigger detailed diagnosis for file arguments
builtin/grep.c
builtin/rev-parse.c
cache.h
revision.c
setup.c
sha1_name.c