Re: [PATCH] rebase -i: handle fixup of root commit correctly

2012-07-31 Thread Johannes Sixt
Am 24.07.2012 14:17, schrieb Chris Webb: There is a bug with git rebase -i --root when a fixup or squash line is applied to the new root. We attempt to amend the commit onto which they apply with git reset --soft HEAD^ followed by a normal commit. Unlike a real commit --amend, this sequence will

Re: [PATCH] rebase -i: handle fixup of root commit correctly

2012-07-31 Thread Chris Webb
Johannes Sixt j...@kdbg.org writes: Am 24.07.2012 14:17, schrieb Chris Webb: diff --git a/git-rebase--interactive.sh b/git-rebase--interactive.sh index bef7bc0..0d2056f 100644 --- a/git-rebase--interactive.sh +++ b/git-rebase--interactive.sh @@ -493,25 +493,28 @@ do_next () {

Re: [PATCH] rebase -i: handle fixup of root commit correctly

2012-07-31 Thread Chris Webb
Chris Webb ch...@arachsys.com writes: If we have a conflict in the middle of a chain of fixup/squashes, as far as I can see, we have a HEAD with all the previous successful fixups applied, conflict markers for the current failed pick, and when the conflict has been resolved, git rebase

Re: [PATCH] rebase -i: handle fixup of root commit correctly

2012-07-31 Thread Johannes Sixt
Am 31.07.2012 14:48, schrieb Chris Webb: Chris Webbch...@arachsys.com writes: If we have a conflict in the middle of a chain of fixup/squashes, as far as I can see, we have a HEAD with all the previous successful fixups applied, conflict markers for the current failed pick, and when the

Re: [PATCH] rebase -i: handle fixup of root commit correctly

2012-07-31 Thread Chris Webb
Johannes Sixt j...@kdbg.org writes: One subtlety to watch out for is when commit messages are edited. That is, if you edit the proposed message at 'rebase --continue' after the first squash failed, is the new text preserved until the last squash? I *think* that previously that was the case.

[PATCH] rebase -i: handle fixup of root commit correctly

2012-07-24 Thread Chris Webb
There is a bug with git rebase -i --root when a fixup or squash line is applied to the new root. We attempt to amend the commit onto which they apply with git reset --soft HEAD^ followed by a normal commit. Unlike a real commit --amend, this sequence will fail against a root commit as it has no

Re: [PATCH] rebase -i: handle fixup of root commit correctly

2012-07-24 Thread Junio C Hamano
Chris Webb ch...@arachsys.com writes: There is a bug with git rebase -i --root when a fixup or squash line is applied to the new root. We attempt to amend the commit onto which they apply with git reset --soft HEAD^ followed by a normal commit. Unlike a real commit --amend, this sequence will