diff options
author | John Keeping <john@keeping.me.uk> | 2013-04-14 17:34:56 +0100 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-04-14 23:30:21 -0700 |
commit | 38b074de80759c95fec20b0dbc30614caccdfd24 (patch) | |
tree | 213b0d764e72c0b2a877c43195a10bec8041d863 /builtin/branch.c | |
parent | Merge branch 'rr/test-3200-style' into maint (diff) | |
download | tgif-38b074de80759c95fec20b0dbc30614caccdfd24.tar.xz |
t/test-lib.sh: fix TRASH_DIRECTORY handling
After the location of $TRASH_DIRECTORY is adjusted by
$TEST_OUTPUT_DIRECTORY, we go on to use the $test variable to make the
trash directory and cd into it. This means that when
$TEST_OUTPUT_DIRECTORY is not "." and an absolute --root has not been
specified, we do not remove the trash directory once the tests are
complete (remove_trash is set to $TRASH_DIRECTORY).
Fix this by always referring to the trash directory as $TRASH_DIRECTORY.
Signed-off-by: John Keeping <john@keeping.me.uk>
Acked-by: Jeff King <peff@peff.net>
Acked-by: Thomas Rast <trast@inf.ethz.ch>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/branch.c')
0 files changed, 0 insertions, 0 deletions