From: Jeff King <peff@peff.net>
Date: Sun, 2 Dec 2007 17:22:19 +0000 (-0500)
Subject: t9600: test cvsimport from CVS working tree
X-Git-Tag: v1.5.4-rc0~37^2~5
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=4e596e988abfd7ce0b4456cdbf27baa16fa7aab8;p=git.git

t9600: test cvsimport from CVS working tree

This test passes with v1.5.3.7, but not with v1.5.3.6.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/t/t9600-cvsimport.sh b/t/t9600-cvsimport.sh
index 29fee2dd1..08f0f2a3a 100755
--- a/t/t9600-cvsimport.sh
+++ b/t/t9600-cvsimport.sh
@@ -119,4 +119,16 @@ test_expect_success 'cvsimport.module config works' '
 
 '
 
+test_expect_success 'import from a CVS working tree' '
+
+	cvs co -d import-from-wt module &&
+	cd import-from-wt &&
+		git cvsimport -a -z0 &&
+		echo 1 >expect &&
+		git log -1 --pretty=format:%s%n >actual &&
+		git diff actual expect &&
+	cd ..
+
+'
+
 test_done