From: Yann Droneaud <ydroneaud@opteya.com>
To: <git@vger.kernel.org>
Subject: Re: git rebase fail with CRLF conversion
Date: Fri, 21 Jun 2013 16:29:54 +0200 [thread overview]
Message-ID: <05ece7ca52df8ac8cd082cab4926487a@meuh.org> (raw)
In-Reply-To: <fb20a7d711fdd218f58f1f2090b1c515@meuh.org>
Le 21.06.2013 15:41, Yann Droneaud a écrit :
>
> 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
prev parent reply other threads:[~2013-06-21 14:30 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-21 13:41 git rebase fail with CRLF conversion Yann Droneaud
2013-06-21 13:51 ` Yann Droneaud
2013-06-21 14:15 ` [PATCH] t0020-crlf: test rebase with text conversion and safecrlf Yann Droneaud
2013-06-21 14:24 ` Yann Droneaud
2013-06-21 14:29 ` Yann Droneaud [this message]
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=05ece7ca52df8ac8cd082cab4926487a@meuh.org \
--to=ydroneaud@opteya.com \
--cc=git@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.