]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'jt/clone-recursesub-ref-advise'
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:43 +0000 (13:11 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Dec 2019 21:11:43 +0000 (13:11 -0800)
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

1  2 
builtin/submodule--helper.c

index a4f9f8dc72ba4865a4af430848f3fa5876b6fb7a,12d546dfbba5ee3d26a95b6eaea22a5a3aaf6bd3..c72931ecd74a15fe659c66d4795fe1a191ab90e0
@@@ -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)