From 50753d00d691c1ea16bc72446705aee2c128fc2f Mon Sep 17 00:00:00 2001 From: Jeff King Date: Sat, 8 Mar 2008 20:27:04 -0800 Subject: [PATCH] Add a test for read-tree -u --reset with a D/F conflict Signed-off-by: Junio C Hamano --- t/t1005-read-tree-reset.sh | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100755 t/t1005-read-tree-reset.sh diff --git a/t/t1005-read-tree-reset.sh b/t/t1005-read-tree-reset.sh new file mode 100755 index 0000000000..f1b12167b8 --- /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