From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Sep 2013 18:48:01 +0000 (-0700)
Subject: Merge branch 'jc/cvsserver-perm-bit-fix'
X-Git-Tag: v1.8.5-rc0~109
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/2f46b53957dec3aaca206c6590f5e7f538fabde2?ds=inline;hp=-c

Merge branch 'jc/cvsserver-perm-bit-fix'

"git cvsserver" computed the permission mode bits incorrectly for
executable files.

* jc/cvsserver-perm-bit-fix:
cvsserver: pick up the right mode bits
---

2f46b53957dec3aaca206c6590f5e7f538fabde2
diff --combined git-cvsserver.perl
index a9f6f8ebd4,dfda2b7fbd..74d1cc7db0
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@@ -107,7 -107,7 +107,7 @@@ my $work 
  $log->info("--------------- STARTING -----------------");
  
  my $usage =
 -    "Usage: git cvsserver [options] [pserver|server] [<directory> ...]\n".
 +    "usage: git cvsserver [options] [pserver|server] [<directory> ...]\n".
      "    --base-path <path>  : Prepend to requested CVSROOT\n".
      "                          Can be read from GIT_CVSSERVER_BASE_PATH\n".
      "    --strict-paths      : Don't allow recursing into subdirectories\n".
@@@ -2911,7 -2911,7 +2911,7 @@@ sub filenamespli
  }
  
  # Cleanup various junk in filename (try to canonicalize it), and
 -# add prependdir to accomodate running CVS client from a
 +# add prependdir to accommodate running CVS client from a
  # subdirectory (so the output is relative to top directory of the project).
  sub filecleanup
  {
@@@ -4167,7 -4167,7 +4167,7 @@@ sub convertToDbMod
      #  this half-converted form, but it isn't currently worth the
      #  backwards compatibility headaches.
  
-     $mode=~/^\d\d(\d)\d{3}$/;
+     $mode=~/^\d{3}(\d)\d\d$/;
      my $userBits=$1;
  
      my $dbMode = "";
@@@ -4338,7 -4338,7 +4338,7 @@@ sub getAnyHea
  =head2 getRevisionDirMap
  
  A "revision dir map" contains all the plain-file filenames associated
 -with a particular revision (treeish), organized by directory:
 +with a particular revision (tree-ish), organized by directory:
  
    $type = $out->{$dir}{$fullName}
  
@@@ -4583,7 -4583,7 +4583,7 @@@ sub getmet
      #     the numerical value of the corresponding byte plus
      #     100.
      #      - "plus 100" avoids "0"s, and also reduces the
 -    #        likelyhood of a collision in the case that someone someday
 +    #        likelihood of a collision in the case that someone someday
      #        writes an import tool that tries to preserve original
      #        CVS revision numbers, and the original CVS data had done
      #        lots of branches off of branches and other strangeness to