diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:21:10 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-19 23:21:10 -0700 |
| commit | edf9d719d1d05c1eb4f652782febfdfede212648 (patch) | |
| tree | 86e37bca053a0c5c3c99eb1124d97a9ffdb43e05 | |
| parent | grep: read patterns from stdin with -f - (diff) | |
| parent | gitweb: Always call parse_date with timezone parameter (diff) | |
| download | tgif-edf9d719d1d05c1eb4f652782febfdfede212648.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Always call parse_date with timezone parameter
bisect: explain the rationale behind 125
| -rw-r--r-- | Documentation/git-bisect.txt | 7 | ||||
| -rwxr-xr-x | gitweb/gitweb.perl | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index a1e47d6798..4b4b096ce5 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -241,7 +241,12 @@ exit(3) manual page), as the value is chopped with "& 0377". The special exit code 125 should be used when the current source code cannot be tested. If the script exits with this code, the current -revision will be skipped (see `git bisect skip` above). +revision will be skipped (see `git bisect skip` above). 125 was chosen +as the highest sensible value to use for this purpose, because 126 and 127 +are used by POSIX shells to signal specific error status (127 is for +command not found, 126 is for command found but not executable---these +details do not matter, as they are normal errors in the script, as far as +"bisect run" is concerned). You may often find that during a bisect session you want to have temporary modifications (e.g. s/#define DEBUG 0/#define DEBUG 1/ in a diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index b04ab8c9bb..9dccfb01d6 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -4906,7 +4906,6 @@ sub git_log_body { next if !%co; my $commit = $co{'id'}; my $ref = format_ref_marker($refs, $commit); - my %ad = parse_date($co{'author_epoch'}); git_print_header_div('commit', "<span class=\"age\">$co{'age_string'}</span>" . esc_html($co{'title'}) . $ref, @@ -7064,7 +7063,7 @@ sub git_feed { if (defined($commitlist[0])) { %latest_commit = %{$commitlist[0]}; my $latest_epoch = $latest_commit{'committer_epoch'}; - %latest_date = parse_date($latest_epoch); + %latest_date = parse_date($latest_epoch, $latest_commit{'comitter_tz'}); my $if_modified = $cgi->http('IF_MODIFIED_SINCE'); if (defined $if_modified) { my $since; @@ -7195,7 +7194,7 @@ XML if (($i >= 20) && ((time - $co{'author_epoch'}) > 48*60*60)) { last; } - my %cd = parse_date($co{'author_epoch'}); + my %cd = parse_date($co{'author_epoch'}, $co{'author_tz'}); # get list of changed files open my $fd, "-|", git_cmd(), "diff-tree", '-r', @diff_opts, |