Re: [PATCH 05/18] gitweb: Regression fix concerning binary output of files
From: Jakub Narebski <hidden>
Date: 2016-06-15 22:50:13
"John 'Warthog9' Hawley" [off-list ref] writes:
quoted hunk ↗ jump to hunk
This solves the regression introduced with v7.2 of the gitweb-caching code, fix proposed by Jakub in his e-mail. Signed-off-by: John 'Warthog9' Hawley <warthog9@eaglescrag.net> --- gitweb/gitweb.perl | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 3c3ff08..f2ef3da 100755 --- a/gitweb/gitweb.perl +++ b/gitweb/gitweb.perl@@ -5664,7 +5664,7 @@ sub git_blob_plain { if ($caching_enabled) { open BINOUT, '>', $fullhashbinpath or die_error(500, "Could not open bin dump file"); }else{ - open BINOUT, '>', \$fullhashbinpath or die_error(500, "Could not open bin dump file"); + open BINOUT, '>&', \$fullhashbinpath or die_error(500, "Could not open bin dump file"); } binmode BINOUT, ':raw'; print BINOUT <$fd>;
I'd rather you rebase on top of v7.4, where this issue was fixed in different way... well, at least in easier to undertstand way (in the solution used above one must know that if caching is disabled, $fullhashbinpath is *STDOUT - and has nothing to do with any _path_). This probably should be squashed, if using v7.4 is not chosen. -- Jakub Narebski Poland ShadeHawk on #git