summaryrefslogtreecommitdiff
path: root/t/t4119-apply-config.sh
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-02-17 21:12:52 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-02-17 21:13:32 (GMT)
commitdc7b24364dcbe9ab74d937c92af9999ac1a2db0b (patch)
treee756ecd8a36664927f35e0af35ab588f0212ec5d /t/t4119-apply-config.sh
parent437b1b20df4b356c9342dac8d38849f24ef44f27 (diff)
downloadgit-dc7b24364dcbe9ab74d937c92af9999ac1a2db0b.zip
git-dc7b24364dcbe9ab74d937c92af9999ac1a2db0b.tar.gz
git-dc7b24364dcbe9ab74d937c92af9999ac1a2db0b.tar.bz2
Teach 'git apply' to look at $GIT_DIR/config
When neither --index nor --cached was used, git-apply did not try calling setup_git_directory(), which means it did not look at configuration files at all. This fixes it to call the setup function but still allow the command to be run in a directory not controlled by git. The bug probably meant that 'git apply', not moving up to the toplevel, did not apply properly formatted diffs from the toplevel when you are inside a subdirectory, even though 'git apply --index' would. As a side effect, this patch fixes it as well. Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 't/t4119-apply-config.sh')
-rwxr-xr-xt/t4119-apply-config.sh90
1 files changed, 90 insertions, 0 deletions
diff --git a/t/t4119-apply-config.sh b/t/t4119-apply-config.sh
new file mode 100755
index 0000000..0e8ea7e
--- /dev/null
+++ b/t/t4119-apply-config.sh
@@ -0,0 +1,90 @@
+#!/bin/sh
+#
+# Copyright (c) 2007 Junio C Hamano
+#
+
+test_description='git-apply --whitespace=strip and configuration file.
+
+'
+
+. ./test-lib.sh
+
+test_expect_success setup '
+ echo A >file1 &&
+ cp file1 saved &&
+ git add file1 &&
+ echo "B " >file1 &&
+ git diff >patch.file
+'
+
+test_expect_success 'apply --whitespace=strip' '
+
+ cp saved file1 &&
+ git update-index --refresh &&
+
+ git apply --whitespace=strip patch.file &&
+ if grep " " file1
+ then
+ echo "Eh?"
+ false
+ else
+ echo Happy
+ fi
+'
+
+test_expect_success 'apply --whitespace=strip from config' '
+
+ cp saved file1 &&
+ git update-index --refresh &&
+
+ git config apply.whitespace strip &&
+ git apply patch.file &&
+ if grep " " file1
+ then
+ echo "Eh?"
+ false
+ else
+ echo Happy
+ fi
+'
+
+mkdir sub
+D=`pwd`
+
+test_expect_success 'apply --whitespace=strip in subdir' '
+
+ cd "$D" &&
+ git config --unset-all apply.whitespace
+ cp saved file1 &&
+ git update-index --refresh &&
+
+ cd sub &&
+ git apply --whitespace=strip ../patch.file &&
+ if grep " " ../file1
+ then
+ echo "Eh?"
+ false
+ else
+ echo Happy
+ fi
+'
+
+test_expect_success 'apply --whitespace=strip from config in subdir' '
+
+ cd "$D" &&
+ git config apply.whitespace strip &&
+ cp saved file1 &&
+ git update-index --refresh &&
+
+ cd sub &&
+ git apply ../patch.file &&
+ if grep " " file1
+ then
+ echo "Eh?"
+ false
+ else
+ echo Happy
+ fi
+'
+
+test_done