summaryrefslogtreecommitdiff
path: root/Documentation/git-difftool.txt
diff options
context:
space:
mode:
authorLibravatar Jeff King <peff@peff.net>2016-09-05 17:52:17 -0400
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-09-07 11:45:28 -0700
commit948a7fd242a28e61e454f62001716af2c9d614b0 (patch)
tree498ad3d7792789755e4733692948722489b0587a /Documentation/git-difftool.txt
parentt5305: drop "dry-run" of unpack-objects (diff)
downloadtgif-948a7fd242a28e61e454f62001716af2c9d614b0.tar.xz
t5305: use "git -C"
This test unpacks objects into a separate repository, and accesses it by setting GIT_DIR in a subshell. We can do the same thing these days by using "git init <repo>" and "git -C". In most cases this is shorter, though when there are multiple commands, we may end up repeating the "-C". However, this repetition can actually be a good thing. This patch also fixes a bug introduced by 512477b (tests: use "env" to run commands with temporary env-var settings, 2014-03-18). That commit essentially converted: (GIT_DIR=...; export GIT_DIR cmd1 && cmd2) into: (GIT_DIR=... cmd1 && cmd2) which obviously loses the GIT_DIR setting for cmd2 (we never noticed the bug because it simply runs "cmd2" in the parent repo, which means we were simply failing to test anything interesting). By using "git -C" rather than a subshell, it becomes quite obvious where each command is supposed to be running. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-difftool.txt')
0 files changed, 0 insertions, 0 deletions