diff options
| author | Junio C Hamano <gitster@pobox.com> | 2010-05-09 05:32:59 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-05-09 05:32:59 (GMT) |
| commit | 3ecaa3b6a5f707617ea610d727c696f43f8b2f0b (patch) | |
| tree | 092dc9814e12b70ae637c26e36e5d0e6813657b4 /t | |
| parent | 43acff34b902c38808ac0f326090f2516250e1f0 (diff) | |
| parent | 25755e842f814751fbdb7abfc8255a40f24bfaa3 (diff) | |
| download | git-3ecaa3b6a5f707617ea610d727c696f43f8b2f0b.zip git-3ecaa3b6a5f707617ea610d727c696f43f8b2f0b.tar.gz git-3ecaa3b6a5f707617ea610d727c696f43f8b2f0b.tar.bz2 | |
Merge branch 'pc/remove-warn'
* pc/remove-warn:
Remove a redundant errno test in a usage of remove_path
Introduce remove_or_warn function
Implement the rmdir_or_warn function
Generalise the unlink_or_warn function
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4134-apply-submodule.sh | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/t/t4134-apply-submodule.sh b/t/t4134-apply-submodule.sh new file mode 100755 index 0000000..1b82f93 --- /dev/null +++ b/t/t4134-apply-submodule.sh @@ -0,0 +1,38 @@ +#!/bin/sh +# +# Copyright (c) 2010 Peter Collingbourne +# + +test_description='git apply submodule tests' + +. ./test-lib.sh + +test_expect_success setup ' + 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 0123456789abcdef0123456789abcdef01234567 +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 0123456789abcdef0123456789abcdef01234567 +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 |