From: Catalin Marinas <catalin.marinas@gmail.com>
Date: Tue, 27 Nov 2007 22:30:21 +0000 (+0000)
Subject: Improve the t1205 test for push
X-Git-Tag: v0.14~21
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/commitdiff_plain/a138c01c81755bd2ac35f3d9726f73596292ab87

Improve the t1205 test for push

Bug #9311 reported in the past for a push conflict with an unrecorded
file. It is no longer reproducible but test added for future
regression.

Signed-off-by: Catalin Marinas <catalin.marinas@gmail.com>
---

diff --git a/t/t1205-push-subdir.sh b/t/t1205-push-subdir.sh
index f9a84f6..54a5b89 100755
--- a/t/t1205-push-subdir.sh
+++ b/t/t1205-push-subdir.sh
@@ -52,4 +52,18 @@ test_expect_success 'Conflicting push from subdir' '
     [ "$(echo $(stg status --conflict))" = "foo/y.txt x.txt" ]
 '
 
+test_expect_success 'Conflicting add/unknown file in subdir' '
+    stg status --reset &&
+    stg new foo -m foo &&
+    mkdir d &&
+    echo foo > d/test &&
+    stg add d/test &&
+    stg refresh &&
+    stg pop &&
+    mkdir -p d &&
+    echo bar > d/test &&
+    ! stg push foo &&
+    [ $(stg top) != "foo" ]
+'
+
 test_done