diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:07 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-11 13:31:07 -0700 |
| commit | f4c52a05277f8f5901f7663f6ab339271b814872 (patch) | |
| tree | 994c7cbe55b25f15a952eea7f6df7e8f3f39877b /t/t9810-git-p4-rcs.sh | |
| parent | Merge branch 'rr/diffcore-pickaxe-doc' (diff) | |
| parent | get_sha1: warn about full or short object names that look like refs (diff) | |
| download | tgif-f4c52a05277f8f5901f7663f6ab339271b814872.tar.xz | |
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
Diffstat (limited to 't/t9810-git-p4-rcs.sh')
0 files changed, 0 insertions, 0 deletions