From: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
To: git@vger.kernel.org
Cc: t.gummerer@gmail.com
Subject: [PATCH v10 21/21] stash: replace all `write-tree` child processes with API calls
Date: Mon, 15 Oct 2018 01:11:27 +0300 [thread overview]
Message-ID: <10a62394e78991259425832e9af0656bbada4c45.1539553398.git.ungureanupaulsebastian@gmail.com> (raw)
In-Reply-To: <cover.1539553398.git.ungureanupaulsebastian@gmail.com>
This commit replaces spawning `git write-tree` with API calls.
Signed-off-by: Paul-Sebastian Ungureanu <ungureanupaulsebastian@gmail.com>
---
builtin/stash.c | 41 ++++++++++++-----------------------------
1 file changed, 12 insertions(+), 29 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c
index d2365ada2e..651d05c820 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -947,9 +947,8 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
{
int ret = 0;
struct strbuf untracked_msg = STRBUF_INIT;
- struct strbuf out = STRBUF_INIT;
struct child_process cp_upd_index = CHILD_PROCESS_INIT;
- struct child_process cp_write_tree = CHILD_PROCESS_INIT;
+ struct index_state istate = { NULL };
cp_upd_index.git_cmd = 1;
argv_array_pushl(&cp_upd_index.args, "update-index", "-z", "--add",
@@ -964,15 +963,11 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
goto done;
}
- cp_write_tree.git_cmd = 1;
- argv_array_push(&cp_write_tree.args, "write-tree");
- argv_array_pushf(&cp_write_tree.env_array, "GIT_INDEX_FILE=%s",
- stash_index_path.buf);
- if (pipe_command(&cp_write_tree, NULL, 0, &out, 0,NULL, 0)) {
+ if (write_index_as_tree(&info->u_tree, &istate, stash_index_path.buf, 0,
+ NULL)) {
ret = -1;
goto done;
}
- get_oid_hex(out.buf, &info->u_tree);
if (commit_tree(untracked_msg.buf, untracked_msg.len,
&info->u_tree, NULL, &info->u_commit, NULL, NULL)) {
@@ -981,8 +976,8 @@ static int save_untracked_files(struct stash_info *info, struct strbuf *msg,
}
done:
+ discard_index(&istate);
strbuf_release(&untracked_msg);
- strbuf_release(&out);
remove_path(stash_index_path.buf);
return ret;
}
@@ -991,11 +986,10 @@ static int stash_patch(struct stash_info *info, struct pathspec ps,
struct strbuf *out_patch, int quiet)
{
int ret = 0;
- struct strbuf out = STRBUF_INIT;
struct child_process cp_read_tree = CHILD_PROCESS_INIT;
struct child_process cp_add_i = CHILD_PROCESS_INIT;
- struct child_process cp_write_tree = CHILD_PROCESS_INIT;
struct child_process cp_diff_tree = CHILD_PROCESS_INIT;
+ struct index_state istate = { NULL };
remove_path(stash_index_path.buf);
@@ -1021,17 +1015,12 @@ static int stash_patch(struct stash_info *info, struct pathspec ps,
}
/* State of the working tree. */
- cp_write_tree.git_cmd = 1;
- argv_array_push(&cp_write_tree.args, "write-tree");
- argv_array_pushf(&cp_write_tree.env_array, "GIT_INDEX_FILE=%s",
- stash_index_path.buf);
- if (pipe_command(&cp_write_tree, NULL, 0, &out, 0,NULL, 0)) {
+ if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
+ NULL)) {
ret = -1;
goto done;
}
- get_oid_hex(out.buf, &info->w_tree);
-
cp_diff_tree.git_cmd = 1;
argv_array_pushl(&cp_diff_tree.args, "diff-tree", "-p", "HEAD",
oid_to_hex(&info->w_tree), "--", NULL);
@@ -1047,7 +1036,7 @@ static int stash_patch(struct stash_info *info, struct pathspec ps,
}
done:
- strbuf_release(&out);
+ discard_index(&istate);
remove_path(stash_index_path.buf);
return ret;
}
@@ -1057,9 +1046,8 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
int ret = 0;
struct rev_info rev;
struct child_process cp_upd_index = CHILD_PROCESS_INIT;
- struct child_process cp_write_tree = CHILD_PROCESS_INIT;
- struct strbuf out = STRBUF_INIT;
struct strbuf diff_output = STRBUF_INIT;
+ struct index_state istate = { NULL };
set_alternate_index_output(stash_index_path.buf);
if (reset_tree(&info->i_tree, 0, 0)) {
@@ -1099,20 +1087,15 @@ static int stash_working_tree(struct stash_info *info, struct pathspec ps)
goto done;
}
- cp_write_tree.git_cmd = 1;
- argv_array_push(&cp_write_tree.args, "write-tree");
- argv_array_pushf(&cp_write_tree.env_array, "GIT_INDEX_FILE=%s",
- stash_index_path.buf);
- if (pipe_command(&cp_write_tree, NULL, 0, &out, 0,NULL, 0)) {
+ if (write_index_as_tree(&info->w_tree, &istate, stash_index_path.buf, 0,
+ NULL)) {
ret = -1;
goto done;
}
- get_oid_hex(out.buf, &info->w_tree);
-
done:
+ discard_index(&istate);
UNLEAK(rev);
- strbuf_release(&out);
object_array_clear(&rev.pending);
strbuf_release(&diff_output);
remove_path(stash_index_path.buf);
--
2.19.0.rc0.23.g10a62394e7
next prev parent reply other threads:[~2018-10-14 22:13 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <https://public-inbox.org/git/cover.1537913094.git.ungureanupaulsebastian@gmail.com/>
2018-10-14 22:11 ` [PATCH v10 00/21] Convert "git stash" to C builtin Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 01/21] sha1-name.c: add `get_oidf()` which acts like `get_oid()` Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 02/21] strbuf.c: add `strbuf_join_argv()` Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 03/21] stash: improve option parsing test coverage Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 04/21] t3903: modernize style Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 05/21] stash: rename test cases to be more descriptive Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 06/21] stash: add tests for `git stash show` config Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 07/21] stash: mention options in `show` synopsis Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 08/21] stash: convert apply to builtin Paul-Sebastian Ungureanu
2018-10-15 9:10 ` Johannes Schindelin
2018-10-15 20:32 ` Thomas Gummerer
2018-10-14 22:11 ` [PATCH v10 09/21] stash: convert drop and clear " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 10/21] stash: convert branch " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 11/21] stash: convert pop " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 12/21] stash: convert list " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 13/21] stash: convert show " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 14/21] stash: convert store " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 15/21] stash: convert create " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 16/21] stash: convert push " Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 17/21] stash: make push -q quiet Paul-Sebastian Ungureanu
2018-10-14 22:11 ` [PATCH v10 18/21] stash: convert save to builtin Paul-Sebastian Ungureanu
2018-10-15 22:05 ` Thomas Gummerer
2018-10-14 22:11 ` [PATCH v10 19/21] stash: convert `stash--helper.c` into `stash.c` Paul-Sebastian Ungureanu
2018-10-15 22:03 ` Thomas Gummerer
2018-10-14 22:11 ` [PATCH v10 20/21] stash: optimize `get_untracked_files()` and `check_changes()` Paul-Sebastian Ungureanu
2018-10-14 22:11 ` Paul-Sebastian Ungureanu [this message]
2018-10-15 22:10 ` [PATCH v10 00/21] Convert "git stash" to C builtin Thomas Gummerer
2018-10-16 3:41 ` Junio C Hamano
2018-10-16 10:22 ` Johannes Schindelin
2018-10-16 19:59 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=10a62394e78991259425832e9af0656bbada4c45.1539553398.git.ungureanupaulsebastian@gmail.com \
--to=ungureanupaulsebastian@gmail.com \
--cc=git@vger.kernel.org \
--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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.