diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2010-03-26 15:25:34 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-28 09:53:04 -0700 |
| commit | 80d706afed6c6c6fb3ac9c168a6a958244405b45 (patch) | |
| tree | 18687c3c32ff6cd9a56ec42d1e46413d1ac8ed35 /t/t4134-apply-submodule.sh | |
| parent | d1723296af67e6bbadf6e73cd1e921aefafe491f (diff) | |
| download | git-80d706afed6c6c6fb3ac9c168a6a958244405b45.tar.gz | |
Introduce remove_or_warn function
This patch introduces the remove_or_warn function which is a
generalised version of the {unlink,rmdir}_or_warn functions. It takes
an additional parameter indicating the mode of the file to be removed.
The patch also modifies certain functions to use remove_or_warn
where appropriate, and adds a test case for a bug fixed by the use
of remove_or_warn.
Signed-off-by: Peter Collingbourne <peter@pcc.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4134-apply-submodule.sh')
| -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 0000000000..1b82f93cff --- /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 |