mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clone: recursive and reference option triggers submodule alternates

Browse Source 
When `--recursive` and `--reference` is given, it is reasonable to
expect that the submodules are created with references to the submodules
of the given alternate for the superproject.

  An initial attempt to do this was presented to the mailing list, which
  used flags that are passed around ("--super-reference") that instructed
  the submodule clone to look for a reference in the submodules of the
  referenced superproject. This is not well thought out, as any further
  `submodule update` should also respect the initial setup.

  When a new  submodule is added to the superproject and the alternate
  of the superproject does not know about that submodule yet, we rather
  error out informing the user instead of being unclear if we did or did
  not use a submodules alternate.

To solve this problem introduce new options that store the configuration
for what the user wanted originally.

Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2016-08-17 15:45:35 -07:00
committed by Junio C Hamano
parent f7415b4d71
commit 31224cbdc7
4 changed files with 176 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
t/t7408-submodule-reference.sh
View File

@ -82,4 +82,47 @@ test_expect_success 'updating superproject keeps alternates' '
test_alternate_is_used super-clone/.git/modules/sub/objects/info/alternates super-clone/sub
'
test_expect_success 'submodules use alternates when cloning a superproject' '
test_when_finished "rm -rf super-clone" &&
git clone --reference super --recursive super super-clone &&
(
cd super-clone &&
# test superproject has alternates setup correctly
test_alternate_is_used .git/objects/info/alternates . &&
# test submodule has correct setup
test_alternate_is_used .git/modules/sub/objects/info/alternates sub
)
'
test_expect_success 'missing submodule alternate fails clone and submodule update' '
test_when_finished "rm -rf super-clone" &&
git clone super super2 &&
test_must_fail git clone --recursive --reference super2 super2 super-clone &&
(
cd super-clone &&
# test superproject has alternates setup correctly
test_alternate_is_used .git/objects/info/alternates . &&
# update of the submodule succeeds
test_must_fail git submodule update --init &&
# and we have no alternates:
test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
test_must_fail test_path_is_file sub/file1
)
'
test_expect_success 'ignoring missing submodule alternates passes clone and submodule update' '
test_when_finished "rm -rf super-clone" &&
git clone --reference-if-able super2 --recursive super2 super-clone &&
(
cd super-clone &&
# test superproject has alternates setup correctly
test_alternate_is_used .git/objects/info/alternates . &&
# update of the submodule succeeds
git submodule update --init &&
# and we have no alternates:
test_must_fail test_alternate_is_used .git/modules/sub/objects/info/alternates sub &&
test_path_is_file sub/file1
)
'
test_done