t/t5100/patch0005

   1 ---
   2
   3  Documentation/git-cvsimport-script.txt | 9 ++++++++-
   4  git-cvsimport-script                   | 4 ++--
   5  2 files changed, 10 insertions(+), 3 deletions(-)
   6
   7 50452f9c0c2df1f04d83a26266ba704b13861632
   8 diff --git a/Documentation/git-cvsimport-script.txt b/Documentation/git-cvsimport-script.txt
   9 --- a/Documentation/git-cvsimport-script.txt
  10 +++ b/Documentation/git-cvsimport-script.txt
  11 @@ -29,6 +29,10 @@ OPTIONS
  12         currently, only the :local:, :ext: and :pserver: access methods
  13         are supported.
  14
  15 +-C <target-dir>::
  16 +        The GIT repository to import to.  If the directory doesn't
  17 +        exist, it will be created.  Default is the current directory.
  18 +
  19  -i::
  20         Import-only: don't perform a checkout after importing.  This option
  21         ensures the working directory and cache remain untouched and will
  22 @@ -44,7 +48,7 @@ OPTIONS
  23
  24  -p <options-for-cvsps>::
  25         Additional options for cvsps.
  26 -       The options '-x' and '-A' are implicit and should not be used here.
  27 +       The options '-u' and '-A' are implicit and should not be used here.
  28
  29         If you need to pass multiple options, separate them with a comma.
  30
  31 @@ -57,6 +61,9 @@ OPTIONS
  32  -h::
  33         Print a short usage message and exit.
  34
  35 +-z <fuzz>::
  36 +        Pass the timestamp fuzz factor to cvsps.
  37 +
  38  OUTPUT
  39  ------
  40  If '-v' is specified, the script reports what it is doing.
  41 diff --git a/git-cvsimport-script b/git-cvsimport-script
  42 --- a/git-cvsimport-script
  43 +++ b/git-cvsimport-script
  44 @@ -190,7 +190,7 @@ sub conn {
  45         $self->{'socketo'}->write("Root $repo\n");
  46
  47         # Trial and error says that this probably is the minimum set
  48 -       $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E F Checked-in Created Updated Merged Removed\n");
  49 +       $self->{'socketo'}->write("Valid-responses ok error Valid-requests Mode M Mbinary E Checked-in Created Updated Merged Removed\n");
  50
  51         $self->{'socketo'}->write("valid-requests\n");
  52         $self->{'socketo'}->flush();
  53 @@ -691,7 +691,7 @@ while(<CVS>) {
  54                 unlink($tmpname);
  55                 my $mode = pmode($cvs->{'mode'});
  56                 push(@new,[$mode, $sha, $fn]); # may be resurrected!
  57 -       } elsif($state == 9 and /^\s+(\S+):\d(?:\.\d+)+->(\d(?:\.\d+)+)\(DEAD\)\s*$/) {
  58 +       } elsif($state == 9 and /^\s+(\S+):\d+(?:\.\d+)+->(\d+(?:\.\d+)+)\(DEAD\)\s*$/) {
  59                 my $fn = $1;
  60                 $fn =~ s#^/+##;
  61                 push(@old,$fn);
  62
  63 --
  64 David Kågedal
  65 -
  66 To unsubscribe from this list: send the line "unsubscribe git" in
  67 the body of a message to majordomo@vger.kernel.org
  68 More majordomo info at  http://vger.kernel.org/majordomo-info.html
  69