summaryrefslogtreecommitdiff
path: root/builtin/merge-index.c
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2015-05-18 14:10:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-05-18 15:22:49 -0700
commit66d2e04ec9856b5ef667f5241774749d079a5109 (patch)
treee2608ca7345308c0db20c0174c8159fa33d23b4b /builtin/merge-index.c
parentMerge branch 'maint-1.9' into maint-2.0 (diff)
downloadtgif-66d2e04ec9856b5ef667f5241774749d079a5109.tar.xz
subdirectory tests: code cleanup, uncomment test
Back when these tests were written, we wanted to make sure that Git notices it is in a bare repository and "git show -s HEAD" would refrain from complaining that HEAD might mean a file it sees in its current working directory (because it does not). But the version of Git back then didn't behave well, without (doubly) being told that it is inside a bare repository by exporting "GIT_DIR=.". The form of the test we originally wanted to have was left commented out as a reminder. Nowadays the test as originally intended works, so add it to the test suite. We'll keep the old test that explicitly sets GIT_DIR=. to make sure that use case will not regress. Signed-off-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/merge-index.c')
0 files changed, 0 insertions, 0 deletions