aboutsummaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2007-12-02 12:22:19 -0500
committerJunio C Hamano <gitster@pobox.com>2007-12-02 10:59:59 -0800
commit4e596e988abfd7ce0b4456cdbf27baa16fa7aab8 (patch)
tree1f92e0b468ac14a3e225b53caa9f0cdd37e5b9e6 /t
parent1d557352f18a4b8f73be402674af6bd5bb152ab9 (diff)
downloadgit-4e596e988abfd7ce0b4456cdbf27baa16fa7aab8.tar.gz
git-4e596e988abfd7ce0b4456cdbf27baa16fa7aab8.tar.xz
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>
Diffstat (limited to 't')
-rwxr-xr-xt/t9600-cvsimport.sh12
1 files changed, 12 insertions, 0 deletions
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