From: Alban Gruin <alban.gruin@gmail.com>
To: git@vger.kernel.org
Cc: Christian Couder <christian.couder@gmail.com>,
Thomas Gummerer <t.gummerer@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Son Luong Ngoc <sluongng@gmail.com>,
Alban Gruin <alban.gruin@gmail.com>
Subject: [PATCH v2 5/6] stash: remove the second index in restore_untracked()
Date: Tue, 30 Jun 2020 17:15:57 +0200 [thread overview]
Message-ID: <20200630151558.20975-6-alban.gruin@gmail.com> (raw)
In-Reply-To: <20200630151558.20975-1-alban.gruin@gmail.com>
This removes the second index used in restore_untracked().
The call to `read-tree' is replaced by reset_tree() with the appropriate
parameters (no update, no reset). The environment of `checkout-index'
is no longer modified, and the cache is discarded when it exists.
In do_apply_stash(), the changes are a bit more involved: to avoid
conflicts with the merged index, restore_untracked() is moved after
merge_recursive_generic().
This introduces another problem: the files that were untracked once are
now added to the index, and update_index() would add back those files in
the index. To avoid this, get_newly_staged() is moved before
restore_untracked().
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
---
builtin/stash.c | 47 +++++++++++++++++------------------------------
1 file changed, 17 insertions(+), 30 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c
index cbe37cd24b..d5077a27d9 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -359,29 +359,15 @@ 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);
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;
}
@@ -395,6 +381,7 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
struct object_id index_tree;
struct commit *result;
const struct object_id *bases[1];
+ struct strbuf newly_staged = STRBUF_INIT;
read_cache_preload(NULL);
if (refresh_and_write_cache(REFRESH_QUIET, 0, 0))
@@ -433,9 +420,6 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
}
}
- if (info->has_u && restore_untracked(&info->u_tree))
- return error(_("could not restore untracked files from stash"));
-
init_merge_options(&o, the_repository);
o.branch1 = "Updated upstream";
@@ -463,24 +447,27 @@ static int do_apply_stash(const char *prefix, struct stash_info *info,
return ret;
}
+ if (!has_index && get_newly_staged(&newly_staged, &c_tree)) {
+ strbuf_release(&newly_staged);
+ return -1;
+ }
+
+ if (info->has_u && restore_untracked(&info->u_tree)) {
+ strbuf_release(&newly_staged);
+ return error(_("could not restore untracked files from stash"));
+ }
+
if (has_index) {
if (reset_tree(&index_tree, 0, 0))
return -1;
} else {
- struct strbuf out = STRBUF_INIT;
-
- if (get_newly_staged(&out, &c_tree)) {
- strbuf_release(&out);
- return -1;
- }
-
if (reset_tree(&c_tree, 0, 1)) {
- strbuf_release(&out);
+ strbuf_release(&newly_staged);
return -1;
}
- ret = update_index(&out);
- strbuf_release(&out);
+ ret = update_index(&newly_staged);
+ strbuf_release(&newly_staged);
if (ret)
return -1;
--
2.20.1
next prev parent reply other threads:[~2020-06-30 15:16 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
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 ` Alban Gruin [this message]
2020-07-31 13:45 ` [PATCH v2 5/6] stash: remove the second index in restore_untracked() 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
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=20200630151558.20975-6-alban.gruin@gmail.com \
--to=alban.gruin@gmail.com \
--cc=christian.couder@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=sluongng@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).