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

Re: difftool -d symlinks, under what conditions

From
John Keeping <john@keeping.me.uk>
Date
Mar 14, 2013, 09:43 UTC
Message-ID
<20130314094300.GN2317@serenity.lan>
In-Reply-To
<7v1ubj45ac.fsf@alter.siamese.dyndns.org>
On Wed, Mar 13, 2013 at 09:45:47AM -0700, Junio C Hamano wrote:
> Does the temporary checkout correctly apply the smudge filter and
> crlf conversion, by the way?  If not, regardless of the topic in
> this thread, that may want to be fixed as well.  I didn't check.

I've had a look at this and I think it will be much quicker for someone more familiar with git-checkout-index to answer.

What git-difftool does is to create a temporary index containing only the files that have changed (using git-update-index --index-info) and then check this out with "git checkout-index --prefix=...". So I think this question boils down to: does git-checkout-index still read .gitattributes from the working tree if given --prefix?

John
Previous: Junio C HamanoNext: John Keeping
Message 38 of 50 in “difftool -d symlinks, under what conditions”
  1. Matt McClureNov 26, 2012
  2. David AguilarNov 27, 2012
  3. Matt McClureNov 27, 2012
  4. Matt McClureMar 12, 2013
  5. John KeepingMar 12, 2013
  6. David AguilarMar 12, 2013
  7. John KeepingMar 12, 2013
  8. Junio C HamanoMar 12, 2013
  9. John KeepingMar 12, 2013
  10. Junio C HamanoMar 12, 2013
  11. Matt McClureMar 12, 2013
  12. Matt McClureMar 12, 2013
  13. Junio C HamanoMar 12, 2013
  14. Matt McClureMar 12, 2013
  15. John KeepingMar 13, 2013
  16. Matt McClureMar 13, 2013
  17. David AguilarMar 13, 2013
  18. Junio C HamanoMar 13, 2013
  19. Junio C HamanoMar 13, 2013
  20. John KeepingMar 13, 2013
  21. Junio C HamanoMar 13, 2013
  22. John KeepingMar 13, 2013
  23. Junio C HamanoMar 13, 2013
  24. 0/2 difftool --dir-diff: symlink all files matching the working treeJohn Keeping, Mar 13, 2013
  25. 1/2 git-difftool(1): fix formatting of --symlink descriptionJohn Keeping, Mar 13, 2013
  26. 2/2 difftool --dir-diff: symlink all files matching the working treeJohn Keeping, Mar 13, 2013
  27. David AguilarMar 14, 2013
  28. John KeepingMar 14, 2013
  29. Junio C HamanoMar 14, 2013
  30. 0/3 difftool --dir-diff: symlink all files matching the working treeJohn Keeping, Mar 14, 2013
  31. 1/3 git-difftool(1): fix formatting of --symlink descriptionJohn Keeping, Mar 14, 2013
  32. 2/3 difftool: avoid double slashes in symlink targetsJohn Keeping, Mar 14, 2013
  33. Junio C HamanoMar 14, 2013
  34. 3/3 difftool --dir-diff: symlink all files matching the working treeJohn Keeping, Mar 14, 2013
  35. Junio C HamanoMar 14, 2013
  36. John KeepingMar 14, 2013
  37. Junio C HamanoMar 14, 2013
  38. John KeepingMar 14, 2013
  39. John KeepingMar 14, 2013
  40. Junio C HamanoMar 14, 2013
  41. 0/2 checkout-index: fix .gitattributes handling with --prefixJohn Keeping, Mar 14, 2013
  42. 1/2 t2003: modernize styleJohn Keeping, Mar 14, 2013
  43. 2/2 entry: fix filter lookupJohn Keeping, Mar 14, 2013
  44. Junio C HamanoMar 14, 2013
  45. Junio C HamanoMar 12, 2013
  46. John KeepingMar 12, 2013
  47. Matt McClureMar 12, 2013
  48. John KeepingMar 12, 2013
  49. Matt McClureMar 13, 2013
  50. John KeepingMar 13, 2013

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.