Skip to content

Commit

Permalink
cvsserver: pick up the right mode bits
Browse files Browse the repository at this point in the history
When determining the file mode from either ls-tree or diff-tree
output, we used to grab these octal mode string (typically 100644 or
100755) and then did

	$git_perms .= "r" if ( $mode & 4 );
	$git_perms .= "w" if ( $mode & 2 );
	$git_perms .= "x" if ( $mode & 1 );

which was already wrong, as (100644 & 4) is very different from
oct("100644") & 4.  An earlier refactoring 2c3af7e (cvsserver:
factor out git-log parsing logic, 2012-10-13) further changed it to
pick the third octal digit (10*0*644 or 10*0*755) from the left and
then do the above conversion, which does not make sense, either.

Let's use the third digit from the last of the octal mode string to
make sure we get the executable and read bits right.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
Tested-by: Michael Cronenworth <mike@cchtml.com>
  • Loading branch information
Junio C Hamano committed Sep 11, 2013
1 parent 6a3d05d commit 1b48d56
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion git-cvsserver.perl
Original file line number Diff line number Diff line change
Expand Up @@ -4167,7 +4167,7 @@ sub convertToDbMode
# 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 = "";
Expand Down

0 comments on commit 1b48d56

Please sign in to comment.