Everytime split index is turned on, it creates a "sharedindex.XXXX"
file in the git directory. This makes sure that old sharedindex
files are removed after a new one has been created.
Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
read-cache.c | 27 ++++++++++++++++++++++++++-
t/t1700-split-index.sh | 7 +++++++
2 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/read-cache.c b/read-cache.c
index ae292d6..13aa058 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -2166,6 +2166,28 @@ static int write_split_index(struct index_state *istate,
return ret;
}
+static void clean_shared_index_files(const char *current_hex)
+{
+ struct dirent *de;
+ DIR *dir = opendir(get_git_dir());
+
+ if (!dir) {
+ error_errno("unable to open git dir: %s", get_git_dir());
+ return;
+ }
+
+ while ((de = readdir(dir)) != NULL) {
+ const char *sha1_hex;
+ if (!skip_prefix(de->d_name, "sharedindex.", &sha1_hex))
+ continue;
+ if (!strcmp(sha1_hex, current_hex))
+ continue;
+ if (unlink(git_path("%s", de->d_name)))
+ error_errno("unable to unlink: %s", git_path("%s",
de->d_name));
+ }
+ closedir(dir);
+}
+
static struct tempfile temporary_sharedindex;
static int write_shared_index(struct index_state *istate,
@@ -2187,8 +2209,11 @@ static int write_shared_index(struct index_state *istate,
}
ret = rename_tempfile(&temporary_sharedindex,
git_path("sharedindex.%s",
sha1_to_hex(si->base->sha1)));
- if (!ret)
+ if (!ret) {
hashcpy(si->base_sha1, si->base->sha1);
+ clean_shared_index_files(sha1_to_hex(si->base->sha1));
+ }
+
return ret;
}
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index f1af0d5..5036efa 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -237,4 +237,11 @@ EOF
test_cmp expect actual
'
+test_expect_success 'only one "sharedindex" files' '
+ git config core.splitIndex true &&
+ : >three &&
+ git update-index --add three &&
+ test $(ls .git/sharedindex.* | wc -l) = 1
+'
+
test_done
--
2.9.0.250.g7087ccc.dirty
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
