Merge branch 'jk/clone-copy-alternates-fix'
"git clone" of a local repository can be done at the filesystem level, but the codepath did not check errors while copying and adjusting the file that lists alternate object stores. * jk/clone-copy-alternates-fix: clone: detect errors in normalize_path_copy
This commit is contained in:
commit
630e05c4f3
@ -351,8 +351,11 @@ static void copy_alternates(struct strbuf *src, struct strbuf *dst,
|
|||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
abs_path = mkpathdup("%s/objects/%s", src_repo, line.buf);
|
abs_path = mkpathdup("%s/objects/%s", src_repo, line.buf);
|
||||||
normalize_path_copy(abs_path, abs_path);
|
if (!normalize_path_copy(abs_path, abs_path))
|
||||||
add_to_alternates_file(abs_path);
|
add_to_alternates_file(abs_path);
|
||||||
|
else
|
||||||
|
warning("skipping invalid relative alternate: %s/%s",
|
||||||
|
src_repo, line.buf);
|
||||||
free(abs_path);
|
free(abs_path);
|
||||||
}
|
}
|
||||||
strbuf_release(&line);
|
strbuf_release(&line);
|
||||||
|
Loading…
Reference in New Issue
Block a user