undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-cache: refactor read_index_from()

Browse Source 
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2017-03-06 10:42:00 +01:00 committed by Junio C Hamano
parent c0441f7ef3
commit de6ae5f9e3
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
read-cache.c
View File

@ -1699,6 +1699,8 @@ int read_index_from(struct index_state *istate, const char *path)
{ {
struct split_index *split_index; struct split_index *split_index;
int ret; int ret;
char *base_sha1_hex;
const char *base_path;
/* istate->initialized covers both .git/index and .git/sharedindex.xxx */ /* istate->initialized covers both .git/index and .git/sharedindex.xxx */
if (istate->initialized) if (istate->initialized)
@ -1716,15 +1718,15 @@ int read_index_from(struct index_state *istate, const char *path)
discard_index(split_index->base); discard_index(split_index->base);
else else
split_index->base = xcalloc(1, sizeof(*split_index->base)); split_index->base = xcalloc(1, sizeof(*split_index->base));
ret = do_read_index(split_index->base,
git_path("sharedindex.%s", base_sha1_hex = sha1_to_hex(split_index->base_sha1);
sha1_to_hex(split_index->base_sha1)), 1); 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)) if (hashcmp(split_index->base_sha1, split_index->base->sha1))
die("broken index, expect %s in %s, got %s", die("broken index, expect %s in %s, got %s",
sha1_to_hex(split_index->base_sha1), base_sha1_hex, base_path,
git_path("sharedindex.%s",
sha1_to_hex(split_index->base_sha1)),
sha1_to_hex(split_index->base->sha1)); sha1_to_hex(split_index->base->sha1));
merge_base_index(istate); merge_base_index(istate);
post_read_index_from(istate); post_read_index_from(istate);
return ret; return ret;