diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-10-23 19:29:05 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-10-23 19:29:05 -0700 |
| commit | 1259404c7e5cd88b7f6692986469cd20cbfacdad (patch) | |
| tree | cadffdf850a06e1d41ce1ebf4d1290e8d5768cfc /gitweb | |
| parent | b4aee09e610567529dc619d7324dc2fe85a11db5 (diff) | |
| parent | a153adf683d2b6e22c7e892ed8a161b140156186 (diff) | |
| download | git-1259404c7e5cd88b7f6692986469cd20cbfacdad.tar.gz git-1259404c7e5cd88b7f6692986469cd20cbfacdad.tar.xz | |
Merge branch 'maint'
* maint:
gitweb: Fix setting $/ in parse_commit()
daemon: do not die on older clients.
xdiff/xemit.c (xdl_find_func): Elide trailing white space in a context header.
git-clone: honor --quiet
Documentation for the [remote] config
prune-packed: Fix uninitialized variable.
Diffstat (limited to 'gitweb')
| -rwxr-xr-x | gitweb/gitweb.perl | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index c9e57f051..bc8d8eb23 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl @@ -1059,12 +1059,11 @@ sub parse_commit { if (defined $commit_text) { @commit_lines = @$commit_text; } else { - $/ = "\0"; + local $/ = "\0"; open my $fd, "-|", git_cmd(), "rev-list", "--header", "--parents", "--max-count=1", $commit_id or return; @commit_lines = split '\n', <$fd>; close $fd or return; - $/ = "\n"; pop @commit_lines; } my $header = shift @commit_lines; |