diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-05-29 19:12:42 +0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-05-29 11:31:36 -0700 |
commit | 798c35fcd8a71a094ca68ac05d81e08c5ac8166d (patch) | |
tree | 6832c0926c40542a955a83b77d70ef3ccc36cfeb /Documentation/merge-strategies.txt | |
parent | Git 1.8.2 (diff) | |
download | tgif-798c35fcd8a71a094ca68ac05d81e08c5ac8166d.tar.xz |
get_sha1: warn about full or short object names that look like refs
When we get 40 hex digits, we immediately assume it's an SHA-1. This
is the right thing to do because we have no way else to specify an
object. If there is a ref with the same object name, it will be
ignored. Warn the user about this case because the ref with full
object name is likely a mistake, for example
git checkout -b $empty_var $(git rev-parse something)
advice.object_name_warning is not documented because frankly people
should not be aware about it until they encounter this situation.
While at there, warn about ambiguation with abbreviated SHA-1 too.
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/merge-strategies.txt')
0 files changed, 0 insertions, 0 deletions