How do I apply .patch file from git.

jwnasambu · July 20, 2020, 8:07am

Hello friends, Am working on TRUNK-4231 and I wish to add a small patch to gets things to compile and fix weird test errors. This is the patch TRUNK-4231.patch.txt (4.3 KB). I have tried to use this on my current branch by running git apply TRUNK-4231.patch.txt . but instead I get this output

error: can't open patch 'TRUNK-4231.patch.txt': No such file or directory

Kindly help me on how to fix this patch. Thanks in advance.

gcliff · July 20, 2020, 8:29am

@jwnasambu try git apply < patchname.patch

jwnasambu · July 20, 2020, 8:33am

Thanks for the response Its what I have been using as reflected here

 git apply TRUNK-4231.patch.txt       
error: can't open patch 'TRUNK-4231.patch.txt': No such file or directory

gcliff · July 20, 2020, 8:39am

try to remove n run without the .txt extension

jwnasambu · July 20, 2020, 8:42am

Without a .txt extension, I get this output.

git apply TRUNK-4231.patch    
error: can't open patch 'TRUNK-4231.patch': No such file or directory

jwnasambu · July 20, 2020, 9:03am

@cliff I have sorted the first part by:

Placing the patch file to the module folder ie. C:\Users\JULIE\OpenMRS-Tickets\openmrs-core
Then I made sure I am at the same module directory ie. C:\Users\JULIE\OpenMRS-Tickets\openmrs-core
I used git init command to start git on that repository
After runing command git apply -v TRUNK-4231.patch.txt which I placed to the module folder ie. C:\Users\JULIE\OpenMRS-Tickets\openmrs-core I got this output https://pastebin.com/GS5Efpuk which I sorted out by running
git apply --reject --whitespace=fix TRUNK-4231.patch.txt Though still getting errors but I believe its to do with my unit test. Thanks a bunch.