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 6/6] stash: remove `stash_index_path'
Date: Tue, 30 Jun 2020 17:15:58 +0200 [thread overview]
Message-ID: <20200630151558.20975-7-alban.gruin@gmail.com> (raw)
In-Reply-To: <20200630151558.20975-1-alban.gruin@gmail.com>
Since stash no longer uses a second index, `stash_index_path' is now
unused, and can be dropped.
Signed-off-by: Alban Gruin <alban.gruin@gmail.com>
---
builtin/stash.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/builtin/stash.c b/builtin/stash.c
index d5077a27d9..f1b3c0d2f8 100644
--- a/builtin/stash.c
+++ b/builtin/stash.c
@@ -88,7 +88,6 @@ static const char * const git_stash_save_usage[] = {
};
static const char *ref_stash = "refs/stash";
-static struct strbuf stash_index_path = STRBUF_INIT;
/*
* w_commit is set to the commit containing the working tree
@@ -1505,8 +1504,6 @@ static int save_stash(int argc, const char **argv, const char *prefix)
int cmd_stash(int argc, const char **argv, const char *prefix)
{
- pid_t pid = getpid();
- const char *index_file;
struct argv_array args = ARGV_ARRAY_INIT;
struct option options[] = {
@@ -1523,10 +1520,6 @@ int cmd_stash(int argc, const char **argv, const char *prefix)
argc = parse_options(argc, argv, prefix, options, git_stash_usage,
PARSE_OPT_KEEP_UNKNOWN | PARSE_OPT_KEEP_DASHDASH);
- index_file = get_index_file();
- strbuf_addf(&stash_index_path, "%s.stash.%" PRIuMAX, index_file,
- (uintmax_t)pid);
-
if (!argc)
return !!push_stash(0, NULL, prefix, 0);
else if (!strcmp(argv[0], "apply"))
--
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 ` [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 ` Alban Gruin [this message]
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-7-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).