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

Re: [PATCH v3 3/3] correct ce_compare_data() in a middle of a merge

From
Torsten Bögershausen <tboegi@web.de>
Date
Jul 12, 2016, 02:23 UTC
Message-ID
<51079140-98c8-ee0c-72d2-af5c348c19fd@web.de>
In-Reply-To
<xmqqinwc7xbb.fsf@gitster.mtv.corp.google.com>
Show 7 quoted lines
>
> How do things look at this point?  This version is what I ended up
> queuing in 'pu', but I took your "Thanks" in $gmane/299120 to only
> mean "Thanks for feeding some ideas to help me move forward", not
> necessarily "Tnanks that looks like the right approach." yet, so
> right now both topics are stalled and waiting for an action from
> you.

Yes, the code looks good to me. And the commit message does explain what is going on.

For my taste, these 3 lines don't explain too much,may be remove them ?
 > The test update was taken from a series by Torsten Bögershausen
 > that attempted to fix this with a different approach (which was a
 > lot more intrusive).
So thanks for your efforts, ack from my side.
Previous: Junio C HamanoNext: Junio C Hamano
Message 22 of 24 in “What's cooking in git.git (Jun 2016, #09; Mon, 27)”
  1. Junio C HamanoJun 27, 2016
  2. 0/3 unified auto CRLF handling, V3tboegi@web.de, Jun 28, 2016
  3. 1/3 convert: unify the "auto" handling of CRLFtboegi@web.de, Jun 28, 2016
  4. 2/3 read-cache: factor out get_sha1_from_index() helpertboegi@web.de, Jun 28, 2016
  5. 3/3 correct ce_compare_data() in a middle of a mergetboegi@web.de, Jun 28, 2016
  6. Junio C HamanoJun 29, 2016
  7. Torsten BögershausenJun 30, 2016
  8. Junio C HamanoJul 1, 2016
  9. Torsten BögershausenJul 2, 2016
  10. Junio C HamanoJul 6, 2016
  11. Torsten BögershausenJul 7, 2016
  12. Junio C HamanoJul 7, 2016
  13. Junio C HamanoJul 7, 2016
  14. Torsten BögershausenJul 8, 2016
  15. Junio C HamanoJul 8, 2016
  16. Torsten BögershausenJul 8, 2016
  17. Junio C HamanoJul 8, 2016
  18. Junio C HamanoJul 8, 2016
  19. Junio C HamanoJul 8, 2016
  20. Junio C HamanoJul 8, 2016
  21. Junio C HamanoJul 11, 2016
  22. Torsten BögershausenJul 12, 2016
  23. Junio C HamanoJul 12, 2016
  24. Torsten BögershausenJul 8, 2016

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.