Page MenuHomePhabricator
Create Task
Maniphest T10321

Running "arc land" without a branch checked out sort of works but fails when trying to delete the branch
Closed, ResolvedPublic
Actions

Description

I ran arc land --hold which put my commit ahead of the origin. Out of curosity, I ran arc land again to see whether or not that would land everything correctly. Interestingly enough, everything worked except for the final part that tries to delete the branch after pushing.

Reproduction steps:

  • On a branch that you want to land, run:
  • arc land --hold
  • arc land

The reason I ran arc land was I was interested to know whether it'd switch back to the branch I was on and clean it up correctly (because running the git push doesn't delete the branch obviously).

Revisions and Commits

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

Related Objects

Event Timeline

hach-que created this task.Feb 11 2016, 12:13 AM
hach-que triaged this task as Wishlist priority.EditedFeb 11 2016, 12:15 AM

This is a super minor issue and not blocking anyone, so I'm changing it to Wishlist priority to designate how much I don't expect upstream to spend time fixing it.

• Persona added a commit: rP2eab1c1943c5: (stable) Promote 2015 Week 32.Feb 24 2016, 11:25 AM
tycho.tatitscheff removed a commit: rP2eab1c1943c5: (stable) Promote 2015 Week 32.Feb 24 2016, 12:25 PM
epriestley merged a task: T10727: arc land after arc land --hold breaks on the most irrelevant step.Apr 5 2016, 7:14 PM
epriestley added a subscriber: allixsenos.
epriestley added a subscriber: epriestley.Apr 5 2016, 7:16 PM

T10727 is a similar report of this issue, although motivated via arc land --hold.

This is definitely a bug and certainly something we should fix, although it's a bit entangled with higher-level arc land workflows and a proper fix isn't just a one-liner, so I probably won't get around to it until the next time I'm somewhere nearby in the codebase (although the --hold pathway makes this more reachable than the bare "I was on a detached HEAD" pathway).

A workaround is probably (?) to use --keep, but you understand this error you probably don't care anyway.

allixsenos awarded a token.Apr 5 2016, 7:27 PM
epriestley added a comment.Apr 5 2016, 7:44 PM

(Oh, this one was with arc land --hold originally too -- I misremembered the context.)

epriestley added a comment.Sep 5 2019, 12:19 PM

See also https://discourse.phabricator-community.org/t/arc-land-fails-with-detached-head/3078/.

Herald added a subscriber: amckinley. · View Herald TranscriptSep 5 2019, 12:19 PM
epriestley added a revision: D20786: When running "arc land" from a detached HEAD, don't try to delete the source ref.Sep 5 2019, 12:25 PM
epriestley closed this task as Resolved by committing rARC3cdfe1fff806: When running "arc land" from a detached HEAD, don't try to delete the source ref.Sep 5 2019, 12:31 PM
epriestley claimed this task.
epriestley added a commit: rARC3cdfe1fff806: When running "arc land" from a detached HEAD, don't try to delete the source ref.
Phabricator · Built by Phacility