2008-03-02 08:07:59 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
|
|
|
|
test_description='difference in submodules'
|
|
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
2008-08-08 09:26:28 +00:00
|
|
|
. "$TEST_DIRECTORY"/diff-lib.sh
|
2008-03-02 08:07:59 +00: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"
|
|
|
|
|
) &&
|
|
|
|
|
|
|
|
|
|
set x $(
|
|
|
|
|
cd sub &&
|
|
|
|
|
git rev-list HEAD
|
|
|
|
|
) &&
|
2018-05-13 02:24:13 +00:00
|
|
|
echo ":160000 160000 $3 $ZERO_OID M sub" >expect &&
|
2010-01-16 17:42:53 +00:00
|
|
|
subtip=$3 subprev=$2
|
2008-03-02 08:07:59 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff --raw HEAD' '
|
|
|
|
|
git diff --raw --abbrev=40 HEAD >actual &&
|
2008-03-12 21:36:36 +00:00
|
|
|
test_cmp expect actual
|
2008-03-02 08:07:59 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff-index --raw HEAD' '
|
|
|
|
|
git diff-index --raw HEAD >actual.index &&
|
2008-03-12 21:36:36 +00:00
|
|
|
test_cmp expect actual.index
|
2008-03-02 08:07:59 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'git diff-files --raw' '
|
|
|
|
|
git diff-files --raw >actual.files &&
|
2008-03-12 21:36:36 +00:00
|
|
|
test_cmp expect actual.files
|
2008-03-02 08:07:59 +00:00
|
|
|
'
|
|
|
|
|
|
2010-01-16 17:42:53 +00: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 &&
|
|
|
|
|
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 16:31:51 +00:00
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git diff --ignore-submodules HEAD >actual2 &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual2 &&
|
2010-06-08 16:31:51 +00: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-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual4
|
2010-01-16 17:42:53 +00:00
|
|
|
'
|
2010-06-25 17:20:48 +00:00
|
|
|
|
2010-08-05 22:40:48 +00:00
|
|
|
test_expect_success 'git diff HEAD with dirty submodule (work tree, refs match) [.gitmodules]' '
|
2010-08-05 23:27:15 +00:00
|
|
|
git config diff.ignoreSubmodules dirty &&
|
|
|
|
|
git diff HEAD >actual &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual &&
|
2010-08-05 22:40:48 +00: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-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual2 &&
|
2010-08-05 22:40:48 +00: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-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual4 &&
|
2010-08-05 22:40:48 +00: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-05 23:27:15 +00:00
|
|
|
git config --unset diff.ignoreSubmodules &&
|
2010-08-05 22:40:48 +00:00
|
|
|
rm .gitmodules
|
|
|
|
|
'
|
|
|
|
|
|
2010-01-16 17:42:53 +00: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
|
|
|
|
|
) &&
|
|
|
|
|
git diff HEAD >actual &&
|
|
|
|
|
sed -e "1,/^@@/d" actual >actual.body &&
|
|
|
|
|
expect_from_to >expect.body $subprev $subprev-dirty &&
|
2010-06-08 16:31:51 +00:00
|
|
|
test_cmp expect.body actual.body &&
|
|
|
|
|
git diff --ignore-submodules=all HEAD >actual2 &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual2 &&
|
2010-06-08 16:31:51 +00:00
|
|
|
git diff --ignore-submodules=untracked HEAD >actual3 &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual3 &&
|
2010-06-08 16:31:51 +00:00
|
|
|
git diff --ignore-submodules=dirty HEAD >actual4 &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual4
|
2010-01-16 17:42:53 +00:00
|
|
|
'
|
|
|
|
|
|
2010-08-05 22:40:48 +00: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-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual2 &&
|
2010-08-05 22:40:48 +00:00
|
|
|
git config -f .gitmodules submodule.subname.ignore untracked &&
|
|
|
|
|
git diff HEAD >actual3 &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual3 &&
|
2010-08-05 22:40:48 +00:00
|
|
|
git config -f .gitmodules submodule.subname.ignore dirty &&
|
|
|
|
|
git diff HEAD >actual4 &&
|
2018-08-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual4 &&
|
2010-08-05 22:40:48 +00: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-05 22:39:25 +00: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-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual
|
2010-08-05 22:39:25 +00:00
|
|
|
'
|
|
|
|
|
|
2010-08-05 22:40:48 +00: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-19 21:57:22 +00:00
|
|
|
test_must_be_empty actual &&
|
2010-08-05 22:40:48 +00: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 00:04:42 +00:00
|
|
|
test_expect_success 'git diff (empty submodule dir)' '
|
2008-05-02 13:35:33 +00: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-19 21:57:25 +00:00
|
|
|
test_must_be_empty actual.empty
|
2008-05-02 13:35:33 +00:00
|
|
|
'
|
|
|
|
|
|
2009-04-29 19:49:52 +00:00
|
|
|
test_expect_success 'conflicted submodule setup' '
|
|
|
|
|
|
|
|
|
|
# 39 efs
|
2010-10-31 01:46:54 +00:00
|
|
|
c=fffffffffffffffffffffffffffffffffffffff &&
|
2009-04-29 19:49:52 +00:00
|
|
|
(
|
2018-05-13 02:24:13 +00:00
|
|
|
echo "000000 $ZERO_OID 0 sub" &&
|
2010-10-31 01:46:54 +00:00
|
|
|
echo "160000 1$c 1 sub" &&
|
|
|
|
|
echo "160000 2$c 2 sub" &&
|
2009-04-29 19:49:52 +00:00
|
|
|
echo "160000 3$c 3 sub"
|
|
|
|
|
) | git update-index --index-info &&
|
|
|
|
|
echo >expect.nosub '\''diff --cc sub
|
|
|
|
|
index 2ffffff,3ffffff..0000000
|
|
|
|
|
--- a/sub
|
|
|
|
|
+++ b/sub
|
|
|
|
|
@@@ -1,1 -1,1 +1,1 @@@
|
|
|
|
|
- Subproject commit 2fffffffffffffffffffffffffffffffffffffff
|
|
|
|
|
-Subproject commit 3fffffffffffffffffffffffffffffffffffffff
|
|
|
|
|
++Subproject commit 0000000000000000000000000000000000000000'\'' &&
|
|
|
|
|
|
|
|
|
|
hh=$(git rev-parse HEAD) &&
|
2018-05-13 02:24:13 +00:00
|
|
|
sed -e "s/$ZERO_OID/$hh/" expect.nosub >expect.withsub
|
2009-04-29 19:49:52 +00: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 08:07:59 +00:00
|
|
|
test_done
|