mirror of
https://github.com/git/git.git
synced 2024-05-19 18:46:09 +02:00
08a9dd891c
Instead of using a specific invalid hard-coded object ID, generate one of the appropriate length by looking one up in the translation tables. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
40 lines
756 B
Bash
Executable File
40 lines
756 B
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2010 Peter Collingbourne
|
|
#
|
|
|
|
test_description='git apply submodule tests'
|
|
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success setup '
|
|
test_oid_init &&
|
|
cat > create-sm.patch <<EOF &&
|
|
diff --git a/dir/sm b/dir/sm
|
|
new file mode 160000
|
|
index 0000000..0123456
|
|
--- /dev/null
|
|
+++ b/dir/sm
|
|
@@ -0,0 +1 @@
|
|
+Subproject commit $(test_oid numeric)
|
|
EOF
|
|
cat > remove-sm.patch <<EOF
|
|
diff --git a/dir/sm b/dir/sm
|
|
deleted file mode 160000
|
|
index 0123456..0000000
|
|
--- a/dir/sm
|
|
+++ /dev/null
|
|
@@ -1 +0,0 @@
|
|
-Subproject commit $(test_oid numeric)
|
|
EOF
|
|
'
|
|
|
|
test_expect_success 'removing a submodule also removes all leading subdirectories' '
|
|
git apply --index create-sm.patch &&
|
|
test -d dir/sm &&
|
|
git apply --index remove-sm.patch &&
|
|
test \! -d dir
|
|
'
|
|
|
|
test_done
|