Merge branch 'nd/warn-ambiguous-object-name'
commitf4c52a05277f8f5901f7663f6ab339271b814872
authorJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:07 +0000 (11 13:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 Jun 2013 20:31:07 +0000 (11 13:31 -0700)
tree994c7cbe55b25f15a952eea7f6df7e8f3f39877b
parent71e120202fe073bd2e4e9db59ca01ab7c5e72f7e
parent798c35fcd8a71a094ca68ac05d81e08c5ac8166d
Merge branch 'nd/warn-ambiguous-object-name'

"git cmd <name>", when <name> happens to be a 40-hex string,
directly uses the 40-hex string as an object name, even if a ref
"refs/<some hierarchy>/<name>" exists.  This disambiguation order
is unlikely to change, but we should warn about the ambiguity just
like we warn when more than one refs/ hierachies share the same
name.

* nd/warn-ambiguous-object-name:
  get_sha1: warn about full or short object names that look like refs
advice.c
advice.h
sha1_name.c