mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
Merge branch 'jk/upload-pack-hook'
A hot-fix to make a test working in mingw again. * jk/upload-pack-hook: mingw: fix regression in t1308-config-set
This commit is contained in:
commit
75676c8c8b
|
@ -233,11 +233,19 @@ cmdline_config="'foo.bar=from-cmdline'"
|
|||
test_expect_success 'iteration shows correct origins' '
|
||||
echo "[foo]bar = from-repo" >.git/config &&
|
||||
echo "[foo]bar = from-home" >.gitconfig &&
|
||||
if test_have_prereq MINGW
|
||||
then
|
||||
# Use Windows path (i.e. *not* $HOME)
|
||||
HOME_GITCONFIG=$(pwd)/.gitconfig
|
||||
else
|
||||
# Do not get fooled by symbolic links, i.e. $HOME != $(pwd)
|
||||
HOME_GITCONFIG=$HOME/.gitconfig
|
||||
fi &&
|
||||
cat >expect <<-EOF &&
|
||||
key=foo.bar
|
||||
value=from-home
|
||||
origin=file
|
||||
name=$HOME/.gitconfig
|
||||
name=$HOME_GITCONFIG
|
||||
scope=global
|
||||
|
||||
key=foo.bar
|
||||
|
|
Loading…
Reference in a new issue