summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Genki Sky <sky@genki.is>2018-02-15 21:46:04 -0500
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-02-16 11:23:10 -0800
commit7976e901c8df980a45a881bcc8cdf6e1095133a6 (patch)
tree773cd4a5a8120ca836da29e1211ed951c051003c /Documentation/git-merge.txt
parentGit 2.12.5 (diff)
downloadtgif-7976e901c8df980a45a881bcc8cdf6e1095133a6.tar.xz
test-lib.sh: unset XDG_CACHE_HOME
git respects XDG_CACHE_HOME for the credential cache. So, we should unset XDG_CACHE_HOME for the test environment, lest a user's custom one cause failure in the test. For example, t/t0301-credential-cache.sh expects a default directory to be used if it hasn't explicitly set XDG_CACHE_HOME. Signed-off-by: Genki Sky <sky@genki.is> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions