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

Re: Using clean/smudge filters with difftool

From
FAFlorian Aspart <florian.aspart@gmail.com>
Date
Jun 18, 2015, 13:15 UTC
Message-ID
<CAGA3++LrVSs3rMkg=S2Og48pz1yEBxwpcRsPt7sNLENRh1ooAg@mail.gmail.com>
In-Reply-To
<5582BA1F.1030409@drmicha.warpmail.net>
Hi Michael,

yes in this case "difftool" compares an uncleaned working tree file with a cleaned blob. I did not try the smudge filter to see if it applied in difftool.

I think the problem comes from the way difftool is feeded, since I also had this problem when setting an external tool for the diff in the gitconfig file.

However, I'm not sure if this is a bug or it is designed to be so. If the external tool changes a cleaned working tree file during the diff, then by saving this file the result of the cleaning filter would also be saved in the working tree.

2015-06-18 14:31 GMT+02:00 Michael J Gruber <git@drmicha.warpmail.net>:
Show 24 quoted lines
> Florian Aspart venit, vidit, dixit 16.06.2015 16:11:
>> Hi everyone,
>>
>> I created a clean filter to apply on some files before commiting them.
>> The filter works correctly when I commit the file and is also applied
>> when I usethe iff command line tool.
>> However, when using difftool with meld, the filter is not applied and
>> the different versions of the files are compared without any
>> filtering.
>>
>> Is there a way to apply the clean/smudge filters when comparing the
>> working copy of a file to the HEAD version in a gui diff tool?
>>
>> I'm using git version 2.4.3 under Ubuntu.
>>
>> Best,
>> Florian
>
> Are you saying that "difftool" compares an uncleaned working tree file
> with a cleaned blob? That would be a bug in either difftool or the way
> we feed difftool.
>
> Michael
>
Previous: Michael J GruberNext: John Keeping
Message 3 of 18 in “Using clean/smudge filters with difftool”
  1. Florian AspartJun 16, 2015
  2. Michael J GruberJun 18, 2015
  3. Florian AspartJun 18, 2015
  4. John KeepingJun 18, 2015
  5. Florian AspartJun 18, 2015
  6. John KeepingJun 18, 2015
  7. Florian AspartJun 18, 2015
  8. John KeepingJun 18, 2015
  9. Florian AspartJun 18, 2015
  10. John KeepingJun 18, 2015
  11. Junio C HamanoJun 18, 2015
  12. John KeepingJun 18, 2015
  13. Junio C HamanoJun 18, 2015
  14. Michael J GruberJun 19, 2015
  15. John KeepingJun 19, 2015
  16. Florian AspartJun 19, 2015
  17. Junio C HamanoJun 19, 2015
  18. Michael J GruberJun 21, 2015

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.