Skip to main content

How to generate git diff patch?

To understand the process involved in it, we need to first understand the terminologies that is being used in the git.
Suppose you have committed your code in Git repository. Now when you select the particular commit, then you will see something like this
TK-34164 e2e test cases added
Commit: 96f17e85e5b76cff8a6a0332c4f22d10aca3aec6 [96f17e8]
Parents: 56a575c5b8
Author: Abhishek Kumar 
Date: 3 January 2017 at 18:52:06 IST
Labels: HEAD -> feature/TK-34164-configure-robot-framework-into
Here at line #1 is custom message for the commit, after that at line #2 you see a commit-id which is 40 characters long hexadecimal string (SHA-1) and it's short version in square bracket which is 7 characters long. 
SHA-1 (Secure Hash Algorithm 1) produces a 160-bit (20-byte) hash value known as a message digest. A SHA-1 hash value is typically rendered as a hexadecimal number, 40 digits long.
This commit-id is 160-bit SHA-1 hash, uniquely represents the new, post-commit state of the repository. 
Now we need to get the changes of our code, that is known as diff. We can get the diff by using this command.
For single commit
git diff-tree -p {commit} > {filename}
Here, {commit} is a single short commit-id and {filename} is a patch file that could be like patch.diff
For multiple commit
git diff-tree -p {from-commit}..{to-commit} > {filename}
Here, {from-commit}..{to-commit} is a range of short commit-id and {filename} is a patch file that could be like patch.diff
So you need to just replace the portion of string with curly bracket with your specific content.
This way you can generate a patch.diff via git program.
In case you want to merge this patch.diff into the repository, then use the following command
git apply patch.diff
That's it!
Labels:

Comments

Post a Comment

Popular posts from this blog

Unlock protected blocks in Siemens SIMATIC Step 7

Recently I'd been called by Hindalco's Fabrication Plant division to unlock the protected blocks in Siemens SIMATIC Step 7. They were in need to unlock those blocks since an year because of 1 million Rupees of loss per month. They want to re-program those blocks but it was locked by the man who'd done the setup. From the people working in that department, I came to know that they were trying to call that man (someone from Italy) right here but he's not coming. Actually, what he'd done was that he'd locked some of the blocks and deleted the source file. And Siemens didn't provide any feature to unlock. Department people also told me that even the people working in Siemens don't know how to do it. Being a software engineer I know that any thing can be reverse engineered. So I took up the challenge. How did I unlocked the blocks? The first thing I'd done was searched about this software at Google and read about what is this software all about. Aft
49 comments
Read more

App: Calculate your job experience or age in years

Usually, all of those who works have to put years of experience on their resume or curriculum vitae. But 90% people put it wrong when they convert their experience in years only. Although they know the exact number of months and years but the conversion, they do is wrong. This happens because there are 12 months while the digit after decimal would be 0-9, i.e., 10 digits. Which means that we have to represent the number of months in terms of year. So here I have provided a small gadget to calculate it. Just put the date when you had started working in the From Date field and put current date in the To Date field. You can also calculate your age as well with this tool by putting your date of birth in the From Date field and put current date in the To Date field. As an alternative, you can use the hassle-free and simple to use  Date Differentiator  micro webapp. Bookmark it so you may easily access it later.
Post a Comment
Read more

How to convert JIRA story into sub-task or defect?

Many times we entangled in the situation where we have made a  story  in JIRA but later on realised that it should have to be  defect  or in other case,  sub-task  of another  story . Story → Sub-task So the workaround for converting the story into defect is given below: Open your  story Click on  more  option Click on the  Convert to sub-task  option in the dropdown You would be asked to choose  Parent  story, so chose relevant story After submit, your  story  gets converted into  sub-task Story → Defect Now if you want the story to be converted into defect, then you should first convert it into sub-task. Thereafter, you can convert that sub-task into defect as given below: Open the  sub-task Click on  more  option Click on the  Convert to issue  option in the dropdown You would be asked to fill up relevant fields required for raising a  defect , fill them up as required After submit, your  sub-task  gets converted into  defect .
Post a Comment
Read more