All of lore.kernel.org
 help / color / mirror / Atom feed
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>,
	"Ramsay Jones" <ramsay@ramsayjones.plus.com>,
	"Jeff King" <peff@peff.net>,
	"Christian Couder" <chriscool@tuxfamily.org>
Subject: [PATCH v5 20/22] read-cache: use freshen_shared_index() in read_index_from()
Date: Mon,  6 Mar 2017 10:42:01 +0100	[thread overview]
Message-ID: <20170306094203.28250-21-chriscool@tuxfamily.org> (raw)
In-Reply-To: <20170306094203.28250-1-chriscool@tuxfamily.org>

This way a share index file will not be garbage collected if
we still read from an index it is based from.

As we need to read the current index before creating a new
one, the tests have to be adjusted, so that we don't expect
an old shared index file to be deleted right away when we
create a new one.

Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
---
 read-cache.c           |  1 +
 t/t1700-split-index.sh | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/read-cache.c b/read-cache.c
index 89c95d59b3..e447751823 100644
--- a/read-cache.c
+++ b/read-cache.c
@@ -1719,6 +1719,7 @@ int read_index_from(struct index_state *istate, const char *path)
 		    base_sha1_hex, base_path,
 		    sha1_to_hex(split_index->base->sha1));
 
+	freshen_shared_index(base_sha1_hex, 0);
 	merge_base_index(istate);
 	post_read_index_from(istate);
 	return ret;
diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh
index f5a95a6c28..af3ec0da5a 100755
--- a/t/t1700-split-index.sh
+++ b/t/t1700-split-index.sh
@@ -329,17 +329,17 @@ test_expect_success 'check splitIndex.maxPercentChange set to 0' '
 test_expect_success 'shared index files expire after 2 weeks by default' '
 	: >ten &&
 	git update-index --add ten &&
-	test $(ls .git/sharedindex.* | wc -l) -gt 1 &&
+	test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
 	just_under_2_weeks_ago=$((5-14*86400)) &&
 	test-chmtime =$just_under_2_weeks_ago .git/sharedindex.* &&
 	: >eleven &&
 	git update-index --add eleven &&
-	test $(ls .git/sharedindex.* | wc -l) -gt 1 &&
+	test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
 	just_over_2_weeks_ago=$((-1-14*86400)) &&
 	test-chmtime =$just_over_2_weeks_ago .git/sharedindex.* &&
 	: >twelve &&
 	git update-index --add twelve &&
-	test $(ls .git/sharedindex.* | wc -l) = 1
+	test $(ls .git/sharedindex.* | wc -l) -le 2
 '
 
 test_expect_success 'check splitIndex.sharedIndexExpire set to 16 days' '
@@ -347,12 +347,12 @@ test_expect_success 'check splitIndex.sharedIndexExpire set to 16 days' '
 	test-chmtime =$just_over_2_weeks_ago .git/sharedindex.* &&
 	: >thirteen &&
 	git update-index --add thirteen &&
-	test $(ls .git/sharedindex.* | wc -l) -gt 1 &&
+	test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
 	just_over_16_days_ago=$((-1-16*86400)) &&
 	test-chmtime =$just_over_16_days_ago .git/sharedindex.* &&
 	: >fourteen &&
 	git update-index --add fourteen &&
-	test $(ls .git/sharedindex.* | wc -l) = 1
+	test $(ls .git/sharedindex.* | wc -l) -le 2
 '
 
 test_expect_success 'check splitIndex.sharedIndexExpire set to "never" and "now"' '
@@ -361,13 +361,13 @@ test_expect_success 'check splitIndex.sharedIndexExpire set to "never" and "now"
 	test-chmtime =$just_10_years_ago .git/sharedindex.* &&
 	: >fifteen &&
 	git update-index --add fifteen &&
-	test $(ls .git/sharedindex.* | wc -l) -gt 1 &&
+	test $(ls .git/sharedindex.* | wc -l) -gt 2 &&
 	git config splitIndex.sharedIndexExpire now &&
 	just_1_second_ago=-1 &&
 	test-chmtime =$just_1_second_ago .git/sharedindex.* &&
 	: >sixteen &&
 	git update-index --add sixteen &&
-	test $(ls .git/sharedindex.* | wc -l) = 1
+	test $(ls .git/sharedindex.* | wc -l) -le 2
 '
 
 test_done
-- 
2.12.0.206.g74921e51d6.dirty


  parent reply	other threads:[~2017-03-06  9:51 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-03-06  9:41 [PATCH v5 00/22] Add configuration options for split-index Christian Couder
2017-03-06  9:41 ` [PATCH v5 01/22] config: mark an error message up for translation Christian Couder
2017-03-06  9:41 ` [PATCH v5 02/22] t1700: change here document style Christian Couder
2017-03-06  9:41 ` [PATCH v5 03/22] config: add git_config_get_split_index() Christian Couder
2017-03-06  9:41 ` [PATCH v5 04/22] split-index: add {add,remove}_split_index() functions Christian Couder
2017-03-06  9:41 ` [PATCH v5 05/22] read-cache: add and then use tweak_split_index() Christian Couder
2017-03-06  9:41 ` [PATCH v5 06/22] update-index: warn in case of split-index incoherency Christian Couder
2017-03-06  9:41 ` [PATCH v5 07/22] t1700: add tests for core.splitIndex Christian Couder
2017-03-06  9:41 ` [PATCH v5 08/22] Documentation/config: add information " Christian Couder
2017-03-06  9:41 ` [PATCH v5 09/22] Documentation/git-update-index: talk about core.splitIndex config var Christian Couder
2017-03-06  9:41 ` [PATCH v5 10/22] config: add git_config_get_max_percent_split_change() Christian Couder
2017-03-06  9:41 ` [PATCH v5 11/22] read-cache: regenerate shared index if necessary Christian Couder
2017-03-06  9:41 ` [PATCH v5 12/22] t1700: add tests for splitIndex.maxPercentChange Christian Couder
2017-03-06  9:41 ` [PATCH v5 13/22] Documentation/config: add splitIndex.maxPercentChange Christian Couder
2017-03-06  9:41 ` [PATCH v5 14/22] sha1_file: make check_and_freshen_file() non static Christian Couder
2017-03-06  9:41 ` [PATCH v5 15/22] read-cache: touch shared index files when used Christian Couder
2017-03-06  9:41 ` [PATCH v5 16/22] config: add git_config_get_expiry() from gc.c Christian Couder
2017-03-06  9:41 ` [PATCH v5 17/22] read-cache: unlink old sharedindex files Christian Couder
2017-03-06  9:41 ` [PATCH v5 18/22] t1700: test shared index file expiration Christian Couder
2017-03-06  9:42 ` [PATCH v5 19/22] read-cache: refactor read_index_from() Christian Couder
2017-03-06  9:42 ` Christian Couder [this message]
2017-03-06  9:42 ` [PATCH v5 21/22] Documentation/config: add splitIndex.sharedIndexExpire Christian Couder
2017-03-06  9:42 ` [PATCH v5 22/22] Documentation/git-update-index: explain splitIndex.* 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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170306094203.28250-21-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 \
    --cc=peff@peff.net \
    --cc=ramsay@ramsayjones.plus.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. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.