Re: [PATCH 0/2] clone-local fixup
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:52
Subsystem:
the rest · Maintainer:
Linus Torvalds
Possibly related (same subject, not in this thread)
- 2016-06-15 · [PATCH 0/2] clone-local fixup · Junio C Hamano <hidden>
- 2016-06-15 · Re: [PATCH 0/2] clone-local fixup · Hui Wang <hidden>
Hui Wang [off-list ref] writes:
This patch series solved the problem from the root cause. :-) But there is a little problem in the second patch, i provide an incremental patch basing on your second patch, if it is fine to you, it is OK to squash this patch to your second patch.
Thanks. We also need the following fix-up, as I changed the semantics of add_to_alternates_file() to take the path to the "objects" directory.
diff --git a/builtin/clone.c b/builtin/clone.c
index 284e325..63c34d0 100644
--- a/builtin/clone.c
+++ b/builtin/clone.c@@ -336,14 +336,17 @@ static const struct ref *clone_local(const char *src_repo, const char *dest_repo) { const struct ref *ret; - struct strbuf src = STRBUF_INIT; - struct strbuf dest = STRBUF_INIT; struct remote *remote; struct transport *transport; - if (option_shared) - add_to_alternates_file(src_repo); - else { + if (option_shared) { + struct strbuf alt = STRBUF_INIT; + strbuf_addf(&alt, "%s/objects", src_repo); + add_to_alternates_file(alt.buf); + strbuf_release(&alt); + } else { + struct strbuf src = STRBUF_INIT; + struct strbuf dest = STRBUF_INIT; strbuf_addf(&src, "%s/objects", src_repo); strbuf_addf(&dest, "%s/objects", dest_repo); copy_or_link_directory(&src, &dest, src_repo, src.len);