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

Re: [msysGit] [PATCH/RFC] autocrlf: Make it work also for un-normalized repositories

From
Finn Arne Gangstad <finnag@pvv.org>
Date
May 11, 2010, 22:28 UTC
Message-ID
<20100511222802.GA16974@pvv.org>
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:
Show 7 quoted lines
> > +			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
Previous: Junio C HamanoNext: Eyvind Bernhardsen
Message 4 of 10 in “autocrlf: Make it work also for un-normalized repositories”
  1. autocrlf: Make it work also for un-normalized repositoriesFinn Arne Gangstad, May 10, 2010
  2. Johannes SchindelinMay 10, 2010
  3. Junio C HamanoMay 10, 2010
  4. Finn Arne GangstadMay 11, 2010
  5. Eyvind BernhardsenMay 10, 2010
  6. Dmitry PotapovMay 10, 2010
  7. Eyvind BernhardsenMay 11, 2010
  8. Jakub NarebskiMay 10, 2010
  9. Dmitry PotapovMay 10, 2010
  10. Finn Arne GangstadMay 11, 2010

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.