1c720357ce
In459b8d22e5(tests: do not borrow from COPYING and README from the real source, 2015-02-15) tests that used "lib-diff.sh" (called "diff-lib.sh" then) were made to stop relying on the top-level COPYING file, but we still had other tests that referenced it. Let's move them over to use the "COPYING_test_data" utility function introduced in the preceding commit, and in the case of the one test that needed the "README" file use a ROT 13 version of that "COPYING" test data. That test added inafd222967c(Extend testing git-mv for renaming of subdirectories, 2006-07-26) just needs more test data that's not the same as the "COPYING" test data, so a ROT 13 version will do. This change removes the last references to ../{README,COPYING} in the test suite. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
65 lines
1.4 KiB
Bash
Executable File
65 lines
1.4 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Shawn Pearce
|
|
#
|
|
|
|
test_description='git reset should cull empty subdirs'
|
|
. ./test-lib.sh
|
|
. "$TEST_DIRECTORY"/lib-diff-data.sh
|
|
|
|
test_expect_success 'creating initial files' '
|
|
mkdir path0 &&
|
|
COPYING_test_data >path0/COPYING &&
|
|
git add path0/COPYING &&
|
|
git commit -m add -a
|
|
'
|
|
|
|
test_expect_success 'creating second files' '
|
|
mkdir path1 &&
|
|
mkdir path1/path2 &&
|
|
COPYING_test_data >path1/path2/COPYING &&
|
|
COPYING_test_data >path1/COPYING &&
|
|
COPYING_test_data >COPYING &&
|
|
COPYING_test_data >path0/COPYING-TOO &&
|
|
git add path1/path2/COPYING &&
|
|
git add path1/COPYING &&
|
|
git add COPYING &&
|
|
git add path0/COPYING-TOO &&
|
|
git commit -m change -a
|
|
'
|
|
|
|
test_expect_success 'resetting tree HEAD^' '
|
|
git reset --hard HEAD^
|
|
'
|
|
|
|
test_expect_success 'checking initial files exist after rewind' '
|
|
test -d path0 &&
|
|
test -f path0/COPYING
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1/path2/COPYING' '
|
|
! test -f path1/path2/COPYING
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1/COPYING' '
|
|
! test -f path1/COPYING
|
|
'
|
|
|
|
test_expect_success 'checking lack of COPYING' '
|
|
! test -f COPYING
|
|
'
|
|
|
|
test_expect_success 'checking checking lack of path1/COPYING-TOO' '
|
|
! test -f path0/COPYING-TOO
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1/path2' '
|
|
! test -d path1/path2
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1' '
|
|
! test -d path1
|
|
'
|
|
|
|
test_done
|