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

Re: smudge filters during checkout & crash consistency

From
Junio C Hamano <gitster@pobox.com>
Date
Nov 12, 2014, 18:30 UTC
Message-ID
<xmqqk33046ha.fsf@gitster.dls.corp.google.com>
In-Reply-To
<CAMsgyKbox7e2pv4+_=jG6Ywh3Km2gPsw+Qf6qj-28GWrVg7RZQ@mail.gmail.com>
Derek Moore <derek.p.moore@gmail.com> writes:
> I have a case where I would like to smudge files according to the
> reflog information of the switching-to branch.
Don't do that.

When you have branches A, B and C, and a path F is the same between branches A and B but different in branch C, if you start from branch C and switch to branch A, F will be updated and obtain your smudge tailored for "branch A's instance of F".

But if you then switch to B from that state, F will not even be modified (i.e. it will keep the contents you prepared for "branch A's instance of F").

In short, do not make clean/smudge depend on anything but blob contents.

Previous: Derek MooreNext: Derek Moore
Message 2 of 5 in “smudge filters during checkout & crash consistency”
  1. Derek MooreNov 12, 2014
  2. Junio C HamanoNov 12, 2014
  3. Derek MooreNov 12, 2014
  4. Derek MooreNov 12, 2014
  5. Junio C HamanoNov 12, 2014

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.