Re: git rebase: unexpected conflict

"Michael S. Tsirkin" [off-list ref] writes:

Sorry about being dense. What's evil there?

Sorry for being too terse to be useful.

An evil merge is a merge that introduces changes that do not
appear in any parent.

Notice two plus letters?  The copy of the file in either
parents of the merge did not have these 7 lines.  These were
literally _added_ by the merge.

Since git-rebase currently ignores merge commits, while you are
rebasing your branch, your branch does not have these lines
after finishing to rebase the commit just before one.  The
commit that comes on top of this one _expects_ to have NAND_CAFE
already added in the tree, but since you do not have one, you
get a conflict.

Since git-rebase currently ignores merge commits

Ugh. This is the bit I did not know about.

So the following script is kind of equivalent to rebase -
it applies commits in range $1..$2 that touch files in list on top of current tree:

from=$1
shift
to=$1
shift
git-show --pretty=email `git-rev-list --no-merges $from..$to -- $* | tac` > box
../git-am box

And here I was hoping rebase will be smarter and help me out.

OK.

Questions about the above line now:

1. What is annoying in the above is that
git-show can not limit its output to just the part of patch
that affects the list of files I give, the way git-diff can.
Would such an extension be a good idea?

2. It's unfortunate that I need a temp file here.
Can git-am get stdin somehow?


-- 
MST