| commit | e87c9d1263354c671391e184ae89be5fe0af3d81 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 Jun 2013 22:27:22 +0000 (4 15:27 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 4 Jun 2013 22:27:23 +0000 (4 15:27 -0700) | ||
| tree | c2537cfac75b0c1211f5e1e1e14abcfcfac05e1f | treesnapshot (tar.gz zip) |
| parent | 67d1fc7283096e46b6538a52d5dc0bafa708f642 | commitdiff |
| parent | 798c35fcd8a71a094ca68ac05d81e08c5ac8166d | commitdiff |
Merge branch 'nd/warn-ambiguous-object-name' into next
"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
"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 | diff1 | diff2 | blobhistory |
| advice.h | diff1 | diff2 | blobhistory |
| sha1_name.c | diff1 | diff2 | blobhistory |