Re: [PATCH 2/2] handle empty notes gracefully

From: Johannes Schindelin <johannes.schindelin@gmx.de>
Date: Feb 6, 2009, 15:38 UTC
Message-ID: <alpine.DEB.1.00.0902061636320.7377@intel-tinevez-2-302>
In-Reply-To: <1233933543-28407-3-git-send-email-git@drmicha.warpmail.net>

Hi,

On Fri, 6 Feb 2009, Michael J Gruber wrote:

Show 17 quoted lines

> Currently, git-notes barfs when asked to show an empty (i.e.
> non-existing) note. Change this to explicitely say there is none.
> ---
>  git-notes.sh     |    2 ++
>  t/t3301-notes.sh |    2 +-
>  2 files changed, 3 insertions(+), 1 deletions(-)
> 
> diff --git a/git-notes.sh b/git-notes.sh
> index bfdbaa8..9cbad02 100755
> --- a/git-notes.sh
> +++ b/git-notes.sh
> @@ -58,6 +58,8 @@ edit)
>  		"$GIT_NOTES_REF" $NEW_HEAD $CURRENT_HEAD
>  ;;
>  show)
> +	git rev-parse -q --verify "$GIT_NOTES_REF":$COMMIT > /dev/null ||
> +		die "No note for commit $COMMIT."

This looks good.

Show 11 quoted lines

> diff --git a/t/t3301-notes.sh b/t/t3301-notes.sh
> index 4900dca..81d5028 100755
> --- a/t/t3301-notes.sh
> +++ b/t/t3301-notes.sh
> @@ -36,7 +36,7 @@ test_expect_success 'need valid notes ref' '
>  '
>  
>  # 1 indicates caught gracefully by die, 128 means git-show barfed
> -test_expect_failure 'handle empty notes gracefully' '
> +test_expect_success 'handle empty notes gracefully' '
>  	git notes show || test 1 = $?

Completely forgot to mention that I think you want to use test_must_fail here. And maybe you want to be more explicit, by specifying which commit's notes are expected not to be there.

We would not want the test to succeed for all the wrong reasons, would we?

Ciao, Dscho