2008-03-09 05:27:04 +01:00
|
|
|
#!/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
|
|
|
|
'
|
|
|
|
|
2008-03-07 03:12:28 +01:00
|
|
|
test_expect_success 'reset should work' '
|
2008-03-09 05:27:04 +01:00
|
|
|
git read-tree -u --reset HEAD^ &&
|
|
|
|
git ls-files >actual &&
|
|
|
|
diff -u expect actual
|
|
|
|
'
|
|
|
|
|
|
|
|
test_done
|