Staging
v0.8.1
v0.8.1
Revision 3983caa531d31b2b95647ae60ac23a0e12385718 authored by Junio C Hamano on 16 February 2008, 18:38:12 UTC, committed by Junio C Hamano on 16 February 2008, 18:51:46 UTC
Since 3368d11 (Remove unnecessary git-rm --cached reference from status output), the status output marks the "Added but not yet committed" section as "Changes to be committed". Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 959ba67
t7101-reset.sh
#!/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 ../../COPYING path0/COPYING &&
git add path0/COPYING &&
git-commit -m add -a'
test_expect_success \
'creating second files' \
'mkdir path1 &&
mkdir path1/path2 &&
cp ../../COPYING path1/path2/COPYING &&
cp ../../COPYING path1/COPYING &&
cp ../../COPYING COPYING &&
cp ../../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_failure \
'checking lack of path1/path2/COPYING' \
'test -f path1/path2/COPYING'
test_expect_failure \
'checking lack of path1/COPYING' \
'test -f path1/COPYING'
test_expect_failure \
'checking lack of COPYING' \
'test -f COPYING'
test_expect_failure \
'checking checking lack of path1/COPYING-TOO' \
'test -f path0/COPYING-TOO'
test_expect_failure \
'checking lack of path1/path2' \
'test -d path1/path2'
test_expect_failure \
'checking lack of path1' \
'test -d path1'
test_done
Computing file changes ...