mirror of
https://github.com/git/git.git
synced 2024-11-30 21:44:02 +08:00
bf03b79047
In 31224cbdc7 (clone: recursive and reference option triggers
submodule alternates, 2016-08-17) a mechanism was added to
have submodules referenced. It did not address _nested_
submodules, however.
This patch makes all not just the root repository, but also
all submodules (recursively) have submodule.alternateLocation
and submodule.alternateErrorStrategy configured, making Git
search for possible alternates for nested submodules as well.
As submodule's alternate target does not end in .git/objects
(rather .git/modules/qqqqqq/objects), this alternate target
path restriction for in add_possible_reference_from_superproject
relates from "*.git/objects" to just */objects".
New tests have been added to t7408-submodule-reference.
Signed-off-by: Vitaly _Vi Shukela <vi0oss@gmail.com>
Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
195 lines
5.9 KiB
Bash
Executable File
195 lines
5.9 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2009, Red Hat Inc, Author: Michael S. Tsirkin (mst@redhat.com)
|
|
#
|
|
|
|
test_description='test clone --reference'
|
|
. ./test-lib.sh
|
|
|
|
base_dir=$(pwd)
|
|
|
|
test_alternate_is_used () {
|
|
alternates_file="$1" &&
|
|
working_dir="$2" &&
|
|
test_line_count = 1 "$alternates_file" &&
|
|
echo "0 objects, 0 kilobytes" >expect &&
|
|
git -C "$working_dir" count-objects >actual &&
|
|
test_cmp expect actual
|
|
}
|
|
|
|
test_expect_success 'preparing first repository' '
|
|
test_create_repo A &&
|
|
(
|
|
cd A &&
|
|
echo first >file1 &&
|
|
git add file1 &&
|
|
git commit -m A-initial
|
|
)
|
|
'
|
|
|
|
test_expect_success 'preparing second repository' '
|
|
git clone A B &&
|
|
(
|
|
cd B &&
|
|
echo second >file2 &&
|
|
git add file2 &&
|
|
git commit -m B-addition &&
|
|
git repack -a -d &&
|
|
git prune
|
|
)
|
|
'
|
|
|
|
test_expect_success 'preparing superproject' '
|
|
test_create_repo super &&
|
|
(
|
|
cd super &&
|
|
echo file >file &&
|
|
git add file &&
|
|
git commit -m B-super-initial
|
|
)
|
|
'
|
|
|
|
test_expect_success 'submodule add --reference uses alternates' '
|
|
(
|
|
cd super &&
|
|
git submodule add --reference ../B "file://$base_dir/A" sub &&
|
|
git commit -m B-super-added &&
|
|
git repack -ad
|
|
) &&
|
|
test_alternate_is_used super/.git/modules/sub/objects/info/alternates super/sub
|
|
'
|
|
|
|
test_expect_success 'that reference gets used with add' '
|
|
(
|
|
cd super/sub &&
|
|
echo "0 objects, 0 kilobytes" >expected &&
|
|
git count-objects >current &&
|
|
diff expected current
|
|
)
|
|
'
|
|
|
|
# The tests up to this point, and repositories created by them
|
|
# (A, B, super and super/sub), are about setting up the stage
|
|
# for subsequent tests and meant to be kept throughout the
|
|
# remainder of the test.
|
|
# Tests from here on, if they create their own test repository,
|
|
# are expected to clean after themselves.
|
|
|
|
test_expect_success 'updating superproject keeps alternates' '
|
|
test_when_finished "rm -rf super-clone" &&
|
|
git clone super super-clone &&
|
|
git -C super-clone submodule update --init --reference ../B &&
|
|
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_expect_success 'preparing second superproject with a nested submodule plus partial clone' '
|
|
test_create_repo supersuper &&
|
|
(
|
|
cd supersuper &&
|
|
echo "I am super super." >file &&
|
|
git add file &&
|
|
git commit -m B-super-super-initial
|
|
git submodule add "file://$base_dir/super" subwithsub &&
|
|
git commit -m B-super-super-added &&
|
|
git submodule update --init --recursive &&
|
|
git repack -ad
|
|
) &&
|
|
git clone supersuper supersuper2 &&
|
|
(
|
|
cd supersuper2 &&
|
|
git submodule update --init
|
|
)
|
|
'
|
|
|
|
# At this point there are three root-level positories: A, B, super and super2
|
|
|
|
test_expect_success 'nested submodule alternate in works and is actually used' '
|
|
test_when_finished "rm -rf supersuper-clone" &&
|
|
git clone --recursive --reference supersuper supersuper supersuper-clone &&
|
|
(
|
|
cd supersuper-clone &&
|
|
# test superproject has alternates setup correctly
|
|
test_alternate_is_used .git/objects/info/alternates . &&
|
|
# immediate submodule has alternate:
|
|
test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
|
|
# nested submodule also has alternate:
|
|
test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
|
|
)
|
|
'
|
|
|
|
check_that_two_of_three_alternates_are_used() {
|
|
test_alternate_is_used .git/objects/info/alternates . &&
|
|
# immediate submodule has alternate:
|
|
test_alternate_is_used .git/modules/subwithsub/objects/info/alternates subwithsub &&
|
|
# but nested submodule has no alternate:
|
|
test_must_fail test_alternate_is_used .git/modules/subwithsub/modules/sub/objects/info/alternates subwithsub/sub
|
|
}
|
|
|
|
|
|
test_expect_success 'missing nested submodule alternate fails clone and submodule update' '
|
|
test_when_finished "rm -rf supersuper-clone" &&
|
|
test_must_fail git clone --recursive --reference supersuper2 supersuper2 supersuper-clone &&
|
|
(
|
|
cd supersuper-clone &&
|
|
check_that_two_of_three_alternates_are_used &&
|
|
# update of the submodule fails
|
|
test_must_fail git submodule update --init --recursive
|
|
)
|
|
'
|
|
|
|
test_expect_success 'missing nested submodule alternate in --reference-if-able mode' '
|
|
test_when_finished "rm -rf supersuper-clone" &&
|
|
git clone --recursive --reference-if-able supersuper2 supersuper2 supersuper-clone &&
|
|
(
|
|
cd supersuper-clone &&
|
|
check_that_two_of_three_alternates_are_used &&
|
|
# update of the submodule succeeds
|
|
git submodule update --init --recursive
|
|
)
|
|
'
|
|
|
|
test_done
|