]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 2c970c9) | patch
am --skip: support skipping while on unborn branch
authorPaul Tan <pyokagan@gmail.com>
Sat, 6 Jun 2015 11:46:09 +0000 (19:46 +0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 8 Jun 2015 20:06:44 +0000 (13:06 -0700)
commitf8da6801e2fb3e46a42031b860c6411ef76a0335
tree2f6c105cb4997b6f42a49aee4e8a617729cd78c7tree | snapshot
parent2c970c9ec3af9e162951a1b22d42c1a4dd9a8fedcommit | diff
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>
git-am.sh diff | blob | blame | history
t/t4151-am-abort.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.