mirror of
https://github.com/git-for-windows/git.git
synced 2026-02-04 03:33:01 -06:00
dbbf6a901b
Replace old-style `test -[df]` and `! test -[df]` assertions with the modern `test_path_is_file`, `test_path_is_dir`, and `test_path_is_missing` helpers. These helpers provide more informative error messages in case of failure (e.g., "File 'foo' is missing" instead of just exit code 1). While at it, fix a typo and an incorrect path reference in one of the test descriptions. Signed-off-by: K Jayatheerth <jayatheerthkulkarni2005@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
66 lines
1.4 KiB
Bash
Executable File
66 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_path_is_dir path0 &&
|
|
test_path_is_file path0/COPYING
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1/path2/COPYING' '
|
|
test_path_is_missing path1/path2/COPYING
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1/COPYING' '
|
|
test_path_is_missing path1/COPYING
|
|
'
|
|
|
|
test_expect_success 'checking lack of COPYING' '
|
|
test_path_is_missing COPYING
|
|
'
|
|
|
|
test_expect_success 'checking lack of path0/COPYING-TOO' '
|
|
test_path_is_missing path0/COPYING-TOO
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1/path2' '
|
|
test_path_is_missing path1/path2
|
|
'
|
|
|
|
test_expect_success 'checking lack of path1' '
|
|
test_path_is_missing path1
|
|
'
|
|
|
|
test_done
|