mirror of
https://we.phorge.it/source/arcanist.git
synced 2024-11-22 23:02:41 +01:00
Don't amend existing revision with arc diff --create
Summary: If there's other revision in last commit message and I said `--create` then it is clear that I want to create a new commit. Test Plan: $ arc diff --create # in dirty working copy on top of my open revision Reviewers: epriestley Reviewed By: epriestley CC: aran, Korvin Differential Revision: https://secure.phabricator.com/D5078
This commit is contained in:
parent
aadaf9a795
commit
5d47682f3b
1 changed files with 6 additions and 1 deletions
|
@ -871,10 +871,11 @@ abstract class ArcanistBaseWorkflow extends Phobject {
|
||||||
if (!$commits) {
|
if (!$commits) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
$commit = reset($commits);
|
|
||||||
|
|
||||||
|
$commit = reset($commits);
|
||||||
$message = ArcanistDifferentialCommitMessage::newFromRawCorpus(
|
$message = ArcanistDifferentialCommitMessage::newFromRawCorpus(
|
||||||
$commit['message']);
|
$commit['message']);
|
||||||
|
|
||||||
if ($message->getGitSVNBaseRevision()) {
|
if ($message->getGitSVNBaseRevision()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
@ -883,6 +884,10 @@ abstract class ArcanistBaseWorkflow extends Phobject {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if ($message->getRevisionID() && $this->getArgument('create')) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
// TODO: Check commits since tracking branch. If empty then return false.
|
// TODO: Check commits since tracking branch. If empty then return false.
|
||||||
|
|
||||||
$repository = $this->loadProjectRepository();
|
$repository = $this->loadProjectRepository();
|
||||||
|
|
Loading…
Reference in a new issue