From 2b1e17237b0b14855ad8337ec001d6d1fd7cca61 Mon Sep 17 00:00:00 2001 From: Jakub Narebski Date: Fri, 25 Mar 2011 20:20:49 +0100 Subject: gitweb: Fix handling of fractional timezones in parse_date Fractional timezones, like -0330 (NST used in Canada) or +0430 (Afghanistan, Iran DST), were not handled properly in parse_date; this means values such as 'minute_local' and 'iso-tz' were not generated correctly. This was caused by two mistakes: * sign of timezone was applied only to hour part of offset, and not as it should be also to minutes part (this affected only negative fractional timezones). * 'int $h + $m/60' is 'int($h + $m/60)' and not 'int($h) + $m/60', so fractional part was discarded altogether ($h is hours, $m is minutes, which is always less than 60). Note that positive fractional timezones +0430, +0530 and +1030 can be found as authortime in git.git repository itself. For example http://repo.or.cz/w/git.git/commit/88d50e7 had authortime of "Fri, 8 Jan 2010 18:48:07 +0000 (23:48 +0530)", which is not marked with 'atnight', when "git show 88d50e7" gives correct author date of "Sat Jan 9 00:18:07 2010 +0530". Signed-off-by: Jakub Narebski Signed-off-by: Junio C Hamano diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 9dccfb0..46186ab 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -2913,8 +2913,10 @@ sub parse_date { $date{'iso-8601'} = sprintf "%04d-%02d-%02dT%02d:%02d:%02dZ", 1900+$year, 1+$mon, $mday, $hour ,$min, $sec; - $tz =~ m/^([+\-][0-9][0-9])([0-9][0-9])$/; - my $local = $epoch + ((int $1 + ($2/60)) * 3600); + my ($tz_sign, $tz_hour, $tz_min) = + ($tz =~ m/^([-+])(\d\d)(\d\d)$/); + $tz_sign = ($tz_sign eq '-' ? -1 : +1); + my $local = $epoch + $tz_sign*((($tz_hour*60) + $tz_min)*60); ($sec, $min, $hour, $mday, $mon, $year, $wday, $yday) = gmtime($local); $date{'hour_local'} = $hour; $date{'minute_local'} = $min; -- cgit v0.10.2-6-g49f6 From 78bc46675353e4833a59e0f4dfa47d57a9c1a46b Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Fri, 25 Mar 2011 17:56:14 -0700 Subject: Git 1.7.4.2 Signed-off-by: Junio C Hamano diff --git a/Documentation/RelNotes/1.7.4.2.txt b/Documentation/RelNotes/1.7.4.2.txt index 991dae4..ef4ce1f 100644 --- a/Documentation/RelNotes/1.7.4.2.txt +++ b/Documentation/RelNotes/1.7.4.2.txt @@ -12,6 +12,10 @@ Fixes since v1.7.4.1 tiny packfiles. We now close the file descriptor early when the entire packfile fits inside one mmap window. + * "git bisect visualize" tried to run "gitk" in windowing + environments even when "gitk" is not installed, resulting in a + strange error message. + * "git clone /no/such/path" did not fail correctly. * "git commit" did not correctly error out when the user asked to use a @@ -45,6 +49,9 @@ Fixes since v1.7.4.1 * gitweb's "highlight" interface mishandled tabs. + * gitweb didn't understand timezones with GMT offset that is not + multiple of a whole hour. + * gitweb had a few forward-incompatible syntactic constructs and also used incorrect variable when showing the file mode in a diff. diff --git a/GIT-VERSION-GEN b/GIT-VERSION-GEN index d03e624..0b4e960 100755 --- a/GIT-VERSION-GEN +++ b/GIT-VERSION-GEN @@ -1,7 +1,7 @@ #!/bin/sh GVF=GIT-VERSION-FILE -DEF_VER=v1.7.4.1 +DEF_VER=v1.7.4.2 LF=' ' -- cgit v0.10.2-6-g49f6