mirror of
https://github.com/git/git.git
synced 2024-11-25 02:44:48 +08:00
9b8ae93ad9
* maint: Start 1.6.0.2 maintenance cycle tests: use "git xyzzy" form (t7200 - t9001) tests: use "git xyzzy" form (t7000 - t7199) Fix passwd(5) ref and reflect that commit doens't use commit-tree improve handling of sideband message display tests: use "git xyzzy" form (t3600 - t6999) tests: use "git xyzzy" form (t0000 - t3599) checkout: fix message when leaving detached HEAD clone: fix creation of explicitly named target directory 'git foo' program identifies itself without dash in die() messages setup_git_directory(): fix move to worktree toplevel directory update-index: fix worktree setup Start conforming code to "git subcmd" style read-tree: setup worktree if merge is required grep: fix worktree setup diff*: fix worktree setup Conflicts: RelNotes t/t3900-i18n-commit.sh t/t7003-filter-branch.sh
64 lines
1.5 KiB
Bash
Executable File
64 lines
1.5 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# Copyright (c) 2006 Shawn Pearce
|
|
#
|
|
|
|
test_description='git reset should cull empty subdirs'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success \
|
|
'creating initial files' \
|
|
'mkdir path0 &&
|
|
cp "$TEST_DIRECTORY"/../COPYING path0/COPYING &&
|
|
git add path0/COPYING &&
|
|
git commit -m add -a'
|
|
|
|
test_expect_success \
|
|
'creating second files' \
|
|
'mkdir path1 &&
|
|
mkdir path1/path2 &&
|
|
cp "$TEST_DIRECTORY"/../COPYING path1/path2/COPYING &&
|
|
cp "$TEST_DIRECTORY"/../COPYING path1/COPYING &&
|
|
cp "$TEST_DIRECTORY"/../COPYING COPYING &&
|
|
cp "$TEST_DIRECTORY"/../COPYING 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
|