mbox series

[v2,0/4] ez: allow remote-tracking branches as ENROLL_BASE

Message ID 20230219-allow-remote-branches-as-base-v2-0-8db83bda1403@gmail.com (mailing list archive)
Headers show
Series ez: allow remote-tracking branches as ENROLL_BASE | expand

Message

Philippe Blain March 6, 2023, 6:02 p.m. UTC
This is a more complete take at allowing remote-tracking branches
as ENROLL_BASE in 'b4 prep --enroll'. The first commit is unchanged.

Changes in v2:
- New patch to also check remote-tracking branches when ENROLL_BASE is
  not a branch (2/4)
- New patches (3/4-4/4) to support '@{u}'
- Rebased on master
- Link to v1: https://msgid.link/20230219-allow-remote-branches-as-base-v1-1-a1cf7948b2cc@gmail.com

---
Philippe Blain (4):
      ez: allow remote-tracking branches as ENROLL_BASE
      ez: also check remote-tracking branches when ENROLL_BASE is not a branch
      ez: allow '@{upstream}' as ENROLL_BASE
      ez: let ENROLL_BASE default to '@{upstream}'

 b4/__init__.py |  4 +++-
 b4/command.py  |  4 ++--
 b4/ez.py       | 15 ++++++++++++---
 3 files changed, 17 insertions(+), 6 deletions(-)
---
base-commit: bd1bf7905f2f9c2340b75b5074285105a6fa35f3
change-id: 20230219-allow-remote-branches-as-base-1ccdeb741f0c
--
b4

Comments

Konstantin Ryabitsev March 10, 2023, 7:59 p.m. UTC | #1
On Mon, 06 Mar 2023 13:02:08 -0500, Philippe Blain wrote:
> This is a more complete take at allowing remote-tracking branches
> as ENROLL_BASE in 'b4 prep --enroll'. The first commit is unchanged.
> 
> Changes in v2:
> - New patch to also check remote-tracking branches when ENROLL_BASE is
>   not a branch (2/4)
> - New patches (3/4-4/4) to support '@{u}'
> - Rebased on master
> - Link to v1: https://msgid.link/20230219-allow-remote-branches-as-base-v1-1-a1cf7948b2cc@gmail.com
> 
> [...]

Applied, thanks!

[1/4] ez: allow remote-tracking branches as ENROLL_BASE
      commit: 800dae4b48fbbfb2bd52e0bc2da351b0627659b8
[2/4] ez: also check remote-tracking branches when ENROLL_BASE is not a branch
      commit: 6d27eef275c2b88663b446f156293a5c3c7ad7c6
[3/4] ez: allow '@{upstream}' as ENROLL_BASE
      commit: 1f34f802252976549d82338807c75729766653c6
[4/4] ez: let ENROLL_BASE default to '@{upstream}'
      commit: 800dae4b48fbbfb2bd52e0bc2da351b0627659b8

Best regards,