{"thread":{"id":"35773","subject":"git pull does no longer work due to a Cr-Lf issue","startedAt":"2014-01-31T15:01:38Z","lastAt":"2014-01-31T15:01:38Z","messageCount":1,"participants":["Toralf Förster"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"233975","messageId":"52EBBAD2.3020501@gmx.de","threadId":"35773","inReplyTo":null,"subject":"git pull does no longer work due to a Cr-Lf issue","fromName":"Toralf Förster","fromEmail":"toralf.foerster-mmb7mzphnfy@public.gmane.org","sentAt":"2014-01-31T15:01:38Z","receivedAt":"2014-01-31T15:01:38Z","isPatch":false,"sender":{"key":"toralf.foerster-mmb7mzphnfy@public.gmane.org","avatar":null},"body":"-----BEGIN PGP SIGNED MESSAGE-----\nHash: SHA256\n\nIck,\n\ntoday I run again into a problem with the git tree of the BOINC project:\nhttp://boinc.berkeley.edu/git/boinc-v2.git\n\nA git pull won't work any longer due to:\n\n$ git pull\nUpdating 089459d..01f0ead\nerror: Your local changes to the following files would be overwritten\nby merge:\n        lib/boinc_win.h\nPlease, commit your changes or stash them before you can merge.\nAborting\n\n\nA \"git diff\" gave :\n\n\ndiff --git a/lib/boinc_win.h b/lib/boinc_win.h\nindex 0676372..4c62ed5 100644\n- --- a/lib/boinc_win.h\n+++ b/lib/boinc_win.h\n@@ -137,7 +137,7 @@ typedef size_t socklen_t;\n #include <stdint.h>\n #include <imagehlp.h>\n #else\n- -#include <security.h>\n+#include <security.h>\n #include <dbghelp.h>\n #endif\n #include <tlhelp32.h>\n\n\nwhich pointed me to a ^M in line 137 of that file. I removed that ^M,\nbut a pull still wonät work. Then I removed the file and checked it\nout again - no chance, git pull always fails with the same massage.\nFinally I tried :\n\n\n$ git stash\nwarning: CRLF will be replaced by LF in lib/boinc_win.h.\nThe file will have its original line endings in your working directory.\nwarning: CRLF will be replaced by LF in lib/boinc_win.h.\nThe file will have its original line endings in your working directory.\nSaved working directory and index state WIP on master: 089459d locale:\nUpdate compiled localization files\nHEAD is now at 089459d locale: Update compiled localization files\n\n\nbut again I run into :\n\n\n$ git pull\nUpdating 089459d..01f0ead\nerror: Your local changes to the following files would be overwritten\nby merge:\n        lib/boinc_win.h\nPlease, commit your changes or stash them before you can merge.\nAborting\n\n\n\n/me wonders how to solve this w/o cloning the complete repo again.\n\n- -- \nMfG/Sincerely\nToralf Förster\npgp finger print:1A37 6F99 4A9D 026F 13E2 4DCF C4EA CDDE 0076 E94E\n-----BEGIN PGP SIGNATURE-----\nVersion: GnuPG v2.0.22 (GNU/Linux)\nComment: Using GnuPG with Thunderbird - http://www.enigmail.net/\n\niF4EAREIAAYFAlLrutIACgkQxOrN3gB26U5ZHwD/eGEr4hR+F5TVP7m0/JO6Km+j\nVN6ak30WMPK8Fe9pWHYBAIWD4EDIspHUkNfq76Vakc6uNaLVne8MFiikniH7WjhL\n=xwGS\n-----END PGP SIGNATURE-----\n_______________________________________________\nboinc_dev mailing list\nboinc_dev@ssl.berkeley.edu\nhttp://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev\nTo unsubscribe, visit the above URL and\n(near bottom of page) enter your email address."}]}