From: Paul Tan Date: Sat, 06 Jun 2015 11:46:09 GMT Subject: [PATCH 3/6] am --skip: support skipping while on unborn branch Message-ID: <1433591172-27077-4-git-send-email-pyokagan@gmail.com> In-Reply-To: <1433591172-27077-1-git-send-email-pyokagan@gmail.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 --- git-am.sh | 4 +--- t/t4151-am-abort.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/git-am.sh b/git-am.sh index c847b58..67f4f25 100755 --- a/git-am.sh +++ b/git-am.sh @@ -509,9 +509,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" diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh index b618ee0..ea4a49e 100755 --- a/t/t4151-am-abort.sh +++ b/t/t4151-am-abort.sh @@ -92,4 +92,14 @@ test_expect_success 'am -3 stops on conflict on unborn branch' ' test 4 = "$(cat otherfile-4)" ' +test_expect_success 'am -3 --skip clears index on unborn branch' ' + test_path_is_dir .git/rebase-apply && + echo tmpfile >tmpfile && + git add tmpfile && + git am --skip && + test -z "$(git ls-files)" && + test_path_is_missing otherfile-4 && + test_path_is_missing tmpfile +' + test_done -- 2.1.4