From: Jeff King <peff@peff.net>
Date: Sun, 9 Mar 2008 04:27:04 +0000 (-0800)
Subject: Add a test for read-tree -u --reset with a D/F conflict
X-Git-Tag: v1.5.5-rc0~39
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=50753d00d691c1ea16bc72446705aee2c128fc2f;p=git.git

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

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t1005-read-tree-reset.sh b/t/t1005-read-tree-reset.sh
new file mode 100755
index 000000000..f1b12167b
--- /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