revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2024-12-01 19:22:41 +01:00
Code Issues Releases Wiki Activity

Fix ambiguous argument where a branch has the same name as a file

Browse source 
Summary: Currently, if you have a branch named "docs" and a local file named "docs", `git show -s docs` complains because it's ambiguous. Use `--` to unambiguously mark branches as revisions, not files.

Test Plan: Ran `arc branch` in a working copy with a "docs" branch and a "docs" file, got expected results.

Reviewers: vrana, btrahan

Reviewed By: vrana

CC: aran

Differential Revision: https://secure.phabricator.com/D3030
This commit is contained in:
epriestley 2012-07-22 13:19:09 -07:00
parent 1e8add9583
commit d2f0ffac7d
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/workflow/ArcanistBranchWorkflow.php
View file

@ -102,7 +102,7 @@ EOTEXT
// seem to have much documentation and has no long form. It suppresses any // seem to have much documentation and has no long form. It suppresses any
// diff output. // diff output.
$futures[$branch['name']] = $repository_api->execFutureLocal( $futures[$branch['name']] = $repository_api->execFutureLocal(
'show -s --format=%C %s', 'show -s --format=%C %s --',
'%H%x01%ct%x01%T%x01%s%x01%b', '%H%x01%ct%x01%T%x01%s%x01%b',
$branch['name']); $branch['name']);
} }