[OpenOCD-commit] Main OpenOCD repository branch, master, updated. v0.12.0-1042-gc77ba0cf5

[openocd-gerrit <ope...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main OpenOCD repository".

The branch, master has been updated
       via  c77ba0cf57f0632ecbdca500516f449853e017f4 (commit)
      from  fa83ca0bea5532afa1cb7b994b77cc3b6d77f7db (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c77ba0cf57f0632ecbdca500516f449853e017f4
Author: Antonio Borneo <bor...@gm...>
Date:   Tue Jun 3 11:52:59 2025 +0200

    HACKING: describe keeping the 'Change-Id' on new patch versions
    
    We often get on Gerrit a new version of an old patch with a new
    'Change-Id' value. This breaks the history of the review, adding
    more work to the review process.
    
    Describe in HACKING why the hook 'commit-msg' is required and how
    to handle the 'Change-Id' on new patch versions.
    
    Change-Id: I5c060b19f966add7422704912b38e1ab2f788e5f
    Signed-off-by: Antonio Borneo <bor...@gm...>
    Reviewed-on: https://review.openocd.org/c/openocd/+/8940
    Tested-by: jenkins

diff --git a/HACKING b/HACKING
index 8988b1617..785179efe 100644
--- a/HACKING
+++ b/HACKING
@@ -169,7 +169,9 @@ git remote add review https://USERNAME:PAS...@re.../p/openocd.git
 Gerrit server, even if you plan to use several local branches for different
 topics. It is possible because @c for/master is not a traditional Git
 branch.
-  -# You will need to install this hook, we will look into a better solution:
+  -# You will need to install this hook to automatically add the
+     field "Change-Id:" in the commit message, as required by Gerrit.
+     We will look into a better solution:
 @code
 wget https://review.openocd.org/tools/hooks/commit-msg
 mv commit-msg .git/hooks
@@ -246,6 +248,12 @@ doc: fix typos
 @code
 git pull --rebase origin master
 @endcode
+
+-# When you create a new version of an old patch, check that the new patch
+   keeps the same 'Change-Id:' field of the old patch.
+   This allows the Gerrit server to recognize the patch as a new version of
+   the older one and keeps track of the history and the review process.
+
 -# Send the patches to the Gerrit server for review:
 @code
 git push review

-----------------------------------------------------------------------

Summary of changes:
 HACKING | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
Main OpenOCD repository