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

[RFC/PATCH 0/2] more patch-id speedups

From
Jeff King <peff@peff.net>
Date
Sep 7, 2016, 07:53 UTC
Message-ID
<20160907075346.z6wtmqnfc6bsunjb@sigill.intra.peff.net>

Michael and I found a case where the "format-patch --cherry-pick A...B" command for a rebase took over 7 minutes to run with git v2.9.3. Yikes.

Switching to v2.10 dropped that to a bit over 3 minutes (due to the kw/patch-ids-optim topic). Better, but not great.

The culprit turned out to be merge commits; the patch-id code will happily diff a merge against its first parent, and ignore the rest. This _seems_ like a bad idea, but maybe there is something clever going on that I don't know about. I couldn't find anything useful in the history, and given that this code was adapted from rebase, my guess is that it was never really intended to handle merge commits in the first place (of course we weren't trying to rebase merge commits; but it has to generate patch-ids for everything that happened on "A" to compare against).

Dropping the computation of the merge commits got it down to about 4 seconds. I also noticed that it was doing rename detection (which also seems like a bad idea). Disabling renames dropped another half second or so.

This is marked as "RFC" because I don't feel entirely confident that I'm not missing some clever need for these options. But in both cases my gut feeling is that they are simply unintended effects that nobody ever noticed, because it would be very rare that they would affect the output. And that if they _did_ affect the output, they would probably be doing the wrong thing.

-peff
Next: Jeff King
Message 1 of 35 in “more patch-id speedups”
  1. 0/2 more patch-id speedupsJeff King, Sep 7, 2016
  2. 1/2 patch-ids: turn off rename detectionJeff King, Sep 7, 2016
  3. Johannes SchindelinSep 7, 2016
  4. 2/2 patch-ids: skip merge commitsJeff King, Sep 7, 2016
  5. Johannes SchindelinSep 7, 2016
  6. Jeff KingSep 7, 2016
  7. Jeff KingSep 7, 2016
  8. Johannes SchindelinSep 7, 2016
  9. Jeff KingSep 7, 2016
  10. 0/3 patch-id for mergesJeff King, Sep 7, 2016
  11. 1/3 patch-ids: turn off rename detectionJeff King, Sep 7, 2016
  12. Jacob KellerSep 7, 2016
  13. 2/3 diff_flush_patch_id: stop returning error resultJeff King, Sep 7, 2016
  14. Ramsay JonesSep 8, 2016
  15. Jeff KingSep 8, 2016
  16. Johannes SchindelinSep 9, 2016
  17. Jeff KingSep 9, 2016
  18. Johannes SchindelinSep 9, 2016
  19. Jeff KingSep 9, 2016
  20. 3/3 patch-ids: use commit sha1 as patch-id for merge commitsJeff King, Sep 7, 2016
  21. Jacob KellerSep 7, 2016
  22. Jeff KingSep 7, 2016
  23. Josh TriplettSep 7, 2016
  24. Jeff KingSep 8, 2016
  25. 0/2 patch-id for mergesJeff King, Sep 9, 2016
  26. 1/2 patch-ids: turn off rename detectionJeff King, Sep 9, 2016
  27. 2/2 patch-ids: define patch-id of merge commits as "null"Jeff King, Sep 9, 2016
  28. Jeff KingSep 9, 2016
  29. Junio C HamanoSep 9, 2016
  30. Junio C HamanoSep 9, 2016
  31. Jeff KingSep 12, 2016
  32. Junio C HamanoSep 12, 2016
  33. Jeff KingSep 12, 2016
  34. Junio C HamanoSep 12, 2016
  35. Johannes SchindelinSep 25, 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.