[PATCH 6/7] rebase -p: don't request --left-right only to ignore left side
- From
Martin von Zweigbergk <martin.von.zweigbergk@gmail.com>
- Date
- Jul 18, 2012, 07:27 UTC
- Message-ID
- <1342596455-17046-7-git-send-email-martin.von.zweigbergk@gmail.com>
- In-Reply-To
- <1342596455-17046-6-git-send-email-martin.von.zweigbergk@gmail.com>
While generating the todo file, rebase -p calls 'git rev-list --left-right a...b' (with 'a' equal to $upstream or $onto and 'b' equal to $orig_head) and its output is piped through 'sed -n "s/^>//p"', making it equivalent to 'git rev-list --right-only a...b'. Change the invocation to exactly that.
(One could alternatively change it to 'git rev-list a..b', which would be even simpler, if it wasn't for the fact that we already have the revision range expression in a variable.) --- git-rebase--interactive.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index 47beb58..cd5a2cc 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -836,8 +836,7 @@ then # No cherry-pick because our first pass is to determine # parents to rewrite and skipping dropped commits would # prematurely end our probe - git rev-list $revisions --reverse --left-right --topo-order | - sed -n "s/^>//p" | + git rev-list $revisions --reverse --right-only --topo-order | while read -r sha1 do if test -z "$rebase_root"
-- 1.7.11.1.104.ge7b44f1