From e06764c8ebf87a80737dc0a6198a013799f18e32 Mon Sep 17 00:00:00 2001 From: Paul Tan Date: Sat, 6 Jun 2015 19:46:11 +0800 Subject: am --abort: support aborting to unborn branch When git-am is first run on an unborn branch, no ORIG_HEAD is created. As such, any applied commits will remain even after a git am --abort. To be consistent with the behavior of git am --abort when it is not run from an unborn branch, we empty the index, and then destroy the branch pointed to by HEAD if there is no ORIG_HEAD. Signed-off-by: Paul Tan Signed-off-by: Junio C Hamano --- git-am.sh | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'git-am.sh') diff --git a/git-am.sh b/git-am.sh index f71d7bb997..1e4770ad71 100755 --- a/git-am.sh +++ b/git-am.sh @@ -514,7 +514,14 @@ then index_tree=$(git write-tree) && orig_head=$(git rev-parse --verify -q ORIG_HEAD || echo $empty_tree) && git read-tree -m -u $index_tree $orig_head - git reset ORIG_HEAD + if git rev-parse --verify -q ORIG_HEAD >/dev/null 2>&1 + then + git reset ORIG_HEAD + else + git read-tree $empty_tree + curr_branch=$(git symbolic-ref HEAD 2>/dev/null) && + git update-ref -d $curr_branch + fi fi rm -fr "$dotest" exit ;; -- cgit v1.2.3