aboutsummaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-05-29 19:12:42 +0700
committerJunio C Hamano <gitster@pobox.com>2013-05-29 11:31:36 -0700
commit798c35fcd8a71a094ca68ac05d81e08c5ac8166d (patch)
tree6832c0926c40542a955a83b77d70ef3ccc36cfeb /advice.h
parent239222f587ed06f96d90dd71c66d80a2b1e3dc9f (diff)
downloadgit-798c35fcd8a71a094ca68ac05d81e08c5ac8166d.tar.gz
git-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 'advice.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index fad36df46..24d5420b7 100644
--- a/advice.h
+++ b/advice.h
@@ -15,6 +15,7 @@ extern int advice_commit_before_merge;
extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
+extern int advice_object_name_warning;
int git_default_advice_config(const char *var, const char *value);
void advise(const char *advice, ...);