[Webkit-unassigned] [Bug 282202] New: 'git-webkit canonicalize' may choose the wrong branch name

[bugzilla-daemon at webkit.org]

https://bugs.webkit.org/show_bug.cgi?id=282202

            Bug ID: 282202
           Summary: 'git-webkit canonicalize' may choose the wrong branch
                    name
           Product: WebKit
           Version: Other
          Hardware: PC
                OS: Linux
            Status: NEW
          Severity: Normal
          Priority: P2
         Component: Tools / Tests
          Assignee: webkit-unassigned at lists.webkit.org
          Reporter: mcatanzaro at redhat.com

Workflow:

 * Prepare a bunch of commits on branch mcatanzaro/2.46-private
 * git fetch origin webkitglib/2.46
 * git rebase mcatanzaro/2.46-private
 * git checkout webkitglib/2.46
 * git merge mcatanzaro/2.46-private
 * git-webkit canonicalize

Here I performed a fast-forward merge, so now the same commits with same SHA-1 hashes exist on multiple branches.

Expected result: canonical link should look like this: Canonical link: https://commits.webkit.org/282416.252@webkitglib/2.46

Actual result: canonical link actually looks like this: Canonical link: https://commits.webkit.org/282416.252@mcatanzaro/2.46-private

Workaround:

 * git branch -D mcatanzaro/2.46-private
 * git-webkit canonicalize

The script is smart enough to rewrite the canonical links properly after I deleted the branch that confused it.

-- 
You are receiving this mail because:
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.webkit.org/pipermail/webkit-unassigned/attachments/20241028/77478c84/attachment.htm>