summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2008-03-09 04:27:04 (GMT)
committerJunio C Hamano <gitster@pobox.com>2008-03-09 05:30:05 (GMT)
commit50753d00d691c1ea16bc72446705aee2c128fc2f (patch)
tree87599cde48d64e3298c4051f3e6eb1d32f63ca01
parent1cbcefb107776ce2da374697bb4f6e2bd22ff73f (diff)
downloadgit-50753d00d691c1ea16bc72446705aee2c128fc2f.zip
git-50753d00d691c1ea16bc72446705aee2c128fc2f.tar.gz
git-50753d00d691c1ea16bc72446705aee2c128fc2f.tar.bz2
Add a test for read-tree -u --reset with a D/F conflict
Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t1005-read-tree-reset.sh30
1 files changed, 30 insertions, 0 deletions
diff --git a/t/t1005-read-tree-reset.sh b/t/t1005-read-tree-reset.sh
new file mode 100755
index 0000000..f1b1216
--- /dev/null
+++ b/t/t1005-read-tree-reset.sh
@@ -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