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

Re: 'git add' regression in git-1.7?

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 10, 2010, 07:06 UTC
Message-ID
<7veijsmza0.fsf@alter.siamese.dyndns.org>
In-Reply-To
<20100309230931.GC25265@sigill.intra.peff.net>
Jeff King <peff@peff.net> writes:
Show 10 quoted lines
> Actually, if we accept that the message simply mentions the excluded
> path, i.e.:
>
>   $ git add subdir/file
>   The following paths are ignored by one of your .gitignore files:
>   subdir
>   Use -f if you really want to add them.
>
> then we don't really need to recurse. We just need to fix in_pathspec to
> flag files that are _relevant_ to a pathspec.
Clever and to the point.
Show 6 quoted lines
> And something like this seems to fix the OP's problem:
> ...
> Which is similar to your fix, but hoisted into the ignore-collection
> phase. Like the original code and your patch, it suffers from using a
> straight memcmp. I think it should actually be checking the pathspec
> expansion to catch things like 'sub*/file' being relevant to 'subdir'.

Yeah. Care to roll a patch to replace 13bb0ce (builtin-add: fix exclude handling, 2010-02-28)? We probably should build the glob matching on top of your version instead.

Previous: Jeff KingNext: Jeff King
Message 13 of 17 in “'git add' regression in git-1.7?”
  1. SungHyun NamFeb 19, 2010
  2. Avery PennarunFeb 19, 2010
  3. SungHyun NamFeb 19, 2010
  4. Avery PennarunFeb 19, 2010
  5. Jeff KingFeb 19, 2010
  6. Jeff KingFeb 19, 2010
  7. Jeff KingFeb 19, 2010
  8. Junio C HamanoMar 1, 2010
  9. add: fail "git add ignored-dir/file" without -fJunio C Hamano, Mar 1, 2010
  10. 1/3 t0050: mark non-working test as suchJunio C Hamano, Mar 1, 2010
  11. Jeff KingMar 9, 2010
  12. Jeff KingMar 9, 2010
  13. Junio C HamanoMar 10, 2010
  14. Jeff KingMar 11, 2010
  15. Junio C HamanoMar 14, 2010
  16. Jeff KingMar 14, 2010
  17. Junio C HamanoMar 15, 2010

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.