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

Re: [PATCH] apply: reload .gitattributes after patching it

From
brian m. carlson <sandals@crustytoothpaste.net>
Date
Aug 9, 2019, 22:08 UTC
Message-ID
<20190809220848.GO118825@genre.crustytoothpaste.net>
In-Reply-To
<20190809135148.GA7495@sigill.intra.peff.net>
On 2019-08-09 at 13:51:49, Jeff King wrote:
Show 17 quoted lines
> On Fri, Aug 09, 2019 at 02:43:18PM +0200, SZEDER Gábor wrote:
> > But there is an other subtlety here: when I read the commit message
> > saying "patch that touches a path ending in ".gitattributes"." and saw
> > the new call to strip_path_suffix(), I immediately thought what would
> > happen with a file called 'foo.gitattributes'.  Only when I looked
> > into strip_path_suffix() became it clear that it only removes full
> > path components, so such a filename won't cause any trouble (though
> > perhaps the worst thing that could happen is that we unnecessarily
> > flush the attributes cache).
> 
> Right. I think the term we want here is really "basename". So in fact:
> 
>   if (!strcmp(basename(patch->new_name), GITATTRIBUTES_FILE))
> 
> would do what we want, except for the annoying caveat that basename() is
> allowed to modify its parameter (to remove trailing directory
> separators, but we know we wouldn't have them here).

I think this is exactly the function I'm looking for. I'm a little uncomfortable relying on the fact that typical implementations don't modify the string when there's no trailing slash, though.

I think I'm going to end up refactoring out the strip_path_suffix function into a has_path_suffix and use that. That will avoid the allocation and it doesn't rely on the generosity of OS implementers.

-- 
brian m. carlson: Houston, Texas, US
OpenPGP: https://keybase.io/bk2204
Previous: Jeff KingNext: brian m. carlson
Message 8 of 41 in “apply: reload .gitattributes after patching it”
  1. apply: reload .gitattributes after patching itbrian m. carlson, Aug 9, 2019
  2. Taylor BlauAug 9, 2019
  3. brian m. carlsonAug 9, 2019
  4. Jeff KingAug 9, 2019
  5. brian m. carlsonAug 9, 2019
  6. SZEDER GáborAug 9, 2019
  7. Jeff KingAug 9, 2019
  8. brian m. carlsonAug 9, 2019
  9. 0/2 Honor .gitattributes with rebase --ambrian m. carlson, Aug 11, 2019
  10. 1/2 path: add a function to check for path suffixbrian m. carlson, Aug 11, 2019
  11. Junio C HamanoAug 12, 2019
  12. brian m. carlsonAug 12, 2019
  13. SZEDER GáborAug 12, 2019
  14. Junio C HamanoAug 12, 2019
  15. brian m. carlsonAug 12, 2019
  16. Jeff KingAug 13, 2019
  17. Junio C HamanoAug 13, 2019
  18. SZEDER GáborAug 13, 2019
  19. Junio C HamanoAug 13, 2019
  20. 2/2 apply: reload .gitattributes after patching itbrian m. carlson, Aug 11, 2019
  21. 0/2 Honor .gitattributes with rebase --ambrian m. carlson, Aug 13, 2019
  22. 1/2 path: add a function to check for path suffixbrian m. carlson, Aug 13, 2019
  23. 2/2 apply: reload .gitattributes after patching itbrian m. carlson, Aug 13, 2019
  24. Junio C HamanoAug 13, 2019
  25. Junio C HamanoAug 15, 2019
  26. brian m. carlsonAug 16, 2019
  27. Junio C HamanoAug 13, 2019
  28. brian m. carlsonAug 13, 2019
  29. 0/2 Honor .gitattributes with rebase --ambrian m. carlson, Aug 18, 2019
  30. 1/2 path: add a function to check for path suffixbrian m. carlson, Aug 18, 2019
  31. 2/2 apply: reload .gitattributes after patching itbrian m. carlson, Aug 18, 2019
  32. Phillip WoodAug 19, 2019
  33. Phillip WoodAug 19, 2019
  34. brian m. carlsonAug 20, 2019
  35. Phillip WoodAug 20, 2019
  36. brian m. carlsonAug 20, 2019
  37. Phillip WoodAug 20, 2019
  38. Junio C HamanoAug 20, 2019
  39. Phillip WoodAug 20, 2019
  40. Phillip WoodAug 26, 2019
  41. Junio C HamanoAug 26, 2019

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.