summaryrefslogtreecommitdiff
path: root/t/t4027-diff-submodule.sh
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-04-29 20:43:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-04-29 20:43:13 (GMT)
commit934747323c397ffe64b6dcdf2bf73128d8e36968 (patch)
treea02906b87b716d48d56b9b0de209fe02da65969e /t/t4027-diff-submodule.sh
parent3e73cb2f48cc4044905455a9936692f967a0f9b3 (diff)
parent7dae8b21c2fe39a59661c709f0dc17090dafa5a4 (diff)
downloadgit-934747323c397ffe64b6dcdf2bf73128d8e36968.zip
git-934747323c397ffe64b6dcdf2bf73128d8e36968.tar.gz
git-934747323c397ffe64b6dcdf2bf73128d8e36968.tar.bz2
Merge branch 'maint-1.6.0' into maint-1.6.1
* maint-1.6.0: diff -c -p: do not die on submodules
Diffstat (limited to 't/t4027-diff-submodule.sh')
-rwxr-xr-xt/t4027-diff-submodule.sh39
1 files changed, 39 insertions, 0 deletions
diff --git a/t/t4027-diff-submodule.sh b/t/t4027-diff-submodule.sh
index 1c2edeb..5cf8924 100755
--- a/t/t4027-diff-submodule.sh
+++ b/t/t4027-diff-submodule.sh
@@ -57,4 +57,43 @@ test_expect_success 'git diff (empty submodule dir)' '
test_cmp empty actual.empty
'
+test_expect_success 'conflicted submodule setup' '
+
+ # 39 efs
+ c=fffffffffffffffffffffffffffffffffffffff
+ (
+ echo "000000 $_z40 0 sub"
+ echo "160000 1$c 1 sub"
+ echo "160000 2$c 2 sub"
+ 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) &&
+ sed -e "s/$_z40/$hh/" expect.nosub >expect.withsub
+
+'
+
+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
+'
+
+
+
test_done