New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Applying patch does not work for big commit. #5
Comments
Hmmm, interesting. I presume you can not share your actual code to reproduce the issue? Let's see whether it does what we would expect it to do:
shows your original commit which violates the uncrustify rules and
shows the patched changes to make it comply with the rules.
Please let me know where it seems to break and we can have a closer look. |
Ah, and could you let us know which OS you are using and which versions of git and uncrustify you are running? Basically what |
David, Thank you so much for prompt response and writing detailed instructions. I have following setup Parsing: Project/Application/App Delegate/AppDelegate.h as language OC The following differences were found between the code to commit and the uncrustify rules: --- "a/Vente/Common/ASValueTrackingSlider/ASValuePopUpView.m" 2015-01-05 19:57:07.000000000 +0500 Then at the end You can apply these changes with: I ran git apply /tmp/pre-commit-uncrustify-1420470077.patch on my machine and it changed some files Thanks in Advance. |
You are most welcome, Asif. At this point I'm just guessing though as I have no idea yet what the problem is. Maybe you are hitting some corner case that no one else had yet. Some things coming to my mind:
|
David, I think you are right about big patch and impressed with your finding because I have too many files around 60 that I wanted to commit. Some of my own code and some of the third party libraries files, that is why patch became so big. Thanks, |
David, I tried with fewer files and it worked. You were right about big patch. Thanks man. |
Hi Asif, Would you be able to tell me how big the patch file was that failed? As in how many lines did it have? I may try and reproduce the issue locally and see what we can do about it. Because it would be good if the scripts just worked regardless or at least exited gracefully with a helpful error message. Some general comments:
Thanks for your feedback! |
David , Following are the stats in that commit 140 files changed, 3409 insertions(+), 11040 deletions(-) Thanks, |
I will see when I get some time to have a look into it. If I need any more details I will be in touch. Thanks very much for the help so far, Asif! |
You are most welcome. I am thankful to you for your prompt responses and On Wednesday, January 14, 2015, David Martin notifications@github.com
Sent from iPhone. Please excuse any typos |
I tried to commit my code locally and it detected violations in different files. It suggested me to run git apply /tmp/pre-commit-uncrustify-1420355533.patch this command to apply patch. this command works fine and few of files are changed but when I try to commit again it gives me same violations which I observed on first run.
Please suggest.
The text was updated successfully, but these errors were encountered: