abhinav / abhinav/git-spice

submit: better handling of divergent HEAD for pushed, but not published branches

オープン
#845 コメント 3 件 リアクション 0 件 担当者 0 名 GitHub で見る
enhancement
主要言語
Go
スター
762
フォーク
72
平均マージ
18時間 24分
マージ済み PR(30日)
28

説明

When submitting a branch, git-spice attempts to match the branch to open PRs on the repo in case the PR was opened without using git-spice's submit command.
Right now, this will refuse to match branches with the same name that have a different HEAD.

This has led to the following scenario for some users:

1. Use git-spice to submit branch but not publish a PR.
2. Create PR manually
3. A CI job that updates the PR (e.g. adjusting formatting)
4. Make local updates and try to submit to update the branch

The submit fails because the branch matching fails (because of divergent HEAD).
We need the following fixes here:

- when rejecting a branch because of a divergent head, prompt the user in case they know for sure that they own this branch
- submit should probably remember that it pushed this branch previously, so even if there's no PR information, it's owned by us

コントリビューションガイド

コントリビューションガイドを開く

評価

この issue はまだ評価されていません。

新しい issue をメールで受け取る

初心者向けの GitHub issue を短くまとめたダイジェスト。