Am 05.06.2017 um 16:14 schrieb Arun Isaac: > > Thanks! LGTM. Only one problem: crawl-upgrade-saves.patch seems to have > trailing whitespace, and git is complaining about that. Use `git diff > --check' on your commit to see what I mean. Could you fix this and send > a new patch? > > gnu/packages/patches/crawl-upgrade-saves.patch:17: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:32: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:40: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:55: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:63: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:68: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:75: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:81: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:84: trailing whitespace. > ++ > gnu/packages/patches/crawl-upgrade-saves.patch:92: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:100: trailing whitespace. > + > gnu/packages/patches/crawl-upgrade-saves.patch:111: trailing whitespace. > ++ > gnu/packages/patches/crawl-upgrade-saves.patch:115: trailing whitespace. > + > I ran git diff --check HEAD~ on my branch and saw the same warnings. I don't know much about diff and patch, though. What is the correct diff command to generate a patch? I used `diff -crB database.cc database2.cc > crawl-upgrade-saves.patch` and then edited the header myself. Searching for 'diff ' or 'patch' on https://www.gnu.org/software/guix/manual/guix.html doesn't bring up anything related. I did some comparison with other files in ./gnu/packages/patches/ and it seems like `diff -u` generates the format that most files in there have. But it still leaves one trailing whitespace in empty lines. Other .patch files have those too. I attached the commit with the .patch file generated in the diff -u format instead of diff -c.