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

Re: [RFC] rebase: Handle cases where format-patch fails

From
Andrew Wong <andrew.kw.w@gmail.com>
Date
Oct 8, 2012, 19:36 UTC
Message-ID
<1349724988-14625-1-git-send-email-andrew.kw.w@gmail.com>
In-Reply-To
<7vipaou0zw.fsf@alter.siamese.dyndns.org>

Here's an alternate method for handling 'format-patch' failing. We remove the pipe between 'format-patch' and 'am' by storing the patch in an intermediate file. This means we can gurantee that 'am' is always invokved with the complete input.

I did some timing on rebasing 500 commits from the git repo. The patch file had a size of 6.9MB, but the overall timings between the pipe approach and intermediate file approach are approximately the same. I did the tests on a Linux machine, so I don't know what the impact would be on other platforms, or in repos with larger files and perhaps binary files.

Andrew Wong (1):
  rebase: Handle cases where format-patch fails
 git-rebase--am.sh | 28 +++++++++++++++++++++++++---
 1 file changed, 25 insertions(+), 3 deletions(-)
-- 
1.8.0.rc0.19.ga19ab82.dirty
Previous: Junio C HamanoNext: Andrew Wong
Message 11 of 17 in “Rebase doesn't restore branch pointer back on out of memory”
  1. Alexander KostikovOct 3, 2012
  2. Andrew WongOct 3, 2012
  3. Andrew WongOct 4, 2012
  4. Alexander KostikovOct 4, 2012
  5. Alexander KostikovOct 4, 2012
  6. Andrew WongOct 4, 2012
  7. Alexander KostikovOct 4, 2012
  8. Andrew WongOct 5, 2012
  9. [RFC] rebase: Handle cases where format-patch failsAndrew Wong, Oct 5, 2012
  10. Junio C HamanoOct 5, 2012
  11. Andrew WongOct 8, 2012
  12. [RFC] rebase: Handle cases where format-patch failsAndrew Wong, Oct 8, 2012
  13. Junio C HamanoOct 8, 2012
  14. Andrew WongOct 11, 2012
  15. rebase: Handle cases where format-patch failsAndrew Wong, Oct 11, 2012
  16. Alexander KostikovOct 19, 2012
  17. Junio C HamanoOct 19, 2012

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.