2008-03-02 11:07:59 +03:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='difference in submodules'
|
|
|
|
|
|
revisions API: have release_revisions() release "cmdline"
Extend the the release_revisions() function so that it frees the
"cmdline" in the "struct rev_info". This in combination with a
preceding change to free "commits" and "mailmap" means that we can
whitelist another test under "TEST_PASSES_SANITIZE_LEAK=true".
There was a proposal in [1] to do away with xstrdup()-ing this
add_rev_cmdline(), perhaps that would be worthwhile, but for now let's
just free() it.
We could also make that a "char *" in "struct rev_cmdline_entry"
itself, but since we own it let's expose it as a constant to outside
callers. I proposed that in [2] but have since changed my mind. See
14d30cdfc04 (ref-filter: fix memory leak in `free_array_item()`,
2019-07-10), c514c62a4fd (checkout: fix leak of non-existent branch
names, 2020-08-14) and other log history hits for "free((char *)" for
prior art.
This includes the tests we had false-positive passes on before my
6798b08e848 (perl Git.pm: don't ignore signalled failure in
_cmd_close(), 2022-02-01), now they pass for real.
Since there are 66 tests matching t/t[0-9]*git-svn*.sh it's easier to
list those that don't pass than to touch most of those 66. So let's
introduce a "TEST_FAILS_SANITIZE_LEAK=true", which if set in the tests
won't cause lib-git-svn.sh to set "TEST_PASSES_SANITIZE_LEAK=true.
This change also marks all the tests that we removed
"TEST_FAILS_SANITIZE_LEAK=true" from in an earlier commit due to
removing the UNLEAK() from cmd_format_patch(), we can now assert that
its API use doesn't leak any "struct rev_info" memory.
This change also made commit "t5503-tagfollow.sh" pass on current
master, but that would regress when combined with
ps/fetch-atomic-fixup's de004e848a9 (t5503: simplify setup of test
which exercises failure of backfill, 2022-03-03) (through no fault of
that topic, that change started using "git clone" in the test, which
has an outstanding leak). Let's leave that test out for now to avoid
in-flight semantic conflicts.
1. https://lore.kernel.org/git/YUj%2FgFRh6pwrZalY@carlos-mbp.lan/
2. https://lore.kernel.org/git/87o88obkb1.fsf@evledraar.gmail.com/
Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2022-04-13 23:01:47 +03:00
|
|
|
TEST_PASSES_SANITIZE_LEAK=true
|
2008-03-02 11:07:59 +03:00
|
|
|
. ./test-lib.sh
|
2021-02-12 16:29:40 +03:00
|
|
|
. "$TEST_DIRECTORY"/lib-diff.sh
|
2008-03-02 11:07:59 +03:00
|
|
|
|
|
|
|
|
test_expect_success setup '
|
|
|
|
|
test_tick &&
|
|
|
|
|
test_create_repo sub &&
|
|
|
|
|
(
|
|
|
|
|
cd sub &&
|
|
|
|
|
echo hello >world &&
|
|
|
|
|
git add world &&
|
|
|
|
|
git commit -m submodule
|
|
|
|
|
) &&
|
|
|
|
|
|
|
|
|
|
test_tick &&
|
|
|
|
|
echo frotz >nitfol &&
|
|
|
|
|
git add nitfol sub &&
|
|
|
|
|
git commit -m superproject &&
|
|
|
|
|
|
|
|
|
|
(
|
|
|
|
|
cd sub &&
|
|
|
|
|
echo goodbye >world &&
|
|
|
|
|
git add world &&
|
|
|
|
|
git commit -m "submodule #2"
|
|
|
|
|
) &&
|
|
|
|
|
|
2022-03-07 15:49:01 +03:00
|
|
|
git -C sub rev-list HEAD >revs &&
|
|
|
|
|
set x $(cat revs) &&
|
2018-05-13 05:24:13 +03:00
|
|
|
echo ":160000 160000 $3 $ZERO_OID M sub" >expect &&
|
2010-01-16 20:42:53 +03:00
|
|
|
subtip=$3 subprev=$2
|
2008-03-02 11:07:59 +03:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff --raw HEAD' '
|
2019-10-28 03:59:01 +03:00
|
|
|
hexsz=$(test_oid hexsz) &&
|
|
|
|
|
git diff --raw --abbrev=$hexsz HEAD >actual &&
|
2008-03-13 00:36:36 +03:00
|
|
|
test_cmp expect actual
|
2008-03-02 11:07:59 +03:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff-index --raw HEAD' '
|
|
|
|
|
git diff-index --raw HEAD >actual.index &&
|
2008-03-13 00:36:36 +03:00
|
|
|
test_cmp expect actual.index
|
2008-03-02 11:07:59 +03:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff-files --raw' '
|
|
|
|
|
git diff-files --raw >actual.files &&
|
2008-03-13 00:36:36 +03:00
|
|
|
test_cmp expect actual.files
|
2008-03-02 11:07:59 +03:00
|
|
|
'
|
|
|
|
|
|
2010-01-16 20:42:53 +03:00
|
|
|
expect_from_to () {
|
|
|
|
|
printf "%sSubproject commit %s\n+Subproject commit %s\n" \
|
|
|
|
|
"-" "$1" "$2"
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff HEAD' '
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev &&
|
|
|
|
|
test_cmp expect.body actual.body
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (work tree)' '
|
|
|
|
|
echo >>sub/world &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual.body
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (index)' '
|
|
|
|
|
(
|
|
|
|
|
cd sub &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
echo >>world &&
|
|
|
|
|
git add world
|
|
|
|
|
) &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual.body
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (untracked)' '
|
|
|
|
|
(
|
|
|
|
|
cd sub &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git clean -qfdx &&
|
|
|
|
|
>cruft
|
|
|
|
|
) &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
2020-11-10 11:39:00 +03:00
|
|
|
expect_from_to >expect.body $subtip $subprev &&
|
|
|
|
|
test_cmp expect.body actual.body
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (untracked) (none ignored)' '
|
|
|
|
|
test_config diff.ignoreSubmodules none &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
2010-01-16 20:42:53 +03:00
|
|
|
expect_from_to >expect.body $subtip $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual.body
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match)' '
|
|
|
|
|
git commit -m "x" sub &&
|
|
|
|
|
echo >>sub/world &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
2010-06-08 20:31:51 +04:00
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git diff --ignore-submodules HEAD >actual2 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual2 &&
|
2010-06-08 20:31:51 +04:00
|
|
|
git diff --ignore-submodules=untracked HEAD >actual3 &&
|
|
|
|
|
sed -e "1,/^@@/d" actual3 >actual3.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual3.body &&
|
|
|
|
|
git diff --ignore-submodules=dirty HEAD >actual4 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual4
|
2010-01-16 20:42:53 +03:00
|
|
|
'
|
2010-06-25 21:20:48 +04:00
|
|
|
|
2010-08-06 02:40:48 +04:00
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
|
2010-08-06 03:27:15 +04:00
|
|
|
git config diff.ignoreSubmodules dirty &&
|
|
|
|
|
git diff HEAD >actual &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual &&
|
2010-08-06 02:40:48 +04:00
|
|
|
git config --add -f .gitmodules submodule.subname.ignore none &&
|
|
|
|
|
git config --add -f .gitmodules submodule.subname.path sub &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git config -f .gitmodules submodule.subname.ignore all &&
|
|
|
|
|
git config -f .gitmodules submodule.subname.path sub &&
|
|
|
|
|
git diff HEAD >actual2 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual2 &&
|
2010-08-06 02:40:48 +04:00
|
|
|
git config -f .gitmodules submodule.subname.ignore untracked &&
|
|
|
|
|
git diff HEAD >actual3 &&
|
|
|
|
|
sed -e "1,/^@@/d" actual3 >actual3.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual3.body &&
|
|
|
|
|
git config -f .gitmodules submodule.subname.ignore dirty &&
|
|
|
|
|
git diff HEAD >actual4 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual4 &&
|
2010-08-06 02:40:48 +04:00
|
|
|
git config submodule.subname.ignore none &&
|
|
|
|
|
git config submodule.subname.path sub &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git config --remove-section submodule.subname &&
|
|
|
|
|
git config --remove-section -f .gitmodules submodule.subname &&
|
2010-08-06 03:27:15 +04:00
|
|
|
git config --unset diff.ignoreSubmodules &&
|
2010-08-06 02:40:48 +04:00
|
|
|
rm .gitmodules
|
|
|
|
|
'
|
|
|
|
|
|
2010-01-16 20:42:53 +03:00
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (index, refs match)' '
|
|
|
|
|
(
|
|
|
|
|
cd sub &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
echo >>world &&
|
|
|
|
|
git add world
|
|
|
|
|
) &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual.body
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match)' '
|
|
|
|
|
(
|
|
|
|
|
cd sub &&
|
|
|
|
|
git reset --hard &&
|
|
|
|
|
git clean -qfdx &&
|
|
|
|
|
>cruft
|
|
|
|
|
) &&
|
2020-11-10 11:39:00 +03:00
|
|
|
git diff --ignore-submodules=none HEAD >actual &&
|
2010-01-16 20:42:53 +03:00
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
2010-06-08 20:31:51 +04:00
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git diff --ignore-submodules=all HEAD >actual2 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual2 &&
|
2020-11-10 11:39:00 +03:00
|
|
|
git diff HEAD >actual3 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual3 &&
|
2010-06-08 20:31:51 +04:00
|
|
|
git diff --ignore-submodules=dirty HEAD >actual4 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual4
|
2010-01-16 20:42:53 +03:00
|
|
|
'
|
|
|
|
|
|
2010-08-06 02:40:48 +04:00
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (untracked, refs match) [.gitmodules]' '
|
|
|
|
|
git config --add -f .gitmodules submodule.subname.ignore all &&
|
|
|
|
|
git config --add -f .gitmodules submodule.subname.path sub &&
|
|
|
|
|
git diff HEAD >actual2 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual2 &&
|
2010-08-06 02:40:48 +04:00
|
|
|
git config -f .gitmodules submodule.subname.ignore untracked &&
|
|
|
|
|
git diff HEAD >actual3 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual3 &&
|
2010-08-06 02:40:48 +04:00
|
|
|
git config -f .gitmodules submodule.subname.ignore dirty &&
|
|
|
|
|
git diff HEAD >actual4 &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual4 &&
|
2010-08-06 02:40:48 +04:00
|
|
|
git config submodule.subname.ignore none &&
|
|
|
|
|
git config submodule.subname.path sub &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
|
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git config --remove-section submodule.subname &&
|
|
|
|
|
git config --remove-section -f .gitmodules submodule.subname &&
|
|
|
|
|
rm .gitmodules
|
|
|
|
|
'
|
|
|
|
|
|
2010-08-06 02:39:25 +04:00
|
|
|
test_expect_success 'git diff between submodule commits' '
|
|
|
|
|
git diff HEAD^..HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev &&
|
|
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git diff --ignore-submodules=dirty HEAD^..HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev &&
|
|
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git diff --ignore-submodules HEAD^..HEAD >actual &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual
|
2010-08-06 02:39:25 +04:00
|
|
|
'
|
|
|
|
|
|
2010-08-06 02:40:48 +04:00
|
|
|
test_expect_success 'git diff between submodule commits [.gitmodules]' '
|
|
|
|
|
git diff HEAD^..HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev &&
|
|
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git config --add -f .gitmodules submodule.subname.ignore dirty &&
|
|
|
|
|
git config --add -f .gitmodules submodule.subname.path sub &&
|
|
|
|
|
git diff HEAD^..HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev &&
|
|
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git config -f .gitmodules submodule.subname.ignore all &&
|
|
|
|
|
git diff HEAD^..HEAD >actual &&
|
2018-08-20 00:57:22 +03:00
|
|
|
test_must_be_empty actual &&
|
2010-08-06 02:40:48 +04:00
|
|
|
git config submodule.subname.ignore dirty &&
|
|
|
|
|
git config submodule.subname.path sub &&
|
|
|
|
|
git diff HEAD^..HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subtip $subprev &&
|
|
|
|
|
git config --remove-section submodule.subname &&
|
|
|
|
|
git config --remove-section -f .gitmodules submodule.subname &&
|
|
|
|
|
rm .gitmodules
|
|
|
|
|
'
|
|
|
|
|
|
2008-05-04 04:04:42 +04:00
|
|
|
test_expect_success 'git diff (empty submodule dir)' '
|
2008-05-02 17:35:33 +04:00
|
|
|
rm -rf sub/* sub/.git &&
|
|
|
|
|
git diff > actual.empty &&
|
tests: use 'test_must_be_empty' instead of 'test_cmp <empty> <out>'
Using 'test_must_be_empty' is shorter and more idiomatic than
>empty &&
test_cmp empty out
as it saves the creation of an empty file. Furthermore, sometimes the
expected empty file doesn't have such a descriptive name like 'empty',
and its creation is far away from the place where it's finally used
for comparison (e.g. in 't7600-merge.sh', where two expected empty
files are created in the 'setup' test, but are used only about 500
lines later).
These cases were found by instrumenting 'test_cmp' to error out the
test script when it's used to compare empty files, and then converted
manually.
Note that even after this patch there still remain a lot of cases
where we use 'test_cmp' to check empty files:
- Sometimes the expected output is not hard-coded in the test, but
'test_cmp' is used to ensure that two similar git commands produce
the same output, and that output happens to be empty, e.g. the
test 'submodule update --merge - ignores --merge for new
submodules' in 't7406-submodule-update.sh'.
- Repetitive common tasks, including preparing the expected results
and running 'test_cmp', are often extracted into a helper
function, and some of this helper's callsites expect no output.
- For the same reason as above, the whole 'test_expect_success'
block is within a helper function, e.g. in 't3070-wildmatch.sh'.
- Or 'test_cmp' is invoked in a loop, e.g. the test 'cvs update
(-p)' in 't9400-git-cvsserver-server.sh'.
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2018-08-20 00:57:25 +03:00
|
|
|
test_must_be_empty actual.empty
|
2008-05-02 17:35:33 +04:00
|
|
|
'
|
|
|
|
|
|
2009-04-29 23:49:52 +04:00
|
|
|
test_expect_success 'conflicted submodule setup' '
|
2019-10-28 03:59:01 +03:00
|
|
|
c=$(test_oid ff_1) &&
|
2009-04-29 23:49:52 +04:00
|
|
|
(
|
2018-05-13 05:24:13 +03:00
|
|
|
echo "000000 $ZERO_OID 0 sub" &&
|
2010-10-31 04:46:54 +03:00
|
|
|
echo "160000 1$c 1 sub" &&
|
|
|
|
|
echo "160000 2$c 2 sub" &&
|
2009-04-29 23:49:52 +04:00
|
|
|
echo "160000 3$c 3 sub"
|
|
|
|
|
) | git update-index --index-info &&
|
2019-10-28 03:59:01 +03:00
|
|
|
echo >expect.nosub "diff --cc sub
|
2009-04-29 23:49:52 +04:00
|
|
|
index 2ffffff,3ffffff..0000000
|
|
|
|
|
--- a/sub
|
|
|
|
|
+++ b/sub
|
|
|
|
|
@@@ -1,1 -1,1 +1,1 @@@
|
2019-10-28 03:59:01 +03:00
|
|
|
- Subproject commit 2$c
|
|
|
|
|
-Subproject commit 3$c
|
|
|
|
|
++Subproject commit $ZERO_OID" &&
|
2009-04-29 23:49:52 +04:00
|
|
|
|
|
|
|
|
hh=$(git rev-parse HEAD) &&
|
2018-05-13 05:24:13 +03:00
|
|
|
sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
|
2009-04-29 23:49:52 +04:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'combined (empty submodule)' '
|
|
|
|
|
rm -fr sub && mkdir sub &&
|
|
|
|
|
git diff >actual &&
|
|
|
|
|
test_cmp expect.nosub actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'combined (with submodule)' '
|
|
|
|
|
rm -fr sub &&
|
|
|
|
|
git clone --no-checkout . sub &&
|
|
|
|
|
git diff >actual &&
|
|
|
|
|
test_cmp expect.withsub actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2008-03-02 11:07:59 +03:00
|
|
|
test_done
|
