From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Dec 2019 21:11:43 +0000 (-0800)
Subject: Merge branch 'jt/clone-recursesub-ref-advise'
X-Git-Tag: v2.25.0-rc0~46
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5dd1d59d35e1d8ea2101020df18298a9675d09b9;p=thirdparty%2Fgit.git

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
---

5dd1d59d35e1d8ea2101020df18298a9675d09b9
diff --cc builtin/submodule--helper.c
index a4f9f8dc72,12d546dfbb..c72931ecd7
--- a/builtin/submodule--helper.c
+++ b/builtin/submodule--helper.c
@@@ -19,7 -19,7 +19,8 @@@
  #include "diffcore.h"
  #include "diff.h"
  #include "object-store.h"
 +#include "dir.h"
+ #include "advice.h"
  
  #define OPT_QUIET (1 << 0)
  #define OPT_CACHED (1 << 1)