[git-users] Re: git format-patch does not apply
On Jan 22, 12:23 am, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: I think the details must be in what was inside these commits. Would be interesting if you can share a repository where you can recreate this. I was not able to reproduce this problem on a new repository. Finally, I solved it with the help of git diff and patch, which worked just fine. Once I push the changes to a public repository I will send you the address along with the patch if you are interested. The problem can easily be recreated by resetting to a certain commit and by applying the patch. I have already made sure that the problem can still be reproduced on a trash branch. So long, Johannes -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git format-patch does not apply
On Jan 21, 1:12 am, Thomas Ferris Nicolaisen tfn...@gmail.com wrote: I can't recreate the problem. If I do some local commits with lots of whitespaces in them, it works fine. I will try to find a simple way to reproduce the actual problem asap. If I do format-patch with --ignore-space-change, I am able to trigger a similar error like the one you got. First I thought I needed to play around with these parameters, as the errors seemed to be related to white spaces, but as I saw it work on another project, I guess that it was unnecessary. Also, I had a similar problem when applying the patch on the test project at first (I don't know why), but running git am --abort solved it. Normally dealing with whitespaces isn't a problem in my experience.. Could it be that you have some kind of funky configuration messing it up? Please do git config -l inside the repo and paste the output back here. user.name=Johannes Müller user.email=dn...@gmx.de color.ui=auto color.branch.current=yellow reverse color.branch.local=yellow color.branch.remote=green color.diff.meta=yellow bold color.diff.frag=magenta bold color.diff.old=red bold color.diff.new=green bold color.status.added=yellow color.status.changed=green color.status.untracked=cyan core.repositoryformatversion=0 core.filemode=true core.bare=false core.logallrefupdates=true remote.origin.fetch=+refs/heads/*:refs/remotes/origin/* remote.origin.url=/home/joe/CloudFusion branch.master.remote=origin branch.master.merge=refs/heads/master I actually copied the submodule without the superproject to another location, then created the patch from the copy. Afterwards I replaced the submodule in the superproject with a version prior to the changes introduced by the patch. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git format-patch does not apply
I don't see anything in your config that could be messing up the patching. I think the details must be in what was inside these commits. Would be interesting if you can share a repository where you can recreate this. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/kHY3vWk5km8J. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
[git-users] Re: git format-patch does not apply
I can't recreate the problem. If I do some local commits with lots of whitespaces in them, it works fine. If I do format-patch with --ignore-space-change, I am able to trigger a similar error like the one you got. Normally dealing with whitespaces isn't a problem in my experience.. Could it be that you have some kind of funky configuration messing it up? Please do git config -l inside the repo and paste the output back here. -- You received this message because you are subscribed to the Google Groups Git for human beings group. To view this discussion on the web visit https://groups.google.com/d/msg/git-users/-/6-4-51wLQjgJ. To post to this group, send email to git-users@googlegroups.com. To unsubscribe from this group, send email to git-users+unsubscr...@googlegroups.com. For more options, visit this group at http://groups.google.com/group/git-users?hl=en.
