You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
31 lines
498 B
31 lines
498 B
17 years ago
|
#!/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
|