global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-29 01:50:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  git-cvsserver: fix error for invalid password formats
  git-cvsserver: typo in a comment: bas -> has
  gitweb/Makefile: fix typo in gitweb.min.css rule
This commit is contained in:
Junio C Hamano
2010-06-20 23:32:27 -07:00
parent f1fb28a558 b43688a5bc
commit 1029041274
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
git-cvsserver.perl
View File

@@ -2661,9 +2661,12 @@ sub descramble
);
my ($str) = @_;
# This should never happen, the same password format (A) bas been
# This should never happen, the same password format (A) has been
# used by CVS since the beginning of time
die "invalid password format $1" unless substr($str, 0, 1) eq 'A';
{
my $fmt = substr($str, 0, 1);
die "invalid password format `$fmt'" unless $fmt eq 'A';
}
my @str = unpack "C*", substr($str, 1);
my $ret = join '', map { chr $SHIFTS[$_] } @str;

2
gitweb/Makefile
View File

@@ -103,7 +103,7 @@ GITWEB_FILES += static/gitweb.min.css
GITWEB_CSS = static/gitweb.min.css
all:: static/gitweb.min.css
static/gitweb.min.css: static/gitweb.css GITWEB-BUILD-OPTIONS
$(QUIET_GEN)$(CSSMIN) <$ >$@
$(QUIET_GEN)$(CSSMIN) <$< >$@
else
GITWEB_FILES += static/gitweb.css
endif