From: "Toralf Förster" <toralf.foerster-Mmb7MZpHnFY@public.gmane.org>
To: "boinc_dev-C9EgComYM8RUAgJt6FLh2g@public.gmane.org"
<boinc_dev-C9EgComYM8RUAgJt6FLh2g@public.gmane.org>,
"git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org"
<git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>
Subject: git pull does no longer work due to a Cr-Lf issue
Date: Fri, 31 Jan 2014 16:01:38 +0100 [thread overview]
Message-ID: <52EBBAD2.3020501@gmx.de> (raw)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Ick,
today I run again into a problem with the git tree of the BOINC project:
http://boinc.berkeley.edu/git/boinc-v2.git
A git pull won't work any longer due to:
$ git pull
Updating 089459d..01f0ead
error: Your local changes to the following files would be overwritten
by merge:
lib/boinc_win.h
Please, commit your changes or stash them before you can merge.
Aborting
A "git diff" gave :
diff --git a/lib/boinc_win.h b/lib/boinc_win.h
index 0676372..4c62ed5 100644
- --- a/lib/boinc_win.h
+++ b/lib/boinc_win.h
@@ -137,7 +137,7 @@ typedef size_t socklen_t;
#include <stdint.h>
#include <imagehlp.h>
#else
- -#include <security.h>
+#include <security.h>
#include <dbghelp.h>
#endif
#include <tlhelp32.h>
which pointed me to a ^M in line 137 of that file. I removed that ^M,
but a pull still wonät work. Then I removed the file and checked it
out again - no chance, git pull always fails with the same massage.
Finally I tried :
$ git stash
warning: CRLF will be replaced by LF in lib/boinc_win.h.
The file will have its original line endings in your working directory.
warning: CRLF will be replaced by LF in lib/boinc_win.h.
The file will have its original line endings in your working directory.
Saved working directory and index state WIP on master: 089459d locale:
Update compiled localization files
HEAD is now at 089459d locale: Update compiled localization files
but again I run into :
$ git pull
Updating 089459d..01f0ead
error: Your local changes to the following files would be overwritten
by merge:
lib/boinc_win.h
Please, commit your changes or stash them before you can merge.
Aborting
/me wonders how to solve this w/o cloning the complete repo again.
- --
MfG/Sincerely
Toralf Förster
pgp finger print:1A37 6F99 4A9D 026F 13E2 4DCF C4EA CDDE 0076 E94E
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.22 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iF4EAREIAAYFAlLrutIACgkQxOrN3gB26U5ZHwD/eGEr4hR+F5TVP7m0/JO6Km+j
VN6ak30WMPK8Fe9pWHYBAIWD4EDIspHUkNfq76Vakc6uNaLVne8MFiikniH7WjhL
=xwGS
-----END PGP SIGNATURE-----
_______________________________________________
boinc_dev mailing list
boinc_dev@ssl.berkeley.edu
http://lists.ssl.berkeley.edu/mailman/listinfo/boinc_dev
To unsubscribe, visit the above URL and
(near bottom of page) enter your email address.
reply other threads:[~2014-01-31 15:01 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=52EBBAD2.3020501@gmx.de \
--to=toralf.foerster-mmb7mzphnfy@public.gmane.org \
--cc=boinc_dev-C9EgComYM8RUAgJt6FLh2g@public.gmane.org \
--cc=git-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).