From: Christian Couder <christian.couder@gmail.com>
To: Alban Gruin <alban.gruin@gmail.com>
Cc: git <git@vger.kernel.org>, Thomas Gummerer <t.gummerer@gmail.com>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
Junio C Hamano <gitster@pobox.com>
Subject: Re: [RFC PATCH v1 5/6] stash: remove the second index in restore_untracked()
Date: Sat, 13 Jun 2020 21:41:42 +0200 [thread overview]
Message-ID: <CAP8UFD02QdZeq4Y4cGpLL3H6xeW1qUFXw-=9ONn3s8n9vRL8sA@mail.gmail.com> (raw)
In-Reply-To: <20200505104849.13602-6-alban.gruin@gmail.com>
On Tue, May 5, 2020 at 12:56 PM Alban Gruin <alban.gruin@gmail.com> wrote:
> diff --git a/builtin/stash.c b/builtin/stash.c
> index cbe37cd24b..1eafc1fe8d 100644
> --- a/builtin/stash.c
> +++ b/builtin/stash.c
> @@ -359,29 +359,16 @@ static int restore_untracked(struct object_id *u_tree)
> int res;
> struct child_process cp = CHILD_PROCESS_INIT;
>
> - /*
> - * We need to run restore files from a given index, but without
> - * affecting the current index, so we use GIT_INDEX_FILE with
> - * run_command to fork processes that will not interfere.
> - */
> - cp.git_cmd = 1;
> - argv_array_push(&cp.args, "read-tree");
> - argv_array_push(&cp.args, oid_to_hex(u_tree));
> - argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
> - stash_index_path.buf);
> - if (run_command(&cp)) {
> - remove_path(stash_index_path.buf);
> + if (reset_tree(u_tree, 0, 0))
> return -1;
> - }
>
> child_process_init(&cp);
Is this still necessary?
> cp.git_cmd = 1;
> argv_array_pushl(&cp.args, "checkout-index", "--all", NULL);
> - argv_array_pushf(&cp.env_array, "GIT_INDEX_FILE=%s",
> - stash_index_path.buf);
>
> res = run_command(&cp);
> - remove_path(stash_index_path.buf);
> + discard_cache();
> +
> return res;
> }
next prev parent reply other threads:[~2020-06-13 19:41 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-05-05 10:48 [RFC PATCH v1 0/6] stash: drop usage of a second index Alban Gruin
2020-05-05 10:48 ` [RFC PATCH v1 1/6] stash: mark `i_tree' in reset_tree() const Alban Gruin
2020-06-13 8:09 ` Christian Couder
2020-05-05 10:48 ` [RFC PATCH v1 2/6] stash: remove the second index in stash_working_tree() Alban Gruin
2020-06-13 8:52 ` Christian Couder
2020-06-13 18:00 ` Alban Gruin
2020-06-15 12:02 ` Christian Couder
2020-05-05 10:48 ` [RFC PATCH v1 3/6] stash: remove the second index in stash_patch() Alban Gruin
2020-06-13 9:38 ` Christian Couder
2020-06-13 10:04 ` Christian Couder
2020-05-05 10:48 ` [RFC PATCH v1 4/6] stash: remove the second index in save_untracked_files() Alban Gruin
2020-06-13 18:51 ` Christian Couder
2020-05-05 10:48 ` [RFC PATCH v1 5/6] stash: remove the second index in restore_untracked() Alban Gruin
2020-06-13 19:41 ` Christian Couder [this message]
2020-05-05 10:48 ` [RFC PATCH v1 6/6] stash: remove `stash_index_path' Alban Gruin
2020-06-04 12:07 ` [RFC PATCH v1 0/6] stash: drop usage of a second index Alban Gruin
2020-06-13 7:52 ` Christian Couder
2020-06-25 12:35 ` Alban Gruin
2020-06-15 15:27 ` SZEDER Gábor
2020-06-15 21:50 ` SZEDER Gábor
2020-06-16 7:06 ` SZEDER Gábor
2020-06-17 20:04 ` Junio C Hamano
2020-06-17 21:31 ` Alban Gruin
2020-06-30 15:15 ` [PATCH v2 " Alban Gruin
2020-06-30 15:15 ` [PATCH v2 1/6] stash: mark `i_tree' in reset_tree() const Alban Gruin
2020-06-30 15:15 ` [PATCH v2 2/6] stash: remove the second index in stash_working_tree() Alban Gruin
2020-06-30 15:15 ` [PATCH v2 3/6] stash: remove the second index in stash_patch() Alban Gruin
2020-06-30 15:15 ` [PATCH v2 4/6] stash: remove the second index in save_untracked_files() Alban Gruin
2020-06-30 15:15 ` [PATCH v2 5/6] stash: remove the second index in restore_untracked() Alban Gruin
2020-07-31 13:45 ` Christian Couder
2020-07-31 16:16 ` Alban Gruin
2020-06-30 15:15 ` [PATCH v2 6/6] stash: remove `stash_index_path' Alban Gruin
2020-07-31 13:53 ` [PATCH v2 0/6] stash: drop usage of a second index Christian Couder
2020-07-31 16:51 ` [PATCH v3 " Alban Gruin
2020-07-31 16:51 ` [PATCH v3 1/6] stash: mark `i_tree' in reset_tree() const Alban Gruin
2020-07-31 18:28 ` Junio C Hamano
2020-07-31 16:51 ` [PATCH v3 2/6] stash: remove the second index in stash_working_tree() Alban Gruin
2020-07-31 18:26 ` Junio C Hamano
2020-08-02 2:20 ` Junio C Hamano
2020-07-31 16:51 ` [PATCH v3 3/6] stash: remove the second index in stash_patch() Alban Gruin
2020-07-31 16:51 ` [PATCH v3 4/6] stash: remove the second index in save_untracked_files() Alban Gruin
2020-07-31 16:51 ` [PATCH v3 5/6] stash: remove the second index in restore_untracked() Alban Gruin
2020-07-31 16:51 ` [PATCH v3 6/6] stash: remove `stash_index_path' Alban Gruin
2020-07-31 17:48 ` [PATCH v3 0/6] stash: drop usage of a second index Junio C Hamano
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='CAP8UFD02QdZeq4Y4cGpLL3H6xeW1qUFXw-=9ONn3s8n9vRL8sA@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=alban.gruin@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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.
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).