| commit | 2147f844ed13fa5052161d38f8cf7dca6f83c06e | |
| author | Chris Webb <chris@arachsys.com> | |
| Tue, 24 Jul 2012 12:17:03 +0000 (24 13:17 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Tue, 24 Jul 2012 16:03:33 +0000 (24 09:03 -0700) | ||
| tree | 6842a14d47b281ce5bc8f3ade1f0589485c35bf5 | treesnapshot (tar.gz zip) |
| parent | 994fd91d1fd5e9feffc88ab7db19e9c9461b4543 | commitdiff |
rebase -i: handle fixup of root commit correctly
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 parent.
Fix rebase -i to use commit --amend for fixup and squash instead, and
add a test for the case of a fixup of the root commit.
Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 parent.
Fix rebase -i to use commit --amend for fixup and squash instead, and
add a test for the case of a fixup of the root commit.
Signed-off-by: Chris Webb <chris@arachsys.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-rebase--interactive.sh | diffblobblamehistory | |
| t/t3404-rebase-interactive.sh | diffblobblamehistory |