summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-06-11 20:31:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-06-11 20:31:07 (GMT)
commitf4c52a05277f8f5901f7663f6ab339271b814872 (patch)
tree994c7cbe55b25f15a952eea7f6df7e8f3f39877b /advice.h
parent71e120202fe073bd2e4e9db59ca01ab7c5e72f7e (diff)
parent798c35fcd8a71a094ca68ac05d81e08c5ac8166d (diff)
downloadgit-f4c52a05277f8f5901f7663f6ab339271b814872.zip
git-f4c52a05277f8f5901f7663f6ab339271b814872.tar.gz
git-f4c52a05277f8f5901f7663f6ab339271b814872.tar.bz2
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 'advice.h')
-rw-r--r--advice.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/advice.h b/advice.h
index 94caa32..fefe39a 100644
--- a/advice.h
+++ b/advice.h
@@ -17,6 +17,7 @@ extern int advice_resolve_conflict;
extern int advice_implicit_identity;
extern int advice_detached_head;
extern int advice_set_upstream_failure;
+extern int advice_object_name_warning;
int git_default_advice_config(const char *var, const char *value);
void advise(const char *advice, ...);