git-cvsps-ignore.patch 802 B

123456789101112131415161718192021222324252627
  1. From 09891c65a5f7409ce0bd37daced0ff31fbb1b1c9 Mon Sep 17 00:00:00 2001
  2. From: Todd Zullinger <tmz@pobox.com>
  3. Date: Mon, 23 Mar 2009 00:03:36 -0400
  4. Subject: [PATCH] git-cvsimport: Ignore cvsps-2.2b1 Branches: output
  5. Signed-off-by: Todd Zullinger <tmz@pobox.com>
  6. ---
  7. git-cvsimport.perl | 2 +-
  8. 1 files changed, 1 insertions(+), 1 deletions(-)
  9. diff --git a/git-cvsimport.perl b/git-cvsimport.perl
  10. index e439202..d020f1a 100755
  11. --- a/git-cvsimport.perl
  12. +++ b/git-cvsimport.perl
  13. @@ -952,7 +952,7 @@ while (<CVS>) {
  14. } elsif (/^-+$/) { # end of unknown-line processing
  15. $state = 1;
  16. } elsif ($state != 11) { # ignore stuff when skipping
  17. - print STDERR "* UNKNOWN LINE * $_\n";
  18. + print STDERR "* UNKNOWN LINE * $_\n" unless /^Branches: /;
  19. }
  20. }
  21. commit() if $branch and $state != 11;
  22. --
  23. 1.6.2.2