[webkit-changes] [WebKit/WebKit] 846605: [git-webkit] Detect merge-back clone

[Jonathan Bedard]

  Branch: refs/heads/main
  Home:   https://github.com/WebKit/WebKit
  Commit: 846605f3fbe82661e1d9334970cdc26241fe8472
      https://github.com/WebKit/WebKit/commit/846605f3fbe82661e1d9334970cdc26241fe8472
  Author: Jonathan Bedard <jbedard at apple.com>
  Date:   2024-03-14 (Thu, 14 Mar 2024)

  Changed paths:
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/clone.py
    M Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/clone_unittest.py

  Log Message:
  -----------
  [git-webkit] Detect merge-back clone
https://bugs.webkit.org/show_bug.cgi?id=270986
rdar://124627200

Reviewed by Aakash Jain.

If the user doesn't specify a merge-back behavior when cloning,
we can infer that behavior based on bug comments.

* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/program/clone.py:
(Clone.parser): Add --no-merge-back option.
(Clone.main): Push reason resolution below issue resolution. Attempt
to determine the branch issue was committed to, and assume merge-back
if the issue was not committed to the default branch.
* Tools/Scripts/libraries/webkitscmpy/webkitscmpy/test/clone_unittest.py:
(TestClone.test_infer_merge_back):

Canonical link: https://commits.webkit.org/276124@main



To unsubscribe from these emails, change your notification settings at https://github.com/WebKit/WebKit/settings/notifications