git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
To: git@vger.kernel.org
Cc: Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
Subject: [PATCH 0/5] rebase: calculate patches in upstream correctly
Date: Tue, 26 Jun 2012 07:51:53 -0700	[thread overview]
Message-ID: <1340722318-24392-1-git-send-email-martin.von.zweigbergk@gmail.com> (raw)

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

             reply	other threads:[~2012-06-26 14:52 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-26 14:51 Martin von Zweigbergk [this message]
2012-06-26 14:51 ` [PATCH 1/5] rebase: don't source git-sh-setup twice Martin von Zweigbergk
2012-06-26 14:51 ` [PATCH 2/5] rebase --root: print usage on too many args Martin von Zweigbergk
2012-06-26 14:51 ` [PATCH 3/5] am --rebasing: get patch body from commit, not from mailbox Martin von Zweigbergk
2012-06-26 14:51 ` [PATCH 4/5] am: don't call mailinfo if $rebasing Martin von Zweigbergk
2012-06-26 14:51 ` [PATCH 5/5] rebase [-m]: calculate patches in upstream correctly Martin von Zweigbergk
2012-06-26 21:13   ` Junio C Hamano
2012-06-27 16:17     ` Martin von Zweigbergk

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1340722318-24392-1-git-send-email-martin.von.zweigbergk@gmail.com \
    --to=martin.von.zweigbergk@gmail.com \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).