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

Re: [PATCH] apply: Allow "new file" patches on i-t-a entries

From
Raymond E. Pasco <ray@ameretat.dev>
Date
Aug 4, 2020, 20:59 UTC
Message-ID
<C4OIIFOZ357K.38YZE7TJFUCV8@ziyou.local>
In-Reply-To
<xmqqlfiuryym.fsf@gitster.c.googlers.com>
On Tue Aug 4, 2020 at 3:30 PM EDT, Junio C Hamano wrote:
Show 22 quoted lines
> How often do we pass ok_if_exists, I have to wonder. If it is often
> enough, then we can check that first way before we even check to see
> if a cache entry for the path even exists or what its i-t-a flag
> says. Something along the lines of this untested code:
>
> if (state->check_index && !ok_if_exists) {
> int pos = index_name_pos(state->repo->index, new_name,
> strlen(new_name));
> if (pos >= 0 &&
> !(state->repo->index->cache[pos]->ce_flags & CE_INTENT_TO_ADD))
> return EXISTS_IN_INDEX;
> }
>
> That is, only if we are told to make sure the path does not already
> exist,
> we see if the path is in the index, and if the cache entry for the
> path in the index is a real entry (as opposed to i-t-a aka "not
> added yet"), we complain. Otherwise we'd happily take the patch.
>
> Whether ok_if_exists is frequently used or not, the resulting code
> may be easier to understand, but I am of course biased, as I just
> wrote it ;-)

ok_if_exists gets passed in cases where a real entry does exist but we're okay with a new file diff anyway due to other patches in the set being applied making it valid (type-change diffs and rename diffs) - for this reason, I didn't pass ok_if_exists, but instead checked here. I think we're in agreement on this and your logic makes sense in that light. I'll send an updated patch.

Previous: Junio C HamanoNext: Raymond E. Pasco
Message 3 of 53 in “apply: Allow "new file" patches on i-t-a entries”
  1. apply: Allow "new file" patches on i-t-a entriesRaymond E. Pasco, Aug 4, 2020
  2. Junio C HamanoAug 4, 2020
  3. Raymond E. PascoAug 4, 2020
  4. apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco, Aug 4, 2020
  5. apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco, Aug 4, 2020
  6. Junio C HamanoAug 4, 2020
  7. Raymond E. PascoAug 5, 2020
  8. 0/3 apply: handle i-t-a entries in indexRaymond E. Pasco, Aug 6, 2020
  9. 1/3 apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco, Aug 6, 2020
  10. 2/3 apply: make i-t-a entries never match worktreeRaymond E. Pasco, Aug 6, 2020
  11. Junio C HamanoAug 6, 2020
  12. Raymond E. PascoAug 6, 2020
  13. 3/3 t4140: test apply with i-t-a pathsRaymond E. Pasco, Aug 6, 2020
  14. Junio C HamanoAug 6, 2020
  15. Raymond E. PascoAug 7, 2020
  16. 0/3 apply: handle i-t-a entries in indexRaymond E. Pasco, Aug 8, 2020
  17. 1/3 apply: allow "new file" patches on i-t-a entriesRaymond E. Pasco, Aug 8, 2020
  18. Phillip WoodAug 8, 2020
  19. 2/3 apply: make i-t-a entries never match worktreeRaymond E. Pasco, Aug 8, 2020
  20. Phillip WoodAug 8, 2020
  21. Raymond E. PascoAug 8, 2020
  22. Phillip WoodAug 8, 2020
  23. Raymond E. PascoAug 8, 2020
  24. Phillip WoodAug 9, 2020
  25. Junio C HamanoAug 9, 2020
  26. git-apply.txt: correct description of --cachedRaymond E. Pasco, Aug 10, 2020
  27. Junio C HamanoAug 10, 2020
  28. Phillip WoodAug 12, 2020
  29. Junio C HamanoAug 12, 2020
  30. Raymond E. PascoAug 12, 2020
  31. Phillip WoodAug 12, 2020
  32. 3/3 t4140: test apply with i-t-a pathsRaymond E. Pasco, Aug 8, 2020
  33. Phillip WoodAug 23, 2020
  34. 1/1 diff-lib: use worktree mode in diffs from i-t-a entriesRaymond E. Pasco, Aug 8, 2020
  35. Martin ÅgrenAug 8, 2020
  36. Raymond E. PascoAug 8, 2020
  37. Martin ÅgrenAug 8, 2020
  38. Junio C HamanoAug 9, 2020
  39. t4069: test diff behavior with i-t-a pathsRaymond E. Pasco, Aug 10, 2020
  40. diff-lib: use worktree mode in diffs from i-t-a entriesRaymond E. Pasco, Aug 10, 2020
  41. diff-lib: use worktree mode in diffs from i-t-a entriesRaymond E. Pasco, Aug 10, 2020
  42. Junio C HamanoAug 10, 2020
  43. Eric SunshineAug 10, 2020
  44. Eric SunshineAug 10, 2020
  45. Junio C HamanoAug 10, 2020
  46. Eric SunshineAug 10, 2020
  47. Junio C HamanoAug 10, 2020
  48. Raymond E. PascoAug 10, 2020
  49. Eric SunshineAug 10, 2020
  50. Junio C HamanoAug 11, 2020
  51. 0/2 apply: reject modification diffs to i-t-a entriesRaymond E. Pasco, Aug 8, 2020
  52. 1/2 apply: reject modification diffs to i-t-a entriesRaymond E. Pasco, Aug 8, 2020
  53. 2/2 t4140: test failure of diff from empty blob to i-t-a pathRaymond E. Pasco, Aug 8, 2020

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.