mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
99b43a61f2
Currently, do_submodule_path will attempt locating the .git directory by using read_gitfile on <path>/.git. If this fails it just assumes the <path>/.git is actually a git directory. This is good because it allows for handling submodules which were cloned in a regular manner first before being added to the superproject. Unfortunately this fails if the <path> is not actually checked out any longer, such as by removing the directory. Fix this by checking if the directory we found is actually a gitdir. In the case it is not, attempt to lookup the submodule configuration and find the name of where it is stored in the .git/modules/ directory of the superproject. If we can't locate the submodule configuration, this might occur because for example a submodule gitlink was added but the corresponding .gitmodules file was not properly updated. A die() here would not be pleasant to the users of submodule diff formats, so instead, modify do_submodule_path() to return an error code: - git_pathdup_submodule() returns NULL when we fail to find a path. - strbuf_git_path_submodule() propagates the error code to the caller. Modify the callers of these functions to check the error code and fail properly. This ensures we don't attempt to use a bad path that doesn't match the corresponding submodule. Because this change fixes add_submodule_odb() to work even if the submodule is not checked out, update the wording of the submodule log diff format to correctly display that the submodule is "not initialized" instead of "not checked out" Add tests to ensure this change works as expected. Signed-off-by: Jacob Keller <jacob.keller@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
127 lines
3.3 KiB
Bash
Executable file
127 lines
3.3 KiB
Bash
Executable file
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2016 Jacob Keller, based on t4041 by Jens Lehmann
|
|
#
|
|
|
|
test_description='Test for submodule diff on non-checked out submodule
|
|
|
|
This test tries to verify that add_submodule_odb works when the submodule was
|
|
initialized previously but the checkout has since been removed.
|
|
'
|
|
|
|
. ./test-lib.sh
|
|
|
|
# Tested non-UTF-8 encoding
|
|
test_encoding="ISO8859-1"
|
|
|
|
# String "added" in German (translated with Google Translate), encoded in UTF-8,
|
|
# used in sample commit log messages in add_file() function below.
|
|
added=$(printf "hinzugef\303\274gt")
|
|
|
|
add_file () {
|
|
(
|
|
cd "$1" &&
|
|
shift &&
|
|
for name
|
|
do
|
|
echo "$name" >"$name" &&
|
|
git add "$name" &&
|
|
test_tick &&
|
|
# "git commit -m" would break MinGW, as Windows refuse to pass
|
|
# $test_encoding encoded parameter to git.
|
|
echo "Add $name ($added $name)" | iconv -f utf-8 -t $test_encoding |
|
|
git -c "i18n.commitEncoding=$test_encoding" commit -F -
|
|
done >/dev/null &&
|
|
git rev-parse --short --verify HEAD
|
|
)
|
|
}
|
|
|
|
commit_file () {
|
|
test_tick &&
|
|
git commit "$@" -m "Commit $*" >/dev/null
|
|
}
|
|
|
|
test_expect_success 'setup - submodules' '
|
|
test_create_repo sm2 &&
|
|
add_file . foo &&
|
|
add_file sm2 foo1 foo2 &&
|
|
smhead1=$(git -C sm2 rev-parse --short --verify HEAD)
|
|
'
|
|
|
|
test_expect_success 'setup - git submodule add' '
|
|
git submodule add ./sm2 sm1 &&
|
|
commit_file sm1 .gitmodules &&
|
|
git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
|
|
cat >expected <<-EOF &&
|
|
Submodule sm1 0000000...$smhead1 (new submodule)
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'submodule directory removed' '
|
|
rm -rf sm1 &&
|
|
git diff-tree -p --no-commit-id --submodule=log HEAD -- sm1 >actual &&
|
|
cat >expected <<-EOF &&
|
|
Submodule sm1 0000000...$smhead1 (new submodule)
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'setup - submodule multiple commits' '
|
|
git submodule update --checkout sm1 &&
|
|
smhead2=$(add_file sm1 foo3 foo4) &&
|
|
commit_file sm1 &&
|
|
git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
|
|
cat >expected <<-EOF &&
|
|
Submodule sm1 $smhead1..$smhead2:
|
|
> Add foo4 ($added foo4)
|
|
> Add foo3 ($added foo3)
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'submodule removed multiple commits' '
|
|
rm -rf sm1 &&
|
|
git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
|
|
cat >expected <<-EOF &&
|
|
Submodule sm1 $smhead1..$smhead2:
|
|
> Add foo4 ($added foo4)
|
|
> Add foo3 ($added foo3)
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'submodule not initialized in new clone' '
|
|
git clone . sm3 &&
|
|
git -C sm3 diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
|
|
cat >expected <<-EOF &&
|
|
Submodule sm1 $smhead1...$smhead2 (not initialized)
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'setup submodule moved' '
|
|
git submodule update --checkout sm1 &&
|
|
git mv sm1 sm4 &&
|
|
commit_file sm4 &&
|
|
git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
|
|
cat >expected <<-EOF &&
|
|
Submodule sm4 0000000...$smhead2 (new submodule)
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_expect_success 'submodule moved then removed' '
|
|
smhead3=$(add_file sm4 foo6 foo7) &&
|
|
commit_file sm4 &&
|
|
rm -rf sm4 &&
|
|
git diff-tree -p --no-commit-id --submodule=log HEAD >actual &&
|
|
cat >expected <<-EOF &&
|
|
Submodule sm4 $smhead2..$smhead3:
|
|
> Add foo7 ($added foo7)
|
|
> Add foo6 ($added foo6)
|
|
EOF
|
|
test_cmp expected actual
|
|
'
|
|
|
|
test_done
|