summaryrefslogtreecommitdiff
path: root/advice.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2018-04-28 22:44:44 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-04-30 02:12:31 (GMT)
commitf9f99b3f7d06716336b239bcf122eb5a7348bfd5 (patch)
tree2a7813e7ae8389cfef632073f4d5f654a53bfef7 /advice.h
parent0115e030db499853a77c2b92dc8c6a51552009ef (diff)
downloadgit-f9f99b3f7d06716336b239bcf122eb5a7348bfd5.zip
git-f9f99b3f7d06716336b239bcf122eb5a7348bfd5.tar.gz
git-f9f99b3f7d06716336b239bcf122eb5a7348bfd5.tar.bz2
Deprecate support for .git/info/grafts
The grafts feature was a convenient way to "stitch together" ancient history to the fresh start of linux.git. Its implementation is, however, not up to Git's standards, as there are too many ways where it can lead to surprising and unwelcome behavior. For example, when pushing from a repository with active grafts, it is possible to miss commits that have been "grafted out", resulting in a broken state on the other side. Also, the grafts feature is limited to "rewriting" commits' list of parents, it cannot replace anything else. The much younger feature implemented as `git replace` set out to remedy those limitations and dangerous bugs. Seeing as `git replace` is pretty mature by now (since 4228e8bc98 (replace: add --graft option, 2014-07-19) it can perform the graft file's duties), it is time to deprecate support for the graft file, and to retire it eventually. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Reviewed-by: Stefan Beller <sbeller@google.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 70568fa..9f5064e 100644
--- a/advice.h
+++ b/advice.h
@@ -21,6 +21,7 @@ extern int advice_rm_hints;
extern int advice_add_embedded_repo;
extern int advice_ignored_hook;
extern int advice_waiting_for_editor;
+extern int advice_graft_file_deprecated;
int git_default_advice_config(const char *var, const char *value);
__attribute__((format (printf, 1, 2)))