summaryrefslogtreecommitdiff
path: root/gitweb
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2007-11-11 15:00:05 -0800
committerJunio C Hamano <gitster@pobox.com>2007-11-11 15:00:05 -0800
commit82527cf33e59308b86cf3defe9ae0f5c2367a012 (patch)
treed780715fae0b171b98dbd7f71983eccf8ccecf7e /gitweb
parent1b2486d73789aaed0671e8d5cc60f5624d8e7ce5 (diff)
parenta91ef6e75b897a255cc17b70014a39e68dd54c7a (diff)
downloadgit-82527cf33e59308b86cf3defe9ae0f5c2367a012.tar.gz
Merge branch 'maint'
* maint: fix index-pack with packs >4GB containing deltas on 32-bit machines git-hash-object should honor config variables gitweb: correct month in date display for atom feeds
Diffstat (limited to 'gitweb')
-rwxr-xr-xgitweb/gitweb.perl2
1 files changed, 1 insertions, 1 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 759dff1cce..e788ef90c9 100755
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1856,7 +1856,7 @@ sub parse_date {
$date{'mday-time'} = sprintf "%d %s %02d:%02d",
$mday, $months[$mon], $hour ,$min;
$date{'iso-8601'} = sprintf "%04d-%02d-%02dT%02d:%02d:%02dZ",
- 1900+$year, $mon, $mday, $hour ,$min, $sec;
+ 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);