summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-06 11:46:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-06-08 20:14:04 (GMT)
commit6ea3b67b4e3f4a09561a26ca42af1492b3b48c95 (patch)
tree6f7bfe24a83d37a90c3efc9d05e29579cd93d58d
parente06764c8ebf87a80737dc0a6198a013799f18e32 (diff)
downloadgit-6ea3b67b4e3f4a09561a26ca42af1492b3b48c95.zip
git-6ea3b67b4e3f4a09561a26ca42af1492b3b48c95.tar.gz
git-6ea3b67b4e3f4a09561a26ca42af1492b3b48c95.tar.bz2
am --abort: keep unrelated commits on unborn branch
Since 7b3b7e3 (am --abort: keep unrelated commits since the last failure and warn, 2010-12-21), git-am would refuse to rewind HEAD if commits were made since the last git-am failure. This check was implemented in safe_to_abort(), which checked to see if HEAD's hash matched the abort-safety file. However, this check was skipped if the abort-safety file was empty, which can happen if git-am failed while on an unborn branch. As such, if any commits were made since then, they would be discarded. Fix this by carrying on the abort safety check even if the abort-safety file is empty. Signed-off-by: Paul Tan <pyokagan@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xgit-am.sh2
-rwxr-xr-xt/t4151-am-abort.sh11
2 files changed, 12 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 1e4770a..f594ed0 100755
--- a/git-am.sh
+++ b/git-am.sh
@@ -86,7 +86,7 @@ safe_to_abort () {
return 1
fi
- if ! test -s "$dotest/abort-safety"
+ if ! test -f "$dotest/abort-safety"
then
return 0
fi
diff --git a/t/t4151-am-abort.sh b/t/t4151-am-abort.sh
index dc6b3b0..1274f75 100755
--- a/t/t4151-am-abort.sh
+++ b/t/t4151-am-abort.sh
@@ -142,4 +142,15 @@ test_expect_success 'am -3 --abort on unborn branch removes applied commits' '
test refs/heads/orphan = "$(git symbolic-ref HEAD)"
'
+test_expect_success 'am --abort on unborn branch will keep local commits intact' '
+ git checkout -f --orphan orphan &&
+ git reset &&
+ test_must_fail git am 0004-*.patch &&
+ test_commit unrelated2 &&
+ git rev-parse HEAD >expect &&
+ git am --abort &&
+ git rev-parse HEAD >actual &&
+ test_cmp expect actual
+'
+
test_done