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

Re: smudge filters during checkout & crash consistency

From
Derek Moore <derek.p.moore@gmail.com>
Date
Nov 12, 2014, 20:30 UTC
Message-ID
<CAMsgyKagoz7NU7cGuwvq61aiKc6Wq-z+w0_Fep7t9tYy90pB6w@mail.gmail.com>
In-Reply-To
<xmqqk33046ha.fsf@gitster.dls.corp.google.com>
> 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").
Or: the post-commit hook used in the workaround looks up the prior
branch via @{-1}, finds all files common between @ & @{-1} that don't
share a latest commit, deletes those files and replaces them singly
with the results of git-archive using the latest commits of those
files relative to @. ("All files common between @ & @{-1}" would need
to be either all non-locally-modified files or making use of git-stash
{save,pop} to preserve local modifications.) All this assumes having
reversible $Format$ strings, so the clean filter can restore the
proper $Format$ string.

Might be worth doing just so there's at least 1 accurate and maybe-fast "git rcs keywords substitution using smudge/clean filters" project on github. ;) Otherwise, users of "git-keyword-substitution" and "git-rcs-keywords" are being led astray.

Previous: Derek MooreNext: Junio C Hamano
Message 4 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.