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

Re: [PATCH v2 1/3] diff-files --raw: handle intent-to-add files correctly

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 24, 2020, 15:51 UTC
Message-ID
<xmqqh7v08nt9.fsf@gitster.c.googlers.com>
In-Reply-To
<nycvar.QRO.7.76.6.2006241528290.54@tvgsbejvaqbjf.bet>
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
Show 8 quoted lines
>> > +  :000000 100644 0000000 $(git rev-parse --short $hash_e) A$(printf "\t")empty
>> > +  :000000 100644 0000000 $(git rev-parse --short $hash_n) A$(printf "\t")not-empty
>>
>> Changing the test-case to reflect to the hash of the blob also makes
>> sense.
>
> Yes, that's the post-image side. The pre-image side is marked with 0000000
> (which is Git's way to say "dunno! no current information in the index").

The post-image side for (A)dded and (M)odified can have 0{40} when Git wants to say "we don't have it in precomputed form. you can grab the working tree files and figure it out, if you need it", as you said, but the pre-image side for (A)dded entries are "we know there is nothing because we are Adding, but we need to have something here, so we have 0+ as a filler".

Previous: Johannes SchindelinNext: Johannes Schindelin via GitGitGadget
Message 17 of 37 in “Fix difftool problem with intent-to-add files”
  1. 0/3 Fix difftool problem with intent-to-add filesJohannes Schindelin via GitGitGadget, Jun 11, 2020
  2. 2/3 diff-files --raw: handle intent-to-add files correctlyJohannes Schindelin via GitGitGadget, Jun 11, 2020
  3. 1/3 diff-files: fix incorrect usage of an empty treeJohannes Schindelin via GitGitGadget, Jun 11, 2020
  4. 3/3 difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin via GitGitGadget, Jun 11, 2020
  5. 0/3 Fix difftool problem with intent-to-add filesJohannes Schindelin via GitGitGadget, Jun 23, 2020
  6. 2/3 diff-files: fix incorrect usage of an empty treeJohannes Schindelin via GitGitGadget, Jun 23, 2020
  7. Junio C HamanoJun 24, 2020
  8. 3/3 difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin via GitGitGadget, Jun 23, 2020
  9. 1/3 diff-files --raw: handle intent-to-add files correctlyJohannes Schindelin via GitGitGadget, Jun 23, 2020
  10. Junio C HamanoJun 24, 2020
  11. Johannes SchindelinJun 24, 2020
  12. Junio C HamanoJun 24, 2020
  13. Junio C HamanoJun 24, 2020
  14. Johannes SchindelinJun 25, 2020
  15. Srinidhi KaushikJun 24, 2020
  16. Johannes SchindelinJun 24, 2020
  17. Junio C HamanoJun 24, 2020
  18. 0/3 Fix difftool problem with intent-to-add filesJohannes Schindelin via GitGitGadget, Jun 24, 2020
  19. 1/3 diff-files --raw: handle intent-to-add files correctlyJohannes Schindelin via GitGitGadget, Jun 24, 2020
  20. 3/3 difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin via GitGitGadget, Jun 24, 2020
  21. 2/3 diff-files: fix incorrect usage of an empty treeJohannes Schindelin via GitGitGadget, Jun 24, 2020
  22. 0/2 Fix difftool problem with intent-to-add filesJohannes Schindelin via GitGitGadget, Jun 25, 2020
  23. 1/2 diff-files --raw: show correct post-image of intent-to-add filesJohannes Schindelin via GitGitGadget, Jun 25, 2020
  24. Junio C HamanoJun 25, 2020
  25. Johannes SchindelinJul 1, 2020
  26. Junio C HamanoJul 1, 2020
  27. Junio C HamanoJun 25, 2020
  28. Johannes SchindelinJul 1, 2020
  29. Srinidhi KaushikJun 26, 2020
  30. 2/2 difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin via GitGitGadget, Jun 25, 2020
  31. Junio C HamanoJun 25, 2020
  32. Johannes SchindelinJul 1, 2020
  33. Junio C HamanoJul 1, 2020
  34. Johannes SchindelinJul 1, 2020
  35. 0/2 Fix difftool problem with intent-to-add filesJohannes Schindelin via GitGitGadget, Jul 1, 2020
  36. 1/2 diff-files --raw: show correct post-image of intent-to-add filesJohannes Schindelin via GitGitGadget, Jul 1, 2020
  37. 2/2 difftool -d: ensure that intent-to-add files are handled correctlyJohannes Schindelin via GitGitGadget, Jul 1, 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.