| commit | f8da6801e2fb3e46a42031b860c6411ef76a0335 | |
| author | Paul Tan <pyokagan@gmail.com> | |
| Sat, 6 Jun 2015 11:46:09 +0000 (6 19:46 +0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 8 Jun 2015 20:06:44 +0000 (8 13:06 -0700) | ||
| tree | 2f6c105cb4997b6f42a49aee4e8a617729cd78c7 | treesnapshot (tar.gz zip) |
| parent | 2c970c9ec3af9e162951a1b22d42c1a4dd9a8fed | commitdiff |
am --skip: support skipping while on unborn branch
When git am --skip is run, git am will copy HEAD's tree entries to the
index with "git reset HEAD". However, on an unborn branch, HEAD does not
point to a tree, so "git reset HEAD" will fail.
Fix this by treating HEAD as en empty tree when we are on an unborn
branch.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
When git am --skip is run, git am will copy HEAD's tree entries to the
index with "git reset HEAD". However, on an unborn branch, HEAD does not
point to a tree, so "git reset HEAD" will fail.
Fix this by treating HEAD as en empty tree when we are on an unborn
branch.
Signed-off-by: Paul Tan <pyokagan@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-am.sh | diffblobblamehistory | |
| t/t4151-am-abort.sh | diffblobblamehistory |