From: Finn Arne Gangstad <finnag@pvv.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org, msysgit@googlegroups.com,
Eyvind Bernhardsen <eyvind.bernhardsen@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Dmitry Potapov <dpotapov@gmail.com>
Subject: Re: [msysGit] [PATCH/RFC] autocrlf: Make it work also for un-normalized repositories
Date: Wed, 12 May 2010 00:28:02 +0200 [thread overview]
Message-ID: <20100511222802.GA16974@pvv.org> (raw)
In-Reply-To: <alpine.DEB.1.00.1005101921460.7651@pacific.mpi-cbg.de>
On Mon, May 10, 2010 at 07:29:34PM +0200, Johannes Schindelin wrote:
> > + if (ce_stage(istate->cache[i]) == 2)
> > + pos = i;
> > + }
>
> I think it makes sense to assume that "ours" determines whether we should
> assume that the index has a wrong format. But if there is also a "base"
> that disagrees on CR-ness with "ours", should we not try to pick "ours"?
Did you make a typo there, or did I misunderstand something? As far as
I can tell we do pick "ours" in this case, and I think that may be the
best choice overall (it is easiest for you to fix "ours" if the
result is wrong).
- Finn Arne
next prev parent reply other threads:[~2010-05-11 22:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-10 17:11 [PATCH/RFC] autocrlf: Make it work also for un-normalized repositories Finn Arne Gangstad
2010-05-10 17:29 ` [msysGit] " Johannes Schindelin
2010-05-10 18:48 ` Junio C Hamano
2010-05-11 22:28 ` Finn Arne Gangstad [this message]
2010-05-10 19:09 ` Eyvind Bernhardsen
2010-05-10 19:43 ` Dmitry Potapov
2010-05-11 16:31 ` Eyvind Bernhardsen
2010-05-10 20:30 ` Jakub Narebski
2010-05-10 21:17 ` Dmitry Potapov
2010-05-11 22:52 ` Finn Arne Gangstad
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=20100511222802.GA16974@pvv.org \
--to=finnag@pvv.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=dpotapov@gmail.com \
--cc=eyvind.bernhardsen@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=msysgit@googlegroups.com \
/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.