git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Slavica Djukic <slavicadj.ip2018@gmail.com>
Cc: Johannes.Schindelin@gmx.de, git@vger.kernel.org, slawica92@hotmail.com
Subject: Re: [PATCH v2 2/2] [Outreachy] stash: tolerate missing user identity
Date: Fri, 16 Nov 2018 14:35:22 +0900	[thread overview]
Message-ID: <xmqqwopdk2jp.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20181114222802.10928-1-slawica92@hotmail.com> (Slavica Djukic's message of "Wed, 14 Nov 2018 23:28:02 +0100")

Slavica Djukic <slavicadj.ip2018@gmail.com> writes:

>  git-stash.sh     | 17 +++++++++++++++++
>  t/t3903-stash.sh |  2 +-
>  2 files changed, 18 insertions(+), 1 deletion(-)
>
> diff --git a/git-stash.sh b/git-stash.sh
> index 94793c1a9..789ce2f41 100755
> --- a/git-stash.sh
> +++ b/git-stash.sh
> @@ -55,6 +55,20 @@ untracked_files () {
>  	git ls-files -o $z $excl_opt -- "$@"
>  }
>  
> +prepare_fallback_ident () {
> +	if ! git -c user.useconfigonly=yes var GIT_COMMITTER_IDENT >/dev/null 2>&1
> +	then
> +		GIT_AUTHOR_NAME="git stash"
> +		GIT_AUTHOR_EMAIL=git@stash
> +		GIT_COMMITTER_NAME="git stash"
> +		GIT_COMMITTER_EMAIL=git@stash
> +		export GIT_AUTHOR_NAME
> +		export GIT_AUTHOR_EMAIL
> +		export GIT_COMMITTER_NAME
> +		export GIT_COMMITTER_EMAIL
> +	fi
> +}
> +
>  clear_stash () {
>  	if test $# != 0
>  	then
> @@ -67,6 +81,9 @@ clear_stash () {
>  }
>  
>  create_stash () {
> +
> +	prepare_fallback_ident
> +
>  	stash_msg=
>  	untracked=
>  	while test $# != 0

That looks like a sensible implementation to me.

> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index bab8bec67..0b0814421 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -1096,7 +1096,7 @@ test_expect_success 'stash -- <subdir> works with binary files' '
>  	test_path_is_file subdir/untracked
>  '
>  
> -test_expect_failure 'stash works when user.name and user.email are not set' '
> +test_expect_success 'stash works when user.name and user.email are not set' '

This line claims to the readers of patch that the known breakage
this known test piece demonstrated has been corrected, but they need
to refresh their memory by going back to the previous patch to see
if this "failure-to-success" flipping is done to the right test
piece, and what exactly the test piece tested to see the existing
breakage, because all the interesting part of the test are chomped
outside the post-context of this hunk.

Unless the fix is fairly complex, adding ought-to-succeed tests that
expect success that break when the code change gets omitted from the
patch in the same patch as the fix itself (i.e. squash patch 1/2 and
patch 2/2 into a single patch) would be more helpful for the readers
(it also helps cherry-picking the fix later to earlier maintenance
tracks if it becomes necessary).

>  	git reset &&
>  	git var GIT_COMMITTER_IDENT >expected &&
>  	>1 &&

  reply	other threads:[~2018-11-16  5:35 UTC|newest]

Thread overview: 41+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-10-23 16:29 [PATCH 1/3] [Outreachy] t3903-stash: test without configured user name Slavica
2018-10-23 18:52 ` Christian Couder
2018-10-24 13:56   ` Slavica
2018-10-25  4:44     ` Junio C Hamano
2018-10-23 19:19 ` Eric Sunshine
2018-10-24  2:48 ` Junio C Hamano
2018-10-24  7:39   ` Johannes Schindelin
2018-10-24  9:58     ` Junio C Hamano
2018-10-24 15:18       ` Johannes Schindelin
2018-10-25  4:17         ` Junio C Hamano
2018-10-24 20:01 ` [PATCH v2 " Slavica Djukic
2018-10-24 20:05   ` Slavica Djukic
2018-10-24 20:25     ` Eric Sunshine
2018-10-25  4:48       ` Junio C Hamano
2018-10-25 19:13   ` [PATCH v3 " Slavica Djukic
2018-10-25 19:20     ` Slavica Djukic
2018-10-26  1:13       ` Junio C Hamano
2018-10-30 13:04         ` Slavica Djukic
2018-11-01 11:55       ` [PATCH 0/3] [Outreachy] make stash work if user.name and user.email are not configured Slavica Djukic
2018-11-01 11:58         ` [PATCH 1/3][Outreachy] t3903-stash: test without configured user.name and user.email Slavica Djukic
2018-11-01 14:53           ` Christian Couder
2018-11-02  4:59           ` [PATCH 2+3/3] stash: tolerate missing user identity Junio C Hamano
2018-11-01 12:00         ` [PATCH 2/3] [Outreachy] ident: introduce set_fallback_ident() function Slavica Djukic
2018-11-02  3:01           ` Junio C Hamano
2018-11-02  4:41             ` Junio C Hamano
2018-11-02  5:22               ` Junio C Hamano
2018-11-01 12:02         ` [PATCH 3/3] [Outreachy] stash: use " Slavica Djukic
2018-11-14 22:12         ` [PATCH v2 0/2] [Outreachy] make stash work if user.name and user.email are not configured Slavica Djukic
2018-11-14 22:25           ` [PATCH v2 1/2] [Outreachy] t3903-stash: test without configured user.name and user.email Slavica Djukic
2018-11-15 12:37             ` Johannes Schindelin
2018-11-16  5:55             ` Junio C Hamano
2018-11-16  6:26               ` Junio C Hamano
2018-11-16  6:32               ` Junio C Hamano
2018-11-16  8:28               ` Slavica Djukic
2018-11-16 10:12                 ` Junio C Hamano
2018-11-17 18:47                   ` Slavica Djukic
2018-11-18  6:28                     ` Junio C Hamano
2018-11-14 22:28           ` [PATCH v2 2/2] [Outreachy] stash: tolerate missing user identity Slavica Djukic
2018-11-16  5:35             ` Junio C Hamano [this message]
2018-11-18 13:29           ` [PATCH 0/1 v3] make stash work if user.name and user.email are not configured Slavica Djukic
2018-11-18 13:44             ` [PATCH 1/1 v3] stash: tolerate missing user identity Slavica Djukic

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqwopdk2jp.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=slavicadj.ip2018@gmail.com \
    --cc=slawica92@hotmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).