Page MenuHomePhabricator
Differential D14365

Explicitly provide "--ff" when performing squash merges in "arc land" under Git
ClosedPublic
Actions

Authored by epriestley on Oct 28 2015, 11:47 PM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Dec 24, 1:42 AM
Unknown Object (File)
Fri, Dec 20, 8:56 AM
Unknown Object (File)
Tue, Dec 17, 6:56 AM
Unknown Object (File)
Sat, Dec 14, 9:03 AM
Unknown Object (File)
Nov 26 2024, 11:17 PM
Unknown Object (File)
Nov 24 2024, 5:16 AM
Unknown Object (File)
Nov 18 2024, 9:49 PM
Unknown Object (File)
Nov 8 2024, 1:20 AM
View All Files
Subscribers
None

Details

Reviewers
chad
Maniphest Tasks
T3855: `arc land` should work when the current branch/bookmark and the target branch/bookmark are the same
Commits
rARCdbd45635eccb: (stable) Merge 2015 Week 44
rARCbaf5eb8a8795: Explicitly provide "--ff" when performing squash merges in "arc land" under Git
Summary

Ref T3855. See discussion leading up to T3855#142304.

Test Plan

See T3855#142304.

Diff Detail

Repository
rARC Arcanist
Branch
land6
Lint
Lint Passed
Unit
Tests Passed
Build Status
Buildable 8491
Build 9783: Run Core Tests
Build 9782: arc lint + arc unit

Event Timeline

epriestley updated this revision to Diff 34684.Oct 28 2015, 11:47 PM
epriestley retitled this revision from to Explicitly provide "--ff" when performing squash merges in "arc land" under Git.
epriestley updated this object.
epriestley edited the test plan for this revision. (Show Details)
epriestley added a reviewer: chad.
epriestley added a task: T3855: `arc land` should work when the current branch/bookmark and the target branch/bookmark are the same.
alexmv mentioned this in T3855: `arc land` should work when the current branch/bookmark and the target branch/bookmark are the same.Oct 28 2015, 11:58 PM
chad accepted this revision.Oct 29 2015, 12:04 AM
chad edited edge metadata.
This revision is now accepted and ready to land.Oct 29 2015, 12:04 AM
epriestley updated this revision to Diff 34685.Oct 29 2015, 12:12 AM
epriestley edited edge metadata.
  • Also fix list($err) which should be $err -- passthru returns only one value.
Closed by commit rARCbaf5eb8a8795: Explicitly provide "--ff" when performing squash merges in "arc land" under Git (authored by epriestley, committed by epriestley). · Explain WhyOct 29 2015, 12:13 AM
This revision was automatically updated to reflect the committed changes.
chad added a comment.Oct 29 2015, 12:26 AM

noidea

epriestley mentioned this in T9802: `arc land` continues when the merge fails.Nov 16 2015, 7:15 PM

Revision Contents
Changeset List

PathSize
src/
land/
5 lines

Diff 34684

View Options

src/land/ArcanistGitLandEngine.php

Loading...
Phabricator · Built by Phacility