1.0.5 and 1.0.6 commits are not on the 1.0.x or 2.x branches

Created on 19 April 2024, 8 months ago
Updated 20 April 2024, 8 months ago

Problem/Motivation

Thanks for making 1.0.5 and 1.0.6 releases. I went to update my PRs such as 📌 Fix coding standards Needs review based on the new releases, but the 1.0.5 and 1.0.6 commits do not seem to be on a release branch (1.0.x or 2.x).

Steps to reproduce

Clone the module's repo.

Output of git checkout 1.0.x; git log

commit 785e22c4241b9987c2715a1a9cff22167091c5c9 (HEAD -> 1.0.x, tag: 1.0.4, origin/1.0.x)
Author: Project Update Bot <66574-Project-Update-Bot@users.noreply.drupalcode.org>
Date:   Thu Mar 28 22:54:15 2024 +0000

    Automated Project Update Bot fixes

Output of git checkout 1.0.5; git log. As you can see the 1.0.4 tag has been lost, and for some reason 1.03 and 1.0.1 point to the same commit, while nothing points to 1.0.2.

commit a44856a0b8ef5130f6533dbf0a4ddd16f31abd82 (HEAD, tag: 1.0.5)
Author: ro-no-lo <35698-ro-no-lo@users.noreply.drupalcode.org>
Date:   Wed Apr 17 15:04:11 2024 +0000

    Issue #3335627 by Shubham Rathore: Update core_version_requirement on info.yml...

commit c4e588dc6c8436ed454ffbb8d498ae507663d986 (tag: 1.0.3, tag: 1.0.1)
Author: Ronald Locke <rl@markveys.com>
Date:   Wed Oct 26 13:54:34 2022 +0200

    Inital commit.

commit ad667684c5525d67596762e5a89fe3764cf7134a
Author: Ronald Locke <rl@markveys.com>
Date:   Wed Oct 26 13:53:08 2022 +0200

    Inital commit.
(END)

Output of git checkout 1.0.6; git log. Here it seems the commit was made on top of 1.0.5 but the 1.0.4 commit history was lost.

commit a3f59493d7ddd184002c057a1acf162a58f4e3b4 (HEAD, tag: 1.0.6, origin/HEAD, origin/1.0.0)
Author: ro-no-lo <35698-ro-no-lo@users.noreply.drupalcode.org>
Date:   Fri Apr 19 06:56:54 2024 +0000

    Update 2 files
    
    - /src/EventSubscriber/ResponseSubscriber.php
    - /src/Form/SettingsForm.php

commit a44856a0b8ef5130f6533dbf0a4ddd16f31abd82 (tag: 1.0.5)
Author: ro-no-lo <35698-ro-no-lo@users.noreply.drupalcode.org>
Date:   Wed Apr 17 15:04:11 2024 +0000

    Issue #3335627 by Shubham Rathore: Update core_version_requirement on info.yml...

commit c4e588dc6c8436ed454ffbb8d498ae507663d986 (tag: 1.0.3, tag: 1.0.1)
Author: Ronald Locke <rl@markveys.com>
Date:   Wed Oct 26 13:54:34 2022 +0200

    Inital commit.

commit ad667684c5525d67596762e5a89fe3764cf7134a
Author: Ronald Locke <rl@markveys.com>
Date:   Wed Oct 26 13:53:08 2022 +0200

    Inital commit.

Proposed resolution

I guess you should cherry pick the commits and put them on the 1.0.x branch, and keep going from there? Alternately, a new release branch could be created, but there really needs to be a branch to target for MRs and patches.

🐛 Bug report
Status

Active

Version

1.0

Component

Code

Created by

🇯🇵Japan ptmkenny

Live updates comments and jobs are added and updated live.
Sign in to follow issues

Comments & Activities

Production build 0.71.5 2024