git/list[1] front-page[2] threads[3] people[4] search[5] about
 

(local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream

From
TFToralf Förster <toralf.foerster-mmb7mzphnfy@public.gmane.org>
Date
Sep 12, 2014, 18:09 UTC
Message-ID
<541336D6.3050803@gmx.de>
Today I run again into the CR/LF pain when I pulled from BOINC upstream and me wonders how I can "repair" the repository using git-2.1.0 at a 32bit Linux without cloning the full repository again (as I did it in the past). FWIW I did not changed anything locally, I just do pull regularly from upstreem to create a tar-ball of the current version for my own purpose:
tfoerste@n22 ~/devel/trinity $ cd ~/devel/boinc-v2; git pull
remote: Counting objects: 104, done.
remote: Compressing objects: 100% (52/52), done.
remote: Total 52 (delta 42), reused 0 (delta 0)
Unpacking objects: 100% (52/52), done.
From git://boinc.berkeley.edu/boinc-v2
   ce97e85..d2e5582  master     -> origin/master
   194f1dc..4a696b4  client_release/7/7.4 -> origin/client_release/7/7.4
Updating ce97e85..d2e5582
error: Your local changes to the following files would be overwritten by merge:
        html/languages/translations/hu.po
        html/languages/translations/nl.po
        locale/bg/BOINC-Web.po
        locale/da/BOINC-Web.po
        locale/el/BOINC-Web.po
        locale/fr/BOINC-Web.po
        locale/hr/BOINC-Web.po
        locale/hu/BOINC-Project-Generic.po
        locale/hu/BOINC-Web.po
        locale/it_IT/BOINC-Project-Generic.po
        locale/lv/BOINC-Web.po
        locale/nl/BOINC-Project-Generic.po
        locale/nl/BOINC-Web.po
        locale/pl/BOINC-Web.po
        locale/pt_BR/BOINC-Web.po
        locale/ro/BOINC-Web.po
        locale/sk/BOINC-Web.po
        locale/zh_TW/BOINC-Web.po
Please, commit your changes or stash them before you can merge.
Aborting
tfoerste@n22 ~/devel/boinc-v2 $ git diff
tfoerste@n22 ~/devel/boinc-v2 $ git status
On branch master
Your branch is behind 'origin/master' by 7 commits, and can be fast-forwarded.
  (use "git pull" to update your local branch)
Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git checkout -- <file>..." to discard changes in working directory)
        modified:   html/languages/translations/hu.po
        modified:   html/languages/translations/nl.po
        modified:   locale/bg/BOINC-Web.po
        modified:   locale/da/BOINC-Web.po
        modified:   locale/el/BOINC-Web.po
        modified:   locale/fr/BOINC-Web.po
        modified:   locale/hr/BOINC-Web.po
        modified:   locale/hu/BOINC-Project-Generic.po
        modified:   locale/hu/BOINC-Web.po
        modified:   locale/it_IT/BOINC-Project-Generic.po
        modified:   locale/lv/BOINC-Web.po
        modified:   locale/nl/BOINC-Project-Generic.po
        modified:   locale/nl/BOINC-Web.po
        modified:   locale/pl/BOINC-Web.po
        modified:   locale/pt_BR/BOINC-Web.po
        modified:   locale/ro/BOINC-Web.po
        modified:   locale/sk/BOINC-Web.po
        modified:   locale/zh_TW/BOINC-Web.po
no changes added to commit (use "git add" and/or "git commit -a")
tfoerste@n22 ~/devel/boinc-v2 $ git branch 
* master

tfoerste@n22 ~/devel/boinc-v2 $ git stash warning: CRLF will be replaced by LF in html/languages/translations/hu.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in html/languages/translations/nl.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/da/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/el/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/nl/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/nl/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/pl/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/pt_BR/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in html/languages/translations/hu.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in html/languages/translations/nl.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/bg/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/da/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/el/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/fr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hr/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/hu/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/it_IT/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/lv/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/nl/BOINC-Project-Generic.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/nl/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/pl/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/pt_BR/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/ro/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/sk/BOINC-Web.po. The file will have its original line endings in your working directory. warning: CRLF will be replaced by LF in locale/zh_TW/BOINC-Web.po. The file will have its original line endings in your working directory. Saved working directory and index state WIP on master: ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings. HEAD is now at ce97e85 MGR: On MS Windows, scale Attach Wizard progress indicators according to user's DPI settings.

tfoerste@n22 ~/devel/boinc-v2 $ git pull
Updating ce97e85..d2e5582
error: Your local changes to the following files would be overwritten by merge:
        html/languages/translations/hu.po
        html/languages/translations/nl.po
        locale/bg/BOINC-Web.po
        locale/da/BOINC-Web.po
        locale/el/BOINC-Web.po
        locale/fr/BOINC-Web.po
        locale/hr/BOINC-Web.po
        locale/hu/BOINC-Project-Generic.po
        locale/hu/BOINC-Web.po
        locale/it_IT/BOINC-Project-Generic.po
        locale/lv/BOINC-Web.po
        locale/nl/BOINC-Project-Generic.po
        locale/nl/BOINC-Web.po
        locale/pl/BOINC-Web.po
        locale/pt_BR/BOINC-Web.po
        locale/ro/BOINC-Web.po
        locale/sk/BOINC-Web.po
        locale/zh_TW/BOINC-Web.po
Please, commit your changes or stash them before you can merge.
Aborting
Attached are my ~/.gitconfig and ~/devel/boinc-v2/.git/config
-- 
Toralf
pgp key: 0076 E94E



[user]
	email = toralf.foerster@gmx.de
	name = Toralf Förster
	signingkey = 0076e94e
[core]
	pager = less
[gui]
	fontui = -family arial -size 12 -weight bold -slant roman -underline 0 -overstrike 0
	fontdiff = -family Courier -size 12 -weight normal -slant roman -underline 0 -overstrike 0
[color]
	diff = auto
	status = auto
	branch = auto
	ui = auto
[sendemail]
	smtpserver = mail.gmx.net
	smtpencryption = tls
	smtpuser = toralf.foerster@gmx.de
	from = Toralf Förster <toralf.foerster@gmx.de>
	assume8bitEncoding = UTF-8
	confirm = never
	chainreplyto = true
[diff]
	#external = /home/tfoerste/workspace/bin/diffwrap.sh
[push]
	default = simple
[credential]
	helper = cache --timeout=1800


[core]
	repositoryformatversion = 0
	filemode = true
	bare = false
	logallrefupdates = true
[remote "origin"]
	url = git://boinc.berkeley.edu/boinc-v2.git
	fetch = +refs/heads/*:refs/remotes/origin/*
[branch "master"]
	remote = origin
	merge = refs/heads/master
Next: Rom Walton
Message 1 of 11 in “(local ?) BOINC repo broken again -or- how to act on the CR/LF changes made upstream”
  1. Toralf FörsterSep 12, 2014
  2. Rom WaltonSep 12, 2014
  3. Toralf FörsterSep 12, 2014
  4. Rom WaltonSep 12, 2014
  5. Toralf FörsterSep 12, 2014
  6. Rom WaltonSep 12, 2014
  7. Torsten BögershausenSep 14, 2014
  8. Toralf FörsterSep 13, 2014
  9. Toralf FörsterSep 14, 2014
  10. Torsten BögershausenSep 14, 2014
  11. Rom WaltonSep 15, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.