Page MenuHomePhabricator
Files F14937214

D21510.id51197.diff
No OneTemporary
Actions

D21510.id51197.diff
View Options

diff --git a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionBrowseQueryConduitAPIMethod.php
@@ -48,7 +48,7 @@
} else {
try {
list($stdout) = $repository->execxLocalCommand(
- 'cat-file -t %s:%s',
+ 'cat-file -t -- %s:%s',
$commit,
$path);
} catch (CommandException $e) {
@@ -62,7 +62,7 @@
list($sub_err, $sub_stdout) = $repository->execLocalCommand(
'ls-tree %s -- %s',
- $commit,
+ gitsprintf('%s', $commit),
$path);
if (!$sub_err) {
// If the path failed "cat-file" but "ls-tree" worked, we assume it
@@ -86,8 +86,9 @@
if (preg_match('/^fatal: Not a valid object name/', $stderr)) {
// Grab two logs, since the first one is when the object was deleted.
list($stdout) = $repository->execxLocalCommand(
- 'log -n2 --format="%%H" %s -- %s',
- $commit,
+ 'log -n2 %s %s -- %s',
+ '--format=%H',
+ gitsprintf('%s', $commit),
$path);
$stdout = trim($stdout);
if ($stdout) {
@@ -121,8 +122,8 @@
}
list($stdout) = $repository->execxLocalCommand(
- 'ls-tree -z -l %s:%s',
- $commit,
+ 'ls-tree -z -l %s -- %s',
+ gitsprintf('%s', $commit),
$path);
$submodules = array();
@@ -207,7 +208,7 @@
// the wild.
list($err, $contents) = $repository->execLocalCommand(
- 'cat-file blob %s:.gitmodules',
+ 'cat-file blob -- %s:.gitmodules',
$commit);
if (!$err) {
diff --git a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionExistsQueryConduitAPIMethod.php
@@ -25,7 +25,7 @@
$repository = $this->getDiffusionRequest()->getRepository();
$commit = $request->getValue('commit');
list($err, $merge_base) = $repository->execLocalCommand(
- 'cat-file -t %s',
+ 'cat-file -t -- %s',
$commit);
return !$err;
}
diff --git a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionHistoryQueryConduitAPIMethod.php
@@ -64,7 +64,7 @@
$offset,
$limit,
'%H:%P',
- $commit_range,
+ gitsprintf('%s', $commit_range),
// Git omits merge commits if the path is provided, even if it is empty.
(strlen($path) ? csprintf('%s', $path) : ''));
diff --git a/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionLastModifiedQueryConduitAPIMethod.php
@@ -34,7 +34,7 @@
}
list($hash) = $repository->execxLocalCommand(
'log -n1 --format=%%H %s -- %s',
- $commit,
+ gitsprintf('%s', $commit),
$path);
$results[$path] = trim($hash);
}
diff --git a/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionMergedCommitsQueryConduitAPIMethod.php
@@ -35,9 +35,9 @@
$limit = $this->getLimit($request);
list($parents) = $repository->execxLocalCommand(
- 'log -n 1 --format=%s %s',
+ 'log -n 1 --format=%s %s --',
'%P',
- $commit);
+ gitsprintf('%s', $commit));
$parents = preg_split('/\s+/', trim($parents));
if (count($parents) < 2) {
@@ -54,8 +54,8 @@
// NOTE: "+ 1" accounts for the merge commit itself.
$limit + 1,
'%H',
- $commit,
- '^'.$first_parent);
+ gitsprintf('%s', $commit),
+ gitsprintf('%s', '^'.$first_parent));
$hashes = explode("\n", trim($logs));
diff --git a/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionQueryPathsConduitAPIMethod.php
@@ -45,7 +45,7 @@
$future = $repository->getLocalCommandFuture(
'ls-tree --name-only -r -z %s -- %s',
- $commit,
+ gitsprintf('%s', $commit),
$path);
$lines = id(new LinesOfALargeExecFuture($future))->setDelimiter("\0");
diff --git a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
--- a/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
+++ b/src/applications/diffusion/conduit/DiffusionSearchQueryConduitAPIMethod.php
@@ -64,7 +64,7 @@
$future = $repository->getLocalCommandFuture(
// NOTE: --perl-regexp is available only with libpcre compiled in.
'grep --extended-regexp --null -n --no-color -f - %s -- %s',
- $drequest->getStableCommit(),
+ gitsprintf('%s', $drequest->getStableCommit()),
$path);
// NOTE: We're writing the pattern on stdin to avoid issues with UTF8
diff --git a/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php b/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php
--- a/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php
+++ b/src/applications/diffusion/query/blame/DiffusionGitBlameQuery.php
@@ -13,7 +13,7 @@
return $repository->getLocalCommandFuture(
'--no-pager blame --root -s -l %s -- %s',
- $commit,
+ gitsprintf('%s', $commit),
$path);
}
diff --git a/src/applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php b/src/applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php
--- a/src/applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php
+++ b/src/applications/diffusion/query/filecontent/DiffusionGitFileContentQuery.php
@@ -10,7 +10,7 @@
$commit = $drequest->getCommit();
return $repository->getLocalCommandFuture(
- 'cat-file blob %s:%s',
+ 'cat-file blob -- %s:%s',
$commit,
$path);
}
diff --git a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php
--- a/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php
+++ b/src/applications/diffusion/query/lowlevel/DiffusionLowLevelParentsQuery.php
@@ -37,9 +37,9 @@
$repository = $this->getRepository();
list($stdout) = $repository->execxLocalCommand(
- 'log -n 1 --format=%s %s',
+ 'log -n 1 --format=%s %s --',
'%P',
- $this->identifier);
+ gitsprintf('%s', $this->identifier));
return preg_split('/\s+/', trim($stdout));
}
diff --git a/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php b/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
--- a/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
+++ b/src/applications/diffusion/query/rawdiff/DiffusionGitRawDiffQuery.php
@@ -25,7 +25,7 @@
list($parents) = $repository->execxLocalCommand(
'log -n 1 --format=%s %s --',
'%P',
- $commit);
+ gitsprintf('%s', $commit));
if (strlen(trim($parents))) {
$against = $commit.'^';
@@ -42,8 +42,8 @@
return $repository->getLocalCommandFuture(
'diff %Ls %s %s -- %s',
$options,
- $against,
- $commit,
+ gitsprintf('%s', $against),
+ gitsprintf('%s', $commit),
$path);
}

File Metadata

Mime Type
text/plain
Expires
Sun, Feb 16, 2:30 PM (16 h, 23 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7140039
Default Alt Text
D21510.id51197.diff (8 KB)

Event Timeline

Phabricator · Built by Phacility