[PATCH 0/5] rebase: calculate patches in upstream correctly
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Jun 26, 2012, 14:51 UTC
- Message-ID
- <1340722318-24392-1-git-send-email-martin.von.zweigbergk@gmail.com>
I worked on these patches last year but never sent them because I wasn't sure how they impact performance. I was hoping that getting the patch body from the commit and avoiding the call to mailinfo would make am-based rebase a little faster, but if I remember correctly, it got a little slower instead (not by much, though). I was also working on a way to implement the 'git cherry' functionality in 'git rev-list', but I wasn't sure how that would work and I ran out of time. I hope at least some of these patches can still be useful.
Martin von Zweigbergk (5): rebase: don't source git-sh-setup twice rebase --root: print usage on too many args am --rebasing: get patch body from commit, not from mailbox am: don't call mailinfo if $rebasing rebase [-m]: calculate patches in upstream correctly
git-am.sh | 48 ++++++++++++++++++++++--------------------- git-rebase--am.sh | 8 ++------ git-rebase--interactive.sh | 4 +--- git-rebase--merge.sh | 4 +--- git-rebase.sh | 13 ++++++------ t/t3401-rebase-partial.sh | 17 +++++++++++++++ t/t3405-rebase-malformed.sh | 32 +++++++++++++++++++++++++---- t/t3406-rebase-message.sh | 14 ++++++------- t/t3412-rebase-root.sh | 8 +++++++- 9 files changed, 94 insertions(+), 54 deletions(-)
-- 1.7.9.3.327.g2980b