aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-07-29 23:09:54 -0700
committerJunio C Hamano <gitster@pobox.com>2007-07-29 23:09:54 -0700
commit922b0e35b9622d81732f4cb6db4862d17ebf1855 (patch)
tree9e19dff9235f52a3d5698524f0ba52f01abbe4da /t
parentb8de7f764e1a9f6e8dfb587a6145906394fa607d (diff)
parent65a5a21d024373674d6068a03c71558035775e0c (diff)
downloadgit-922b0e35b9622d81732f4cb6db4862d17ebf1855.tar.gz
git-922b0e35b9622d81732f4cb6db4862d17ebf1855.tar.xz
Merge branch 'bs/lock'
* bs/lock: Add test for symlinked configuration file updates. use lockfile.c routines in git_commit_set_multivar() fully resolve symlinks when creating lockfiles
Diffstat (limited to 't')
-rwxr-xr-xt/t1300-repo-config.sh15
1 files changed, 15 insertions, 0 deletions
diff --git a/t/t1300-repo-config.sh b/t/t1300-repo-config.sh
index 1c43cc333..187ca2df5 100755
--- a/t/t1300-repo-config.sh
+++ b/t/t1300-repo-config.sh
@@ -595,4 +595,19 @@ echo >>result
test_expect_success '--null --get-regexp' 'cmp result expect'
+test_expect_success 'symlinked configuration' '
+
+ ln -s notyet myconfig &&
+ GIT_CONFIG=myconfig git config test.frotz nitfol &&
+ test -h myconfig &&
+ test -f notyet &&
+ test "z$(GIT_CONFIG=notyet git config test.frotz)" = znitfol &&
+ GIT_CONFIG=myconfig git config test.xyzzy rezrov &&
+ test -h myconfig &&
+ test -f notyet &&
+ test "z$(GIT_CONFIG=notyet git config test.frotz)" = znitfol &&
+ test "z$(GIT_CONFIG=notyet git config test.xyzzy)" = zrezrov
+
+'
+
test_done