From: David Aguilar <davvid@gmail.com>
Date: Tue, 19 Jul 2016 03:57:55 +0000 (-0700)
Subject: difftool: avoid $GIT_DIR and $GIT_WORK_TREE
X-Git-Tag: v2.9.3~1^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/98f917ed421a477e0575c58f801ac25f0e261b9d?ds=inline;hp=98f917ed421a477e0575c58f801ac25f0e261b9d

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>
---