git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Marius Storm-Olsen <marius@trolltech.com>
To: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Junio C Hamano <junkio@cox.net>, Git Mailing List <git@vger.kernel.org>
Subject: Re: [TESTCASE] Failing 'git am' when core.autocrlf=true
Date: Thu, 23 Aug 2007 19:45:21 +0200	[thread overview]
Message-ID: <46CDC7B1.7070908@trolltech.com> (raw)
In-Reply-To: <alpine.LFD.0.999.0708230956190.30176@woody.linux-foundation.org>

[-- Attachment #1: Type: text/plain, Size: 582 bytes --]

Linus Torvalds said the following on 23.08.2007 19:18:
> On Thu, 23 Aug 2007, Marius Storm-Olsen wrote:
>> I have an issue with git-rebase failing on a repository using
>>     core.autocrlf=true
> 
> Very interesting.
> 
> Adding some instrumentation to "git-am.sh" (namely a lot of
> 
> 	git diff --quiet || exit

Aah! Very neat way to narrow it down. I'll keep that in mind for later 
debugging. Thanks!


> This patch should fix it. 

Yep, it did. I just rebased 80 commits with core.autocrlf=true. Thanks 
again, Linus, for the quick reply!

-- 
.marius


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 187 bytes --]

  reply	other threads:[~2007-08-23 17:44 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2007-08-23 14:07 [TESTCASE] Failing 'git am' when core.autocrlf=true Marius Storm-Olsen
2007-08-23 17:18 ` Linus Torvalds
2007-08-23 17:45   ` Marius Storm-Olsen [this message]
2007-08-23 18:41   ` Junio C Hamano
2007-08-23 19:25     ` Linus Torvalds
2007-08-23 19:23   ` Linus Torvalds
2007-08-23 19:44     ` Junio C Hamano
2007-08-23 20:11     ` Marius Storm-Olsen

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=46CDC7B1.7070908@trolltech.com \
    --to=marius@trolltech.com \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    --cc=torvalds@linux-foundation.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).