Skip to content

Commit dfa161d

Browse files
derrickstoleedscho
authored andcommitted
scalar: .scalarCache should live above enlistment
We should not be putting the .scalarCache inside the enlistment as a sibling to the 'src' directory. This only happens in "unattended" mode, but it also negates any benefit of a shared object cache because each enlistment absolutely does not share any objects with others. Move the shared object cache in this case to a level above the enlistment, so at least there is some hope that it can be reused. This is also critical to the upcoming --no-src option, since the shared object cache cannot be located within the Git repository. Signed-off-by: Derrick Stolee <derrickstolee@github.com>
1 parent 4b01312 commit dfa161d

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

scalar.c

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -482,8 +482,13 @@ static char *default_cache_root(const char *root)
482482
{
483483
const char *env;
484484

485-
if (is_unattended())
486-
return xstrfmt("%s/.scalarCache", root);
485+
if (is_unattended()) {
486+
struct strbuf path = STRBUF_INIT;
487+
strbuf_addstr(&path, root);
488+
strip_last_path_component(&path);
489+
strbuf_addstr(&path, "/.scalarCache");
490+
return strbuf_detach(&path, NULL);
491+
}
487492

488493
#ifdef WIN32
489494
(void)env;

t/t9210-scalar.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -381,7 +381,7 @@ test_expect_success '`scalar clone` with GVFS-enabled server' '
381381
cache_key="url_$(printf "%s" http://$HOST_PORT/ |
382382
tr A-Z a-z |
383383
test-tool sha1)" &&
384-
echo "$(pwd)/using-gvfs/.scalarCache/$cache_key" >expect &&
384+
echo "$(pwd)/.scalarCache/$cache_key" >expect &&
385385
git -C using-gvfs/src config gvfs.sharedCache >actual &&
386386
test_cmp expect actual &&
387387

0 commit comments

Comments
 (0)