Page MenuHomePhabricator

Allow arc patch to keep empty commits
AbandonedPublic

Authored by vm on Sep 8 2014, 6:22 PM.
Tags
None
Referenced Files
F14055023: D10443.diff
Sat, Nov 16, 7:28 AM
F14041743: D10443.diff
Mon, Nov 11, 9:08 PM
F14027442: D10443.diff
Fri, Nov 8, 7:12 AM
F14014088: D10443.id.diff
Sat, Nov 2, 9:56 PM
F14014051: D10443.id.diff
Sat, Nov 2, 9:34 PM
F14011793: D10443.diff
Fri, Nov 1, 5:16 AM
F14002757: D10443.id25115.diff
Fri, Oct 25, 10:04 PM
F13992962: D10443.diff
Tue, Oct 22, 7:51 PM

Details

Summary

This is in an effort to simplify test automation around dependent diffs workflow.
If you have dependent diffs where some of the dependencies have already landed into HEAD, a arc patch --nobranch on the dependent diff fails since 'get cherry-pick' does not allow empty commits.
This lets you set a flag that gets passed down to git cherry-pick which allows and keeps empty commits around.

Fixes one of the problems mentioned in T5986

Test Plan

arc patch --nobranch D1 fails, but arc patch --nobranch --keep-redundant-commits D1 runs successfully and adds a empty commit to the working copy.

Diff Detail

Repository
rARC Arcanist
Branch
kec
Lint
Lint Passed
Unit
No Test Coverage
Build Status
Buildable 2464
Build 2468: [Placeholder Plan] Wait for 30 Seconds