summaryrefslogtreecommitdiff
path: root/git-mergetool--lib.sh
diff options
context:
space:
mode:
authorLibravatar Johannes Schindelin <johannes.schindelin@gmx.de>2016-05-13 15:25:58 +0200
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-13 11:04:07 -0700
commit7501b59210906c89747dca1c44e15d8c2214c01d (patch)
tree41d0965407e6c9edc3355426571dd94f9f6d5008 /git-mergetool--lib.sh
parentperf: let's disable symlinks when they are not available (diff)
downloadtgif-7501b59210906c89747dca1c44e15d8c2214c01d.tar.xz
perf: make the tests work in worktrees
This patch makes perf-lib.sh more robust so that it can run correctly even inside a worktree. For example, it assumed that $GIT_DIR/objects is the objects directory (which is not the case for worktrees) and it used the commondir file verbatim, even if it contained a relative path. Furthermore, the setup code expected `git rev-parse --git-dir` to spit out a relative path, which is also not true for worktrees. Let's just change the code to accept both relative and absolute paths, by avoiding the `cd` into the copied working directory. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'git-mergetool--lib.sh')
0 files changed, 0 insertions, 0 deletions