diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-10 13:11:43 -0800 |
| commit | 5dd1d59d35e1d8ea2101020df18298a9675d09b9 (patch) | |
| tree | b71edec710c0b0494b87c25787f6a5bf54984977 /advice.c | |
| parent | dac30e7b5dd6319039328b868a99e0732afab4ff (diff) | |
| parent | 4f3e57ef13d0ad4c00d0a87f0858cde81456a2e0 (diff) | |
| download | git-5dd1d59d35e1d8ea2101020df18298a9675d09b9.tar.gz | |
Merge branch 'jt/clone-recursesub-ref-advise'
The interaction between "git clone --recurse-submodules" and
alternate object store was ill-designed. The documentation and
code have been taught to make more clear recommendations when the
users see failures.
* jt/clone-recursesub-ref-advise:
submodule--helper: advise on fatal alternate error
Doc: explain submodule.alternateErrorStrategy
Diffstat (limited to 'advice.c')
| -rw-r--r-- | advice.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -30,6 +30,7 @@ int advice_waiting_for_editor = 1; int advice_graft_file_deprecated = 1; int advice_checkout_ambiguous_remote_branch_name = 1; int advice_nested_tag = 1; +int advice_submodule_alternate_error_strategy_die = 1; static int advice_use_color = -1; static char advice_colors[][COLOR_MAXLEN] = { @@ -89,6 +90,7 @@ static struct { { "graftFileDeprecated", &advice_graft_file_deprecated }, { "checkoutAmbiguousRemoteBranchName", &advice_checkout_ambiguous_remote_branch_name }, { "nestedTag", &advice_nested_tag }, + { "submoduleAlternateErrorStrategyDie", &advice_submodule_alternate_error_strategy_die }, /* make this an alias for backward compatibility */ { "pushNonFastForward", &advice_push_update_rejected } |