Re: [PATCH 6/6] am --abort: keep unrelated commits on unborn branch
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 8, 2015, 20:13 UTC
- Message-ID
- <xmqq4mmi9cwb.fsf@gitster.dls.corp.google.com>
- In-Reply-To
- <1433591172-27077-7-git-send-email-pyokagan@gmail.com>
Paul Tan <pyokagan@gmail.com> writes:
Show 8 quoted lines
> 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.
Shouldn't we then be checking that the HEAD is still unborn if this file is found and says that there was no history in the beginning, in order to give the "am on top of unborn" workflow the same degree of safety? Or is the fact that the file is empty sufficient not to match any valid commit name that is 40-hex?
Show 44 quoted lines
> 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>
> ---
> git-am.sh | 2 +-
> t/t4151-am-abort.sh | 11 +++++++++++
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
> diff --git a/git-am.sh b/git-am.sh
> index 95f90a0..4324bb1 100755
> --- a/git-am.sh
> +++ b/git-am.sh
> @@ -87,7 +87,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 b2a7fc5..833e7b2 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