diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:17 +0900 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 14:38:17 +0900 |
commit | 352cf6cfe138b1dbcf9c105c91ca793b67511d7b (patch) | |
tree | c7aa5bc4bc01eafeb06d8c000397da6b881e95a7 /advice.c | |
parent | Merge branch 'js/test-unset-prereq' (diff) | |
parent | Remove obsolete script to convert grafts to replace refs (diff) | |
download | tgif-352cf6cfe138b1dbcf9c105c91ca793b67511d7b.tar.xz |
Merge branch 'js/deprecate-grafts'
The functionality of "$GIT_DIR/info/grafts" has been superseded by
the "refs/replace/" mechanism for some time now, but the internal
code had support for it in many places, which has been cleaned up
in order to drop support of the "grafts" mechanism.
* js/deprecate-grafts:
Remove obsolete script to convert grafts to replace refs
technical/shallow: describe why shallow cannot use replace refs
technical/shallow: stop referring to grafts
filter-branch: stop suggesting to use grafts
Deprecate support for .git/info/grafts
Add a test for `git replace --convert-graft-file`
replace: introduce --convert-graft-file
replace: prepare create_graft() for converting graft files wholesale
replace: "libify" create_graft() and callees
replace: avoid using die() to indicate a bug
commit: Let the callback of for_each_mergetag return on error
argv_array: offer to split a string by whitespace
Diffstat (limited to 'advice.c')
-rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -20,6 +20,7 @@ int advice_rm_hints = 1; int advice_add_embedded_repo = 1; int advice_ignored_hook = 1; int advice_waiting_for_editor = 1; +int advice_graft_file_deprecated = 1; static int advice_use_color = -1; static char advice_colors[][COLOR_MAXLEN] = { @@ -70,6 +71,7 @@ static struct { { "addembeddedrepo", &advice_add_embedded_repo }, { "ignoredhook", &advice_ignored_hook }, { "waitingforeditor", &advice_waiting_for_editor }, + { "graftfiledeprecated", &advice_graft_file_deprecated }, /* make this an alias for backward compatibility */ { "pushnonfastforward", &advice_push_update_rejected } |