summaryrefslogtreecommitdiff
path: root/mergetools/opendiff
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2016-07-18 20:57:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-28 14:01:55 -0700
commit98f917ed421a477e0575c58f801ac25f0e261b9d (patch)
treeaa3aebc79d863ff65ce5353b52d05aed7d68d746 /mergetools/opendiff
parentdifftool: fix argument handling in subdirs (diff)
downloadtgif-98f917ed421a477e0575c58f801ac25f0e261b9d.tar.xz
difftool: avoid $GIT_DIR and $GIT_WORK_TREE
Environment variables are global and hard to reason about. Use the `--git-dir` and `--work-tree` arguments when invoking `git` instead of relying on the environment. Add a test to ensure that difftool's dir-diff feature works when these variables are present in the environment. Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/opendiff')
0 files changed, 0 insertions, 0 deletions