From: "Jakub Narębski" <jnareb@gmail.com>
To: john smith <wempwer@gmail.com>, Junio C Hamano <gitster@pobox.com>
Cc: "Torsten Bögershausen" <tboegi@web.de>, git@vger.kernel.org
Subject: Re: How to simulate a real checkout to test a new smudge filter?
Date: Sat, 10 Sep 2016 12:32:47 +0200 [thread overview]
Message-ID: <a00fa147-291c-536c-35da-56f88221e0f8@gmail.com> (raw)
In-Reply-To: <CAKmQUfYCUq=kUTau1-3NjjPVBk6WkP3KdTjgMC8sZtU8h=H4iQ@mail.gmail.com>
W dniu 10.09.2016 o 01:07, john smith pisze:
> On 9/10/16, Junio C Hamano <gitster@pobox.com> wrote:
>> The clean and smudge operations should look _only_ at the contents
>> they are filtering, and nothing else, and the clean/smudge filtering
>> mechanism is designed to support that use case. It is not designed
>> to do things like embedding the name of the branch that is being
>> checked out into the result.
>
> Ok, I think I get it. It was actually my original problem with smudge
> filters because I wanted them to be run after *every* checkout even if
> file contents stayed the same (hence the subject).
And that's not the case, for performance reasons.
>
> Now Jakub suggested post-checkout hook in conjunction with only clean
> filter for my problem of managing dotfiles but I think I don't fully
> get it. The problem is that in the scenario presented in my last
> e-mail clean filter is run in the situation which doesn't like a
> checkin to me. Is `git checkout <PATH>' doing a *checkin*" under the
> hood so that the clean filter is called? What does actually `checkin'
> mean in Git? I thought that checkin it's the same as committing a
> file into the repository.
I was wrong, I'm sorry. My mistake.
You would need post-checkout hook together with clean / smudge filters
(though you could get by without smudge filter, at least in theory...).
The `post-checkout` hook could run e.g. "git checkout -- '*.conf'"
to force use of smudge filter, after checking that it was a change
of branch ("git checkout <commit-ish>"). See githooks(5) for details
(last, third parameter passed to hook script is 1, rather than 0).
Unfortunately I don't see a way to query .gitattributes files to
find out all patterns that match specific attribute; you would need
to duplicate configuration:
.gitattributes:
*.conf filter=transform
.git/config
[filter "transform"]
clean = replace-with-placeholder %f
smudge = expand-with-branchname %f
.git/hooks/post-checkout
#!/bin/sh
test "$3" -eq "1" && git checkout -- '*.conf'
Or something like that.
--
Jakub Narębski
next prev parent reply other threads:[~2016-09-10 10:32 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-09-06 17:47 How to simulate a real checkout to test a new smudge filter? john smith
2016-09-06 19:48 ` Torsten Bögershausen
2016-09-06 21:01 ` john smith
2016-09-07 8:52 ` Michael J Gruber
2016-09-08 13:12 ` Jakub Narębski
2016-09-09 22:03 ` john smith
2016-09-09 22:34 ` Junio C Hamano
2016-09-09 23:07 ` john smith
2016-09-09 23:12 ` Junio C Hamano
2016-09-10 10:32 ` Jakub Narębski [this message]
2016-09-10 16:31 ` john smith
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a00fa147-291c-536c-35da-56f88221e0f8@gmail.com \
--to=jnareb@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=tboegi@web.de \
--cc=wempwer@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).