From 70649945c215b1674611a40eda1d0058118a6d1a Mon Sep 17 00:00:00 2001 From: Jay Soffian Date: Fri, 18 Jun 2010 17:01:25 -0400 Subject: [PATCH 1/3] gitweb/Makefile: fix typo in gitweb.min.css rule This typo has been in place since the rule was originally added by 0e6ce21 (Gitweb: add support for minifying gitweb.css). Signed-off-by: Jay Soffian Signed-off-by: Junio C Hamano --- gitweb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitweb/Makefile b/gitweb/Makefile index f2e1d92fbb..e7dd252773 100644 --- a/gitweb/Makefile +++ b/gitweb/Makefile @@ -91,7 +91,7 @@ ifdef CSSMIN GITWEB_CSS = gitweb.min.css all:: gitweb.min.css gitweb.min.css: gitweb.css GITWEB-BUILD-OPTIONS - $(QUIET_GEN)$(CSSMIN) <$ >$@ + $(QUIET_GEN)$(CSSMIN) <$< >$@ endif GITWEB_REPLACE = \ From fce338a5433d34f119457c0f6e6560799ba14022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 19 Jun 2010 16:06:57 +0000 Subject: [PATCH 2/3] git-cvsserver: typo in a comment: bas -> has MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- git-cvsserver.perl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 3833beeef3..6de7921796 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2656,7 +2656,7 @@ 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'; From 1f0eb51391d58958dd9f1e6cbcba622c309303b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Sat, 19 Jun 2010 16:06:58 +0000 Subject: [PATCH 3/3] git-cvsserver: fix error for invalid password formats MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change the error message to report the erroneous password character. $1 was never set in the previos version, it was a leftover from older code that used a regex for the test. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- git-cvsserver.perl | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/git-cvsserver.perl b/git-cvsserver.perl index 6de7921796..0f45c39509 100755 --- a/git-cvsserver.perl +++ b/git-cvsserver.perl @@ -2658,7 +2658,10 @@ sub descramble # 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;