* [PATCH 08/11] solvergit: do not show full path names to "git apply"
2019-01-30 4:44 4% [PATCH 00/11] viewvcs: more fixes Eric Wong
@ 2019-01-30 4:44 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-01-30 4:44 UTC (permalink / raw)
To: meta
"git apply" will warn about whitespace with the full path of the
patch, which will expose the $TMPDIR environment to users over
HTTP(S).
This change breaks compatibility with git pre-1.8.5, again;
but that was released in late-2013; so hopefully everybody
is on newer versions.
---
lib/PublicInbox/SolverGit.pm | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/SolverGit.pm b/lib/PublicInbox/SolverGit.pm
index 24d9da2..891cde2 100644
--- a/lib/PublicInbox/SolverGit.pm
+++ b/lib/PublicInbox/SolverGit.pm
@@ -389,8 +389,8 @@ sub do_git_apply ($) {
my $patches = $self->{patches};
# we need --ignore-whitespace because some patches are CRLF
- my @cmd = qw(git apply --cached --ignore-whitespace
- --whitespace=warn --verbose);
+ my @cmd = (qw(git -C), $dn, qw(apply --cached --ignore-whitespace
+ --whitespace=warn --verbose));
my $len = length(join(' ', @cmd));
my $total = $self->{tot};
my $di; # keep track of the last one for "git ls-files"
@@ -400,8 +400,7 @@ sub do_git_apply ($) {
$di = shift @$patches;
dbg($self, "\napplying [$i/$total] " . di_url($self, $di) .
"\n" . join('', @{$di->{hdr_lines}}));
- my $pn = $total + 1 - $i;
- my $path = "$dn/$pn";
+ my $path = $total + 1 - $i;
$len += length($path) + 1;
push @cmd, $path;
} while (@$patches && $len < $ARG_SIZE_MAX);
--
EW
^ permalink raw reply related [relevance 7%]
* [PATCH 00/11] viewvcs: more fixes
@ 2019-01-30 4:44 4% Eric Wong
2019-01-30 4:44 7% ` [PATCH 08/11] solvergit: do not show full path names to "git apply" Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-01-30 4:44 UTC (permalink / raw)
To: meta
Been hammering away with check-www-inbox on git@vger without problems,
so I'll probably deploy this to the non-onion site soon...
And maybe I'll set the non-.onion to use 216dark, too...
Eric Wong (11):
hval: add src_escape for highlight post-processing
t/check-www-inbox: replace IPC::Run with PublicInbox::Spawn
t/check-www-inbox: don't follow mboxes
t/check-www-inbox: disable history
solvergit: do not solve blobs twice
viewvcs: avoid segfault with highlight.pm at shutdown
css/216dark: add comments and tweak highlight colors
solvergit: do not show full path names to "git apply"
solvergit: avoid "Wide character" warnings
solvergit: extract mode from diff headers properly
solvergit: deal with alternative diff prefixes
contrib/css/216dark.css | 14 ++++++------
lib/PublicInbox/Hval.pm | 8 ++++++-
lib/PublicInbox/SolverGit.pm | 18 ++++++++++-----
lib/PublicInbox/UserContent.pm | 14 ++++++------
lib/PublicInbox/ViewVCS.pm | 9 +++++++-
t/check-www-inbox.perl | 42 +++++++++++++++++++++++++++++-----
t/hval.t | 3 +++
7 files changed, 80 insertions(+), 28 deletions(-)
--
EW
^ permalink raw reply [relevance 4%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2019-01-30 4:44 4% [PATCH 00/11] viewvcs: more fixes Eric Wong
2019-01-30 4:44 7% ` [PATCH 08/11] solvergit: do not show full path names to "git apply" Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).