summaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-06 11:46:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-08 20:06:44 (GMT)
commitf8da6801e2fb3e46a42031b860c6411ef76a0335 (patch)
tree2f6c105cb4997b6f42a49aee4e8a617729cd78c7 /git-am.sh
parent2c970c9ec3af9e162951a1b22d42c1a4dd9a8fed (diff)
downloadgit-f8da6801e2fb3e46a42031b860c6411ef76a0335.zip
git-f8da6801e2fb3e46a42031b860c6411ef76a0335.tar.gz
git-f8da6801e2fb3e46a42031b860c6411ef76a0335.tar.bz2
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh4
1 files changed, 1 insertions, 3 deletions
diff --git a/git-am.sh b/git-am.sh
index c5e139f..e0d067c 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -499,9 +499,7 @@ then
git read-tree --reset -u $head_tree $head_tree &&
index_tree=$(git write-tree) &&
git read-tree -m -u $index_tree $head_tree
- orig_head=$(cat "$GIT_DIR/ORIG_HEAD")
- git reset HEAD
- git update-ref ORIG_HEAD $orig_head
+ git read-tree $head_tree
;;
,t)
if test -f "$dotest/rebasing"