1748250 - `moz-phab submit` on git uses beta branch as the base in some case

Status: NEW

(Conduit :: moz-phab, defect, P3)

Description

[Tooru Fujisawa [:arai]]

haven't figured out the exact steps tho, this happened for 2 people

Steps to reproduce:

1. git checkout origin/bookmarks/central
2. create a commit
3. moz-phab submit

Actual result:
got the following output:

!! Found multiple upstreams (origin, try).
Determining the commit range using upstream "origin"
Unable to create a stack with 2458 unpublished commits.

This is usually the result of a failure to detect the correct remote repository.
Try again with the `--upstream <upstream>` switch to specify the correct remote repository.

Expected result:
it submits only 1 commit

What I confirmed so far are:

• the 2458 commit comes from git cherry --abbrev=12 origin command performed here
• the output of git cherry origin matches git cherry origin/bookmarks/beta at that point
• after I performed git fetch origin, the issue disappear and it tries to submit only 1 commit

So, it looks like, git cherry sometimes use unexpected branch if it's omitted, maybe depending on the history of remote or something

Comment 1

[Zeid [:zeid]]

Thanks for the bug report. Can you please add which version of moz-phab you are using, as well as if you encounter the same issue when using the latest pre-release? (you can do that by typing pip install MozPhab==1.0.0rc2)

Comment 2

[Tooru Fujisawa [:arai]]

sorry, forgot to mention versions.

it happened on:

• MozPhab (0.1.99) : installed by pip
  • observed the "2458 unpublished commits" issue here at first
• main branch tip https://github.com/mozilla-conduit/review/commit/3b577ccddf0464169bce9097f3a4799a7bbdc71a
  • tried modifying mozphab/git.py to see the command and output

and I think the latter is equivalent to 1.0.0rc2 ?