Page MenuHomePhabricator

When running "arc land" from a detached HEAD, don't try to delete the source ref
ClosedPublic

Authored by epriestley on Sep 5 2019, 12:25 PM.
Tags
None
Referenced Files
Unknown Object (File)
Fri, Feb 7, 3:17 AM
Unknown Object (File)
Fri, Feb 7, 2:06 AM
Unknown Object (File)
Thu, Feb 6, 6:56 PM
Unknown Object (File)
Sat, Feb 1, 10:53 AM
Unknown Object (File)
Sat, Feb 1, 1:52 AM
Unknown Object (File)
Fri, Jan 31, 7:12 AM
Unknown Object (File)
Fri, Jan 31, 7:03 AM
Unknown Object (File)
Thu, Jan 30, 10:53 PM
Subscribers
None
Tokens
"Party Time" token, awarded by leoluk.

Details

Summary

Fixes T10321. Some reasonable but less-common workflows involve running arc land from a detached HEAD state.

When users do this, we currently try to delete the raw hash as though it were a branch during cleanup. Instead, detect if the thing we're thinking about deleting is a branch or not, and just leave it alone if it isn't.

Test Plan
  • Ran git checkout <some hash>, then arc land --revision <some revision>.
  • Before, everything worked but cleanup tried to git branch -D <some hash>.
  • After, everything worked and cleanup skipped branch deletion.

Diff Detail

Repository
rARC Arcanist
Lint
Lint Not Applicable
Unit
Tests Not Applicable