summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-06-24 14:28:41 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-06-24 14:28:41 -0700
commitcda4ba30b1d6257524b9412ed4d7c44645fe0369 (patch)
treec02dddf0db7583b8a3f50dc08c6b375103f97ed8 /advice.h
parentMerge branch 'bw/config-h' (diff)
parentt: move "git add submodule" into test blocks (diff)
downloadtgif-cda4ba30b1d6257524b9412ed4d7c44645fe0369.tar.xz
Merge branch 'jk/warn-add-gitlink'
Using "git add d/i/r" when d/i/r is the top of the working tree of a separate repository would create a gitlink in the index, which would appear as a not-quite-initialized submodule to others. We learned to give warnings when this happens. * jk/warn-add-gitlink: t: move "git add submodule" into test blocks add: warn when adding an embedded repository
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 b341a55ce7..c84a44531c 100644
--- a/advice.h
+++ b/advice.h
@@ -18,6 +18,7 @@ extern int advice_detached_head;
extern int advice_set_upstream_failure;
extern int advice_object_name_warning;
extern int advice_rm_hints;
+extern int advice_add_embedded_repo;
int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))