Re: [PATCH] rebase -p: seed first commit in case it's before the merge bases.
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Jan 18, 2009, 00:19 UTC
- Message-ID
- <alpine.DEB.1.00.0901180108480.3586@pacific.mpi-cbg.de>
- In-Reply-To
- <alpine.DEB.1.00.0901180041540.3586@pacific.mpi-cbg.de>
Hi,
On Sun, 18 Jan 2009, Johannes Schindelin wrote:
> However, I have a strong feeling that just piling onto the current code > will not fix the underlying issues.
BTW just to clarify what I mean by "underlying issues": if you say "git rebase -i" in Sitaram's test case, you will see the two commits -- as expected.
However, if you add "-p", all of a sudden you will only see "noop". IMO there is no excuse that the code can hide them at all. If the commits are reachable from HEAD but not from $UPSTREAM, they have to be in the list. As simple as that.
Another thing that I find horribly wrong: there is a "touch $REWRITTEN/sha1". There was a simple design in the beginning: the files in $REWRITTEN are actually a mapping from old SHA-1 (file name) to new SHA-1 (content). This was broken, without any good explanation.
Ciao, Dscho