summaryrefslogtreecommitdiff
path: root/ll-merge.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2012-12-18 11:26:24 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2012-12-18 11:26:24 -0800
commit086cb911533d6f4233e84c93b08da289ecc8a229 (patch)
treee5f361dc08ed90b4466486e338ab6eaa9fcfb9c2 /ll-merge.c
parentMerge branch 'jk/pickaxe-textconv' into maint (diff)
downloadtgif-086cb911533d6f4233e84c93b08da289ecc8a229.tar.xz
t7004: do not create unneeded gpghome/gpg.conf when GPG is not used
These tests themselves are properly protected by the GPG prerequisite, but one of the set-up steps outside the test_expect_success block unconditionally assumed that there is a gpghome/ directory, which is not true if GPG is not being used. It may be a good idea to move the whole set-up steps in the test but that is a follow-up topic. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.c')
0 files changed, 0 insertions, 0 deletions