From: Christian Couder <christian.couder@gmail.com>
To: 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: [PATCH v2 18/21] read-cache: refactor read_index_from()
Date: Sat, 17 Dec 2016 15:55:44 +0100 [thread overview]
Message-ID: <20161217145547.11748-19-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20161217145547.11748-1-chriscool@tuxfamily.org>
It looks better and is simpler to review when we don't compute
the same things many times in the function.
It will also help make the following commit simpler.
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
read-cache.c | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/read-cache.c b/read-cache.c
index 8e99a7c325..96e097e341 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1702,6 +1702,8 @@ int read_index_from(struct index_state *istate, const char *path)
{
struct split_index *split_index;
int ret;
+ char *base_sha1_hex;
+ const char *base_path;
/* istate->initialized covers both .git/index and .git/sharedindex.xxx */
if (istate->initialized)
@@ -1719,15 +1721,15 @@ int read_index_from(struct index_state *istate, const char *path)
discard_index(split_index->base);
else
split_index->base = xcalloc(1, sizeof(*split_index->base));
- ret = do_read_index(split_index->base,
- git_path("sharedindex.%s",
- sha1_to_hex(split_index->base_sha1)), 1);
+
+ base_sha1_hex = sha1_to_hex(split_index->base_sha1);
+ base_path = git_path("sharedindex.%s", base_sha1_hex);
+ ret = do_read_index(split_index->base, base_path, 1);
if (hashcmp(split_index->base_sha1, split_index->base->sha1))
die("broken index, expect %s in %s, got %s",
- sha1_to_hex(split_index->base_sha1),
- git_path("sharedindex.%s",
- sha1_to_hex(split_index->base_sha1)),
+ base_sha1_hex, base_path,
sha1_to_hex(split_index->base->sha1));
+
merge_base_index(istate);
post_read_index_from(istate);
return ret;
--
2.11.0.49.g2414764.dirty
next prev parent reply other threads:[~2016-12-17 14:56 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-12-17 14:55 [PATCH v2 00/21] Add configuration options for split-index Christian Couder
2016-12-17 14:55 ` [PATCH v2 01/21] config: mark an error message up for translation Christian Couder
2016-12-17 14:55 ` [PATCH v2 02/21] config: add git_config_get_split_index() Christian Couder
2016-12-19 11:14 ` Duy Nguyen
2016-12-26 8:15 ` Christian Couder
2016-12-17 14:55 ` [PATCH v2 03/21] split-index: add {add,remove}_split_index() functions Christian Couder
2016-12-17 14:55 ` [PATCH v2 04/21] read-cache: add and then use tweak_split_index() Christian Couder
2016-12-19 11:18 ` Duy Nguyen
2016-12-26 8:20 ` Christian Couder
2016-12-17 14:55 ` [PATCH v2 05/21] update-index: warn in case of split-index incoherency Christian Couder
2016-12-17 14:55 ` [PATCH v2 06/21] t1700: add tests for core.splitIndex Christian Couder
2016-12-17 14:55 ` [PATCH v2 07/21] Documentation/config: add information " Christian Couder
2016-12-17 14:55 ` [PATCH v2 08/21] Documentation/git-update-index: talk about core.splitIndex config var Christian Couder
2016-12-17 14:55 ` [PATCH v2 09/21] config: add git_config_get_max_percent_split_change() Christian Couder
2016-12-17 14:55 ` [PATCH v2 10/21] read-cache: regenerate shared index if necessary Christian Couder
2016-12-19 11:48 ` Duy Nguyen
2016-12-26 8:33 ` Christian Couder
2016-12-17 14:55 ` [PATCH v2 11/21] t1700: add tests for splitIndex.maxPercentChange Christian Couder
2016-12-17 14:55 ` [PATCH v2 12/21] Documentation/config: add splitIndex.maxPercentChange Christian Couder
2016-12-17 14:55 ` [PATCH v2 13/21] sha1_file: make check_and_freshen_file() non static Christian Couder
2016-12-17 14:55 ` [PATCH v2 14/21] read-cache: touch shared index files when used Christian Couder
2016-12-17 14:55 ` [PATCH v2 15/21] config: add git_config_get_expiry() from gc.c Christian Couder
2016-12-17 14:55 ` [PATCH v2 16/21] read-cache: unlink old sharedindex files Christian Couder
2016-12-19 11:58 ` Duy Nguyen
2016-12-26 9:54 ` Christian Couder
2016-12-17 14:55 ` [PATCH v2 17/21] t1700: test shared index file expiration Christian Couder
2016-12-17 14:55 ` Christian Couder [this message]
2016-12-17 14:55 ` [PATCH v2 19/21] read-cache: use freshen_shared_index() in read_index_from() Christian Couder
2016-12-17 14:55 ` [PATCH v2 20/21] Documentation/config: add splitIndex.sharedIndexExpire Christian Couder
2016-12-17 14:55 ` [PATCH v2 21/21] Documentation/git-update-index: explain splitIndex.* Christian Couder
2016-12-17 15:35 ` [PATCH v2 00/21] Add configuration options for split-index Christian Couder
2016-12-19 12:02 ` Duy Nguyen
2016-12-19 21:03 ` Junio C Hamano
2016-12-26 10:32 ` Christian Couder
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=20161217145547.11748-19-chriscool@tuxfamily.org \
--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).