1527621 - `moz-phab patch` should support --no-branch (or similar) for git-cinnabar

Status: RESOLVED FIXED

(Conduit :: moz-phab, enhancement)

Description

[Mark Banner (:standard8)]

When using moz-phab on a git-cinnabar repository, it seems like there is no way to apply the patch to the current branch without creating a new branch.

Could we have an option similar to --no-bookmark but for git please?

Comment 1

[Piotr Zalewa [:zalun]]

The situation is a little different - the --no-bookmark is creating a DAG branch point, it is simply not bookmarking it.
I agree we could have a --no-branch option, but in Git the result would depend on the base commit of the patch.

1. If --apply-to here and not working in detached HEAD patch would simply add commits to the current branch.
2. If --apply-to here and working in detached HEAD patch would continue on adding commits in the detached HEAD state.
3. If --apply-to base or --apply-to SHA1 - moz-phab patch would switch repository to the detached HEAD state and add commits.

I think we should allow to do this and guard switching to the detached HEAD with a warning or even a prompt.

Comment 2

[Piotr Zalewa [:zalun]]

Attachment: Bug 1527621 - Add ability to patch without creating a branch in Git r=glob

Mercurial has a --no-bookmark option which allows to not create a
bookmark for a new DAG branch point. In Git we had been always create a
branch.

This patch is adding a new option --no-branch which allows to create
commits without creating a branch. This may result in switching the
repository to the 'detached HEAD' state. User has to use the --yes
option or agree to the prompt.