From: Christian Couder <christian.couder@gmail.com>
To: git <git@vger.kernel.org>
Cc: "Junio C Hamano" <gitster@pobox.com>,
"Nguyen Thai Ngoc Duy" <pclouds@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>,
"Christian Couder" <chriscool@tuxfamily.org>
Subject: Re: [PATCH v3 00/21] Add configuration options for split-index
Date: Mon, 26 Dec 2016 11:29:01 +0100 [thread overview]
Message-ID: <CAP8UFD3dam_tfV7J61Oqqtna-LiGAnZARzSG4CkyEk6nKDWsWg@mail.gmail.com> (raw)
In-Reply-To: <20161226102222.17150-1-chriscool@tuxfamily.org>
On Mon, Dec 26, 2016 at 11:22 AM, Christian Couder
<christian.couder@gmail.com> wrote:
>
> Highlevel view of the patches in the series
> ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>
> Except for patch 1/21, there are 3 big steps, one for each new
> configuration variable introduced.
>
> There only a few small differences between this patch series and the
> v2 patch series sent a few weeks ago. Only two commits have been
> changed a little, as suggested by Duy.
Here is the diff compared to v2:
diff --git a/config.c b/config.c
index 5c52cefd78..d6c8f8f3ba 100644
--- a/config.c
+++ b/config.c
@@ -1724,7 +1724,7 @@ int git_config_get_untracked_cache(void)
int git_config_get_split_index(void)
{
- int val = -1;
+ int val;
if (!git_config_get_maybe_bool("core.splitindex", &val))
return val;
diff --git a/read-cache.c b/read-cache.c
index 772343ab25..bf0ac1ce61 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2227,18 +2227,17 @@ static unsigned long get_shared_index_expire_date(void)
return shared_index_expire_date;
}
-static int can_delete_shared_index(const char *shared_sha1_hex)
+static int can_delete_shared_index(const char *shared_index_path)
{
struct stat st;
unsigned long expiration;
- const char *shared_index = git_path("sharedindex.%s", shared_sha1_hex);
/* Check timestamp */
expiration = get_shared_index_expire_date();
if (!expiration)
return 0;
- if (stat(shared_index, &st))
- return error_errno(_("could not stat '%s"), shared_index);
+ if (stat(shared_index_path, &st))
+ return error_errno(_("could not stat '%s"), shared_index_path);
if (st.st_mtime > expiration)
return 0;
@@ -2255,13 +2254,15 @@ static int clean_shared_index_files(const char
*current_hex)
while ((de = readdir(dir)) != NULL) {
const char *sha1_hex;
+ const char *shared_index_path;
if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
continue;
if (!strcmp(sha1_hex, current_hex))
continue;
- if (can_delete_shared_index(sha1_hex) > 0 &&
- unlink(git_path("%s", de->d_name)))
- error_errno(_("unable to unlink: %s"),
git_path("%s", de->d_name));
+ shared_index_path = git_path("%s", de->d_name);
+ if (can_delete_shared_index(shared_index_path) > 0 &&
+ unlink(shared_index_path))
+ error_errno(_("unable to unlink: %s"),
shared_index_path);
}
closedir(dir);
prev parent reply other threads:[~2016-12-26 10:29 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-26 10:22 [PATCH v3 00/21] Add configuration options for split-index Christian Couder
2016-12-26 10:22 ` [PATCH v3 01/21] config: mark an error message up for translation Christian Couder
2016-12-26 10:22 ` [PATCH v3 02/21] config: add git_config_get_split_index() Christian Couder
2016-12-26 10:22 ` [PATCH v3 03/21] split-index: add {add,remove}_split_index() functions Christian Couder
2016-12-26 10:22 ` [PATCH v3 04/21] read-cache: add and then use tweak_split_index() Christian Couder
2016-12-26 10:22 ` [PATCH v3 05/21] update-index: warn in case of split-index incoherency Christian Couder
2016-12-26 10:22 ` [PATCH v3 06/21] t1700: add tests for core.splitIndex Christian Couder
2016-12-27 19:04 ` Junio C Hamano
2017-01-02 8:29 ` Christian Couder
2017-01-03 12:58 ` Junio C Hamano
2016-12-26 10:22 ` [PATCH v3 07/21] Documentation/config: add information " Christian Couder
2016-12-26 10:22 ` [PATCH v3 08/21] Documentation/git-update-index: talk about core.splitIndex config var Christian Couder
2016-12-27 19:07 ` Junio C Hamano
2017-01-02 9:39 ` Christian Couder
2017-01-07 21:38 ` Junio C Hamano
2017-01-09 11:18 ` Duy Nguyen
2017-01-23 15:55 ` Christian Couder
2017-01-23 19:59 ` Junio C Hamano
2016-12-26 10:22 ` [PATCH v3 09/21] config: add git_config_get_max_percent_split_change() Christian Couder
2016-12-26 10:22 ` [PATCH v3 10/21] read-cache: regenerate shared index if necessary Christian Couder
2016-12-27 19:08 ` Junio C Hamano
2017-01-02 11:23 ` Christian Couder
2016-12-26 10:22 ` [PATCH v3 11/21] t1700: add tests for splitIndex.maxPercentChange Christian Couder
2016-12-26 10:22 ` [PATCH v3 12/21] Documentation/config: add splitIndex.maxPercentChange Christian Couder
2016-12-27 19:09 ` Junio C Hamano
2017-01-02 13:50 ` Christian Couder
2016-12-26 10:22 ` [PATCH v3 13/21] sha1_file: make check_and_freshen_file() non static Christian Couder
2016-12-27 19:09 ` Junio C Hamano
2016-12-26 10:22 ` [PATCH v3 14/21] read-cache: touch shared index files when used Christian Couder
2016-12-27 19:10 ` Junio C Hamano
2017-01-02 14:09 ` Christian Couder
2017-01-07 21:46 ` Junio C Hamano
2017-01-09 10:55 ` Duy Nguyen
2017-01-09 14:34 ` Junio C Hamano
2017-01-19 12:13 ` Duy Nguyen
2017-01-19 19:00 ` Junio C Hamano
2017-01-20 10:44 ` Duy Nguyen
2017-01-23 18:14 ` Christian Couder
2017-01-23 18:53 ` Junio C Hamano
2017-01-25 14:35 ` Christian Couder
2017-01-25 20:52 ` Junio C Hamano
2017-01-31 14:06 ` Christian Couder
2017-01-31 19:22 ` Junio C Hamano
2017-01-31 21:09 ` Junio C Hamano
2016-12-26 10:22 ` [PATCH v3 15/21] config: add git_config_get_expiry() from gc.c Christian Couder
2016-12-26 10:22 ` [PATCH v3 16/21] read-cache: unlink old sharedindex files Christian Couder
2016-12-26 10:22 ` [PATCH v3 17/21] t1700: test shared index file expiration Christian Couder
2016-12-26 10:22 ` [PATCH v3 18/21] read-cache: refactor read_index_from() Christian Couder
2016-12-26 10:22 ` [PATCH v3 19/21] read-cache: use freshen_shared_index() in read_index_from() Christian Couder
2016-12-26 10:22 ` [PATCH v3 20/21] Documentation/config: add splitIndex.sharedIndexExpire Christian Couder
2016-12-27 19:11 ` Junio C Hamano
2017-01-02 14:33 ` Christian Couder
2016-12-26 10:22 ` [PATCH v3 21/21] Documentation/git-update-index: explain splitIndex.* Christian Couder
2016-12-27 19:13 ` Junio C Hamano
2017-01-02 16:04 ` Christian Couder
2016-12-26 10:29 ` Christian Couder [this message]
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=CAP8UFD3dam_tfV7J61Oqqtna-LiGAnZARzSG4CkyEk6nKDWsWg@mail.gmail.com \
--to=christian.couder@gmail.com \
--cc=avarab@gmail.com \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@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).