Page MenuHomePhabricator
Files F13992549

D15693.id40321.diff
No OneTemporary
Actions

D15693.id40321.diff
View Options

diff --git a/src/repository/api/ArcanistGitAPI.php b/src/repository/api/ArcanistGitAPI.php
--- a/src/repository/api/ArcanistGitAPI.php
+++ b/src/repository/api/ArcanistGitAPI.php
@@ -28,20 +28,7 @@
public function execPassthru($pattern /* , ... */) {
$args = func_get_args();
- static $git = null;
- if ($git === null) {
- if (phutil_is_windows()) {
- // NOTE: On Windows, phutil_passthru() uses 'bypass_shell' because
- // everything goes to hell if we don't. We must provide an absolute
- // path to Git for this to work properly.
- $git = Filesystem::resolveBinary('git');
- $git = csprintf('%s', $git);
- } else {
- $git = 'git';
- }
- }
-
- $args[0] = $git.' '.$args[0];
+ $args[0] = 'git '.$args[0];
return call_user_func_array('phutil_passthru', $args);
}
@@ -159,17 +146,10 @@
$this->getBaseCommit());
}
- // NOTE: Windows escaping of "%" symbols apparently is inherently broken;
- // when passed through escapeshellarg() they are replaced with spaces.
-
- // TODO: Learn how cmd.exe works and find some clever workaround?
-
// NOTE: If we use "%x00", output is truncated in Windows.
list($info) = $this->execxLocal(
- phutil_is_windows()
- ? 'log %C --format=%C --'
- : 'log %C --format=%s --',
+ 'log %C --format=%s --',
$against,
// NOTE: "%B" is somewhat new, use "%s%n%n%b" instead.
'%H%x01%T%x01%P%x01%at%x01%an%x01%aE%x01%s%x01%s%n%n%b%x02');
@@ -597,9 +577,7 @@
$stdout = $this->getHashFromFromSVNRevisionNumber($match[1]);
} else {
list($stdout) = $this->execxLocal(
- phutil_is_windows()
- ? 'show -s --format=%C %s --'
- : 'show -s --format=%s %s --',
+ 'show -s --format=%s %s --',
'%H',
$string);
}

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 23, 5:19 PM (2 w, 1 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6744726
Default Alt Text
D15693.id40321.diff (1 KB)

Event Timeline

Phabricator · Built by Phacility