summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-02 15:06:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-02 15:22:24 -0700
commit58461bdf15a66f428f5ca6042cafbcc64c82c64d (patch)
tree8653fb8140392d83e1570a4c86c4ab60e2d3eea2
parentconfig: add a notion of "scope" (diff)
downloadtgif-58461bdf15a66f428f5ca6042cafbcc64c82c64d.tar.xz
t1308: do not get fooled by symbolic links to the source tree
When your $PWD does not match $(/bin/pwd), e.g. you have your copy of the git source tree in one place, point it with a symbolic link, and then "cd" to that symbolic link before running 'make test', one of the tests in t1308 expects that the per-user configuration was reported to have been read from the true path (i.e. relative to the target of such a symbolic link), but the test-config program reports a path relative to $PWD (i.e. the symbolic link). Instead, expect a path relative to $HOME (aka $TRASH_DIRECTORY), as per-user configuration is read from $HOME/.gitconfig and the test framework sets these shell variables up in such a way to avoid this problem. Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1308-config-set.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t1308-config-set.sh b/t/t1308-config-set.sh
index 065d5ebb09..cf716b469f 100755
--- a/t/t1308-config-set.sh
+++ b/t/t1308-config-set.sh
@@ -237,7 +237,7 @@ test_expect_success 'iteration shows correct origins' '
key=foo.bar
value=from-home
origin=file
- name=$(pwd)/.gitconfig
+ name=$HOME/.gitconfig
scope=global
key=foo.bar