mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-21 09:16:10 +02:00
Code

Add a test for read-tree -u --reset with a D/F conflict 

Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Jeff King 2008-03-08 20:27:04 -08:00 committed by Junio C Hamano
parent 1cbcefb107
commit 50753d00d6
1 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
t/t1005-read-tree-reset.sh Executable file
View File

@ -0,0 +1,30 @@
#!/bin/sh
test_description='read-tree -u --reset'
. ./test-lib.sh
# two-tree test
test_expect_success 'setup' '
git init &&
mkdir df &&
echo content >df/file &&
git add df/file &&
git commit -m one &&
git ls-files >expect &&
rm -rf df &&
echo content >df &&
git add df &&
echo content >new &&
git add new &&
git commit -m two
'
test_expect_failure 'reset should work' '
git read-tree -u --reset HEAD^ &&
git ls-files >actual &&
diff -u expect actual
'
test_done