On Mon, 02 May 2011 00:21:26 +0300, Hannu Koivisto <[email protected]> wrote: > Pieter Praet <[email protected]> > writes: > > > This should have been fixed in 74e40248, the day after 14fdc8dc was > > merged in. > > > > Since you haven't filed a bug report, I presume the issue is resolved? > > I don't file bug reports, I fix bugs, [...]
I sincerely applaud your way of thinking! > [...] I don't see how 2d29228a > could fix the problem (and it clearly doesn't), since it doesn't > undo 14fdc8dc, which changes where the rewriting starts. [...] 2d29228a fixes the issue in 14fdc8dc where it would erroneously check whether the base commit has any parents, causing the very first commit to be unusable as rewrite base. So (in the context of this thread) unless the very first commit was also the only pushed commit, indeed it doesn't fix the presumed problem. > [...] Rewriting > must start below the commit over which magit-rewrite-start is > invoked, otherwise you can't directly include the first unpushed > commit in the commits to be rewritten. Correct me if I'm wrong, but (as of commit 2d29228a) absolutely nothing is preventing you from rewriting the first unpushed commit (unless it's commit 0, which was prevented pre-14fdc8dc as well). This does however require a little change of habit, i.e. using the last pushed commit (as opposed to the first unpushed commit) as base, thus treating the term "base" according to its correct semantic meaning. Exactly the way rebasing works. > -- > Hannu > Peace -- Pieter
