diff options
| author |  David Aguilar <davvid@gmail.com> | 2016-07-18 20:57:55 -0700 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2016-07-28 14:01:55 -0700 |
| commit | 98f917ed421a477e0575c58f801ac25f0e261b9d (patch) | |
| tree | aa3aebc79d863ff65ce5353b52d05aed7d68d746 /t/t7800-difftool.sh | |
| parent | difftool: fix argument handling in subdirs (diff) | |
| download | tgif-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 't/t7800-difftool.sh')
| -rwxr-xr-x | t/t7800-difftool.sh | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/t/t7800-difftool.sh b/t/t7800-difftool.sh index 7ce4cd753e..cb25480e1f 100755 --- a/t/t7800-difftool.sh +++ b/t/t7800-difftool.sh @@ -412,6 +412,20 @@ run_dir_diff_test 'difftool --dir-diff from subdirectory' ' ) ' +run_dir_diff_test 'difftool --dir-diff from subdirectory with GIT_DIR set' ' + ( + GIT_DIR=$(pwd)/.git && + export GIT_DIR && + GIT_WORK_TREE=$(pwd) && + export GIT_WORK_TREE && + cd sub && + git difftool --dir-diff $symlinks --extcmd ls \ + branch -- sub >output && + grep sub output && + ! grep file output + ) +' + run_dir_diff_test 'difftool --dir-diff when worktree file is missing' ' test_when_finished git reset --hard && rm file2 && |