======== git patch
A- Create new branch fix the changes After fix add & commit now create the patch with in the patch directory
Now i am at patch branch & compare the changes to master branch
command : git format-patch master -o patches
patches/ : in this folder create the patch files
Lets suppose we are in patch branch and i do 5 commits to this branch, now to create the patch we will match the code to the traget branch like master in our case, so all the codes which is present in patch branch & not availbale in master branch would be create as patch files, 1 commit for 1 patch. i.e we do 5 commits so 5 commit files will be generated,
Here: -o reprents to store the patch as a directory and specify the director name
Let's suppose I want to patch only specific commit id and store it on patches folder by as below,
git format-patch dev -1 ca75710c8695ed939be29f6ebba9f1f30fe16125 -o patches
To apply patches goto the branch where you are working ,
ref: https://www.youtube.com/watch?v=QtXj9tt-RUE
2 - now check the patches is correct or not before apply
command : git apply --check patches/001--issue1.patch
if there is no error Apply the patch by
3 - Apply Patch
command : git apply patches/001--issue1.patch
------------ Implement external patch to drupal -------------
first dowbload the patch file
1 - wget https://www.drupal.org/files/issues/2019-03-13/3039408-83_0.patch
2 - now Above step 2 and 3.....
A- Create new branch fix the changes After fix add & commit now create the patch with in the patch directory
Now i am at patch branch & compare the changes to master branch
command : git format-patch master -o patches
patches/ : in this folder create the patch files
Examples1 : git format-patch TARGET_BRANCH -o PATCH_FOLDER/
Lets suppose we are in patch branch and i do 5 commits to this branch, now to create the patch we will match the code to the traget branch like master in our case, so all the codes which is present in patch branch & not availbale in master branch would be create as patch files, 1 commit for 1 patch. i.e we do 5 commits so 5 commit files will be generated,
Here: -o reprents to store the patch as a directory and specify the director name
Example 2 : Single patch file based on commit id
Lets consider the above example, but now i need only one commit changes instead of all,
so first check the changes by
git log
git log --author=Dharmend
Let's suppose I want to patch only specific commit id and store it on patches folder by as below,
git format-patch dev -1 ca75710c8695ed939be29f6ebba9f1f30fe16125 -o patches
where : ca75710c8695ed939be29f6ebba9f1f30fe16125 is the commit id which i want to make patch
dev is branch where we compare the code
To apply patches goto the branch where you are working ,
ref: https://www.youtube.com/watch?v=QtXj9tt-RUE
2 - now check the patches is correct or not before apply
command : git apply --check patches/001--issue1.patch
if there is no error Apply the patch by
3 - Apply Patch
command : git apply patches/001--issue1.patch
------------ Implement external patch to drupal -------------
first dowbload the patch file
1 - wget https://www.drupal.org/files/issues/2019-03-13/3039408-83_0.patch
2 - now Above step 2 and 3.....
Creating the GIT Patch
We will use the git diff command to create the diff output, then redirect it into a file. The form of the diff command we will use is as follows:
git diff from-commit to-commit > output-file
where:
- from-commit – the point at which we want the patch to start. (In our case, the point at which experimental diverges from master)
- to-commit – the patch will span the changes up to and including this point. (In our case, the most recent commit of experimental)
- output-file – the patch will be written here
Comments
Post a Comment