@matheusbsbs / matheus-bagliano / commits / 3a969ef1d6
Fork 0

cvsimport: die on cvsps errors

We were not previously checking the exit status of cvsps at all. If it exited before producing any useful output, we ended up with an empty import, which caused a spew of confusing error messages from other parts of git: $ git-cvsimport foo Initialized empty Git repository in ... some error from cvsps fatal: refs/heads/origin: not a valid SHA1 fatal: master: not a valid SHA1 warning: You appear to be on a branch yet to be born. warning: Forcing checkout of HEAD. fatal: just how do you expect me to merge 0 trees? checkout failed: 256 Now we get: $ git-cvsimport foo Initialized empty Git repository in ... some error from cvsps git-cvsimport: fatal: cvsps reported error Signed-off-by: Jeff King <peff@peff.net> Acked-by: Martin Langhoff <martin@catalyst.net.nz> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Jeff King committed Dec 23, 2007 at 22:08 UTC 3a969ef1d67e3b3a26c36cfbe94f6dba05d6dc69
1 file changed +1
git-cvsimport.perl
+1
@@ -632,6 +632,7 @@ unless ($opt_P) {
632 print $cvspsfh $_;
633 }
634 close CVSPS;
635 + $? == 0 or die "git-cvsimport: fatal: cvsps reported error\n";
636 close $cvspsfh;
637 } else {
638 $cvspsfile = $opt_P;