From: Junio C Hamano <gitster@pobox.com>
To: Thomas Gummerer <t.gummerer@gmail.com>
Cc: Grzegorz Rajchman <rayman17@gmail.com>, git@vger.kernel.org
Subject: Re: [PATCH v3] stash: make sure we have a valid index before writing it
Date: Thu, 14 Nov 2019 11:07:24 +0900 [thread overview]
Message-ID: <xmqqmucz9pnn.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20191113150136.GB3047@cat> (Thomas Gummerer's message of "Wed, 13 Nov 2019 15:01:36 +0000")
Thomas Gummerer <t.gummerer@gmail.com> writes:
> Subject: [PATCH v3] stash: make sure we have a valid index before writing it
>
> In 'do_apply_stash()' we refresh the index in the end. Since
> 34933d0eff ("stash: make sure to write refreshed cache", 2019-09-11),
> we also write that refreshed index when --quiet is given to 'git stash
> apply'.
>
> However if '--index' is not given to 'git stash apply', we also
> discard the index in the else clause just before. We need to do so
> because we use an external 'git update-index --add --stdin', which
> leads to an out of date in-core index.
>
> Later we call 'refresh_and_write_cache', which now leads to writing
> the discarded index, which means we essentially write an empty index
> file. This is obviously not correct, or the behaviour the user
> wanted. We should not modify the users index without being asked to
> do so.
>
> Make sure to re-read the index after discarding the current in-core
> index, to avoid dealing with outdated information. Instead we could
> also drop the 'discard_cache()' + 'read_cache()', however that would
> make it easy to fall into the same trap as 34933d0eff did, so it's
> better to avoid that.
>
> We can also drop the 'refresh_and_write_cache' completely in the quiet
> case. Previously in legacy stash we relied on 'git status' to refresh
> the index after calling 'git read-tree' when '--index' was passed to
> 'git apply'. However the 'reset_tree()' call that replaced 'git
> read-tree' always passes options that are equivalent to '-m', making
> the refresh of the index unnecessary.
>
> Reported-by: Grzegorz Rajchman <rayman17@gmail.com>
> Signed-off-by: Thomas Gummerer <t.gummerer@gmail.com>
> ---
Thanks. This looks good and minimal ;-)
> builtin/stash.c | 7 +++----
> t/t3903-stash.sh | 7 ++++++-
> 2 files changed, 9 insertions(+), 5 deletions(-)
>
> diff --git a/builtin/stash.c b/builtin/stash.c
> index ab30d1e920..372fbdb7ac 100644
> --- a/builtin/stash.c
> +++ b/builtin/stash.c
> @@ -481,13 +481,12 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
> if (ret)
> return -1;
>
> + /* read back the result of update_index() back from the disk */
> discard_cache();
> + read_cache();
> }
>
> - if (quiet) {
> - if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
> - warning("could not refresh index");
> - } else {
> + if (!quiet) {
> struct child_process cp = CHILD_PROCESS_INIT;
>
> /*
> diff --git a/t/t3903-stash.sh b/t/t3903-stash.sh
> index 392954d6dd..9de1c3616a 100755
> --- a/t/t3903-stash.sh
> +++ b/t/t3903-stash.sh
> @@ -232,8 +232,11 @@ test_expect_success 'save -q is quiet' '
> test_must_be_empty output.out
> '
>
> -test_expect_success 'pop -q is quiet' '
> +test_expect_success 'pop -q works and is quiet' '
> git stash pop -q >output.out 2>&1 &&
> + echo bar >expect &&
> + git show :file >actual &&
> + test_cmp expect actual &&
> test_must_be_empty output.out
> '
>
> @@ -242,6 +245,8 @@ test_expect_success 'pop -q --index works and is quiet' '
> git add file &&
> git stash save --quiet &&
> git stash pop -q --index >output.out 2>&1 &&
> + git diff-files file2 >file2.diff &&
> + test_must_be_empty file2.diff &&
> test foo = "$(git show :file)" &&
> test_must_be_empty output.out
> '
next prev parent reply other threads:[~2019-11-14 2:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-07 10:36 [BUG] git stash pop --quiet deletes files in git 2.24.0 Grzegorz Rajchman
2019-11-07 18:49 ` Thomas Gummerer
2019-11-08 2:32 ` Junio C Hamano
2019-11-08 16:59 ` Thomas Gummerer
2019-11-10 6:11 ` Junio C Hamano
2019-11-11 19:56 ` Thomas Gummerer
2019-11-12 5:21 ` Junio C Hamano
2019-11-13 11:15 ` Thomas Gummerer
2019-11-13 13:31 ` Junio C Hamano
2019-11-13 15:01 ` [PATCH v3] stash: make sure we have a valid index before writing it Thomas Gummerer
2019-11-14 2:07 ` Junio C Hamano [this message]
2019-11-13 11:17 ` [PATCH v2 1/2] t3903: avoid git commands inside command substitution Thomas Gummerer
2019-11-13 11:17 ` [PATCH v2 2/2] stash: make sure we have a valid index before writing it Thomas Gummerer
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqmucz9pnn.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=rayman17@gmail.com \
--cc=t.gummerer@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).