Differences

This shows you the differences between two versions of the page.

--- newdevs:git:signoff [2019/06/28 17:09] – created tmccanna
+++ newdevs:git:signoff [2024/07/29 09:38] (current) – Remove Step 5 - commit your signoff dyrcona
@@ Line 1: / Line 1: @@
+**New Developers Working Group**
 ====== Git for Windows ======
 ===== How to Sign Off on a Branch =====
+//These instructions are the same regardless of whether you have tested this on your own test server or on a remote test server that has been set up for bug squashing.//
-//** NEED BETTER INSTRUCTIONS HERE - I still don't quite understand how to create a branch that only contains a sign-off - does it contain all the changed files AND the sign-off? Or just the sign-off? **//
+After you have successfully tested a branch that someone else has created and see that it is working well, you will create a sign-off branch to acknowledge that you have tested it.
-<code bash>
+  - Find the hash (unique ID) of the commit that you wish to sign off on.
-git push working lp12345:user/my-user-name/lp12345-signoff
+    - Go to: [[https://bugs.launchpad.net/evergreen]]
-</code>
+    - Find the bug related to the patch you tested.
+    - Follow the link to where the patch resides on the Git server.
+    - When you are looking at the details of the commit, copy the first 7+ characters from the commit code.
+  - In Git Bash, navigate to the Evergreen directory.
+  - Make sure that your local repository is up to date:
+    - git checkout main
+    - git fetch --all
+    - git pull
+  - Create and check out a new sign-off branch with the current branch name and append 'signoff':
+    - git checkout -b lp123456_branch_name_signoff (will default to base branch off main)
+    - git checkout -b lp123456_branch_name_signoff origin/version (ex: origin/rel_3_11) to base the branch on a specific version
+  - Pull in the branch that you wish to sign off on using the commit code you found above.
+    - git cherry-pick -s ea75f30d33
+  - Push (upload) your new sign-off branch to your working directory:
+    - git push working lp123456_branch_name_signoff:user/jdoe/lp123456_branch_name_signoff
+  - Find the URL for your newly uploaded branch:
+    - Go to: [[https://git.evergreen-ils.org]]
+    - Click on working/Evergreen.git
+    - Scroll down to the Heads section.
+    - Click on the link to your sign-off branch.
+    - Copy the URL
+  - Update the launchpad bug:
+    - Go to: [[https://bugs.launchpad.net/evergreen]]
+    - Find the bug related to the patch you tested.
+    - Add a comment that you've tested the bug and the URL of your sign-off commit.
+    - Add a 'signedoff' tag.
-==== 5. Update Launchpad ====
-  - In the relevant launchpad but, add the "signedoff" tag.
-  - Also, add a link in the comments to your sign-off branch.