Page MenuHomePhabricator

Allow arc patch to keep empty commits
AbandonedPublic

Authored by vm on Sep 8 2014, 6:22 PM.
Tags
None
Referenced Files
Unknown Object (File)
Thu, Jun 26, 3:32 PM
Unknown Object (File)
Fri, Jun 13, 9:19 PM
Unknown Object (File)
Fri, Jun 13, 6:44 PM
Unknown Object (File)
May 9 2025, 1:01 PM
Unknown Object (File)
May 8 2025, 12:23 PM
Unknown Object (File)
Apr 21 2025, 11:54 PM
Unknown Object (File)
Apr 21 2025, 1:31 PM
Unknown Object (File)
Apr 2 2025, 12:24 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