kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'jk/info-alternates-fix' 

We used to add an empty alternate object database to the system
that does not help anything; it has been corrected.

* jk/info-alternates-fix:
  link_alt_odb_entries: make empty input a noop
maint
Junio C Hamano 2017-11-15 12:14:36 +09:00
parent 4fff9c7f30 f28e36686a
commit 26a45eac80
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sha1_file.c
View File

@ -404,6 +404,9 @@ static void link_alt_odb_entries(const char *alt, int sep,
struct strbuf objdirbuf = STRBUF_INIT; struct strbuf objdirbuf = STRBUF_INIT;
struct strbuf entry = STRBUF_INIT; struct strbuf entry = STRBUF_INIT;


if (!alt || !*alt)
return;

if (depth > 5) { if (depth > 5) {
error("%s: ignoring alternate object stores, nesting too deep.", error("%s: ignoring alternate object stores, nesting too deep.",
relative_base); relative_base);
@ -604,7 +607,6 @@ void prepare_alt_odb(void)
return; return;


alt = getenv(ALTERNATE_DB_ENVIRONMENT); alt = getenv(ALTERNATE_DB_ENVIRONMENT);
if (!alt) alt = "";


alt_odb_tail = &alt_odb_list; alt_odb_tail = &alt_odb_list;
link_alt_odb_entries(alt, PATH_SEP, NULL, 0); link_alt_odb_entries(alt, PATH_SEP, NULL, 0);