aboutsummaryrefslogtreecommitdiff
path: root/git-am.sh
diff options
context:
space:
mode:
authorPaul Tan <pyokagan@gmail.com>2015-06-06 19:46:12 +0800
committerJunio C Hamano <gitster@pobox.com>2015-06-08 13:14:04 -0700
commit6ea3b67b4e3f4a09561a26ca42af1492b3b48c95 (patch)
tree6f7bfe24a83d37a90c3efc9d05e29579cd93d58d /git-am.sh
parente06764c8ebf87a80737dc0a6198a013799f18e32 (diff)
downloadgit-6ea3b67b4e3f4a09561a26ca42af1492b3b48c95.tar.gz
git-6ea3b67b4e3f4a09561a26ca42af1492b3b48c95.tar.xz
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>
Diffstat (limited to 'git-am.sh')
-rwxr-xr-xgit-am.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/git-am.sh b/git-am.sh
index 1e4770ad7..f594ed081 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