From: Hui Wang <Hui.Wang@xxxxxxxxxxxxx>
link_alt_odb_entries() will be called recursively if alternates has
valid object store paths, to avoid nesting too deep, the recursive
depth is limited to 5, this limitation is reasonable and safe for
dead-loop reference situation.
There is another limitation in this function to only permit the 1st
level alternates has relative paths, the purpose of this limitation
is to avoid inaccurate result when using memcmp() directly to compare
two directory path names, e.g. "./a/b/" and "./a/c/e/../../b" should
be the same dir, but memcmp() will report they are different dirs,
this will introduce the same dir be added twice or dead-loop
reference.
Now we have new method to compare two directories and can handle both
absolute path and relative path comparison, in addition to we already
have max depth 5 limitation, we can safely remove this limitation.
Moreover removing this limitation will make below two usage workable.
usage1: base-repos has relative path in the alternates
%>git clone --reference base-repos src dest
usage2: src2 has relative path to point src1, src1 has relative path
to point src
%>git clone src2 dest
Signed-off-by: Hui Wang <Hui.Wang@xxxxxxxxxxxxx>
---
sha1_file.c | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index 18f7fb3..98fdb0a 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -329,15 +329,10 @@ static void link_alt_odb_entries(const char *alt, const char *ep, int sep,
}
while (cp < ep && *cp != sep)
cp++;
- if (last != cp) {
- if (!is_absolute_path(last) && depth) {
- error("%s: ignoring relative alternate object store %s",
- relative_base, last);
- } else {
- link_alt_odb_entry(last, cp - last,
- relative_base, depth);
- }
- }
+ if (last != cp)
+ link_alt_odb_entry(last, cp - last,
+ relative_base, depth);
+
while (cp < ep && *cp == sep)
cp++;
last = cp;
--
1.6.3.1
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html