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

Re: git rebase fail with CRLF conversion

From
Yann Droneaud <ydroneaud@opteya.com>
Date
Jun 21, 2013, 14:29 UTC
Message-ID
<05ece7ca52df8ac8cd082cab4926487a@meuh.org>
In-Reply-To
<fb20a7d711fdd218f58f1f2090b1c515@meuh.org>
Le 21.06.2013 15:41, Yann Droneaud a écrit :
Show 6 quoted lines
>
> In thoses two latter cases, running "git add" does not fail with a
> fatal error: it does nothing.
> I need to run "touch test" to make "git add" fail with error "fatal:
> CRLF would be replaced by LF in test.
>

While searching on the Internet, I've found other people complaining of a similar error

http://stackoverflow.com/questions/5074136/git-rebase-fails-your-local-changes-to-the-following-files-would-be-overwritte

The workaround, "git config --global core.trustctime false", might suggest there's a race somewhere while rebasing.

BTW, I forgot to describe my environnment:
- GNU/Linux
- Fedora 18 x86_64
- git version 1.8.1.4
- git version 1.8.3.1.448.gfb7dfaa
>
> I believe "git rebase" should not fail here, but more, it must not
> fail in a different fashion randomly.
>
Regards.
-- 
Yann Droneaud
OPTEYA
Previous: Yann Droneaud
Message 5 of 5 in “git rebase fail with CRLF conversion”
  1. Yann DroneaudJun 21, 2013
  2. Yann DroneaudJun 21, 2013
  3. t0020-crlf: test rebase with text conversion and safecrlfYann Droneaud, Jun 21, 2013
  4. Yann DroneaudJun 21, 2013
  5. Yann DroneaudJun 21, 2013

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.