From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: git@vger.kernel.org, "David S. Miller" <davem@davemloft.net>
Subject: [PATCH] Short-cut git-fetch-pack while cloning locally.
Date: Tue, 05 Jul 2005 13:17:31 -0700 [thread overview]
Message-ID: <7vekaddn38.fsf_-_@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.58.0507041443510.3570@g5.osdl.org> (Linus Torvalds's message of "Mon, 4 Jul 2005 14:44:08 -0700 (PDT)")
>>>>> "LT" == Linus Torvalds <torvalds@osdl.org> writes:
LT> Well, I'm not working on it, but tested patches...
Prodded by the hint...
------------
The git-fetch-pack command used internally by git-fetch-script
which in turn is used by git-clone-script refuses to run if
there is no common head. When cloning locally, just copy/link the
objects directory to avoid its use, since we know there will not
be any common head (the target is empty). It also should be
more efficient.
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
*** This is slightly different from the one I sent as a response
*** to David's inquiry, in that it uses cp -rl (or just cp -r)
*** instead of cpio. Also I added the copyright notices and one
*** liner description.
git-clone-script | 43 +++++++++++++++++++++++++++++++++++++++----
rev-list.c | 5 ++++-
2 files changed, 43 insertions(+), 5 deletions(-)
f33df082e175f7fc717a75e528eab3db1d294576
diff --git a/git-clone-script b/git-clone-script
--- a/git-clone-script
+++ b/git-clone-script
@@ -1,7 +1,42 @@
#!/bin/sh
+#
+# Copyright (c) 2005, Linus Torvalds
+# Copyright (c) 2005, Junio C Hamano
+#
+# Clone a repository into a different directory that does not yet exist.
+
repo="$1"
dir="$2"
-mkdir $dir || exit 1
-cd $dir
-git-init-db
-git fetch "$repo" && ( git-rev-parse FETCH_HEAD > .git/HEAD )
+mkdir "$dir" &&
+D=$(
+ (cd "$dir" && git-init-db && pwd)
+) || exit 1
+
+# See if repo is a local directory.
+if (
+ cd "$repo/objects" 2>/dev/null
+)
+then
+ # See if we can hardlink and drop "l" if not.
+ sample_file=$(cd "$repo" && find objects -type f -print | sed -e 1q)
+
+ # objects directory should not be empty since we are cloning!
+ test -f "$repo/$sample_file" || exit
+
+ if ln "$repo/$sample_file" "$D/.git/objects/sample" 2>/dev/null
+ then
+ l=l
+ else
+ l=
+ fi &&
+ rm -f "$D/.git/objects/sample" &&
+
+ cp -r$l "$repo/objects" "$D/.git/" || exit 1
+
+ # FETCH_HEAD is always HEAD because we do not do the
+ # extra parameter to "git fetch".
+ cat "$repo/HEAD" >"$D/.git/FETCH_HEAD"
+ cd "$D"
+else
+ cd "$D" && git fetch "$repo"
+fi && git-rev-parse FETCH_HEAD > .git/HEAD
diff --git a/rev-list.c b/rev-list.c
--- a/rev-list.c
+++ b/rev-list.c
@@ -482,7 +482,10 @@ int main(int argc, char **argv)
commit = get_commit_reference(arg, flags);
if (!commit)
continue;
- insert_by_date(&list, commit);
+ if (!merge_order)
+ insert_by_date(&list, commit);
+ else
+ commit_list_insert(commit, &list);
}
if (!merge_order) {
next prev parent reply other threads:[~2005-07-05 20:18 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-07-04 19:57 expensive local git clone David S. Miller
2005-07-04 20:39 ` Linus Torvalds
2005-07-04 20:42 ` Petr Baudis
2005-07-04 21:00 ` David S. Miller
2005-07-04 21:40 ` Junio C Hamano
2005-07-04 22:49 ` David S. Miller
2005-07-04 23:07 ` Junio C Hamano
2005-07-04 21:44 ` Linus Torvalds
2005-07-05 20:17 ` Junio C Hamano [this message]
2005-07-06 0:42 ` Linus Torvalds
2005-07-06 8:14 ` [PATCH] Short-circuit git-clone-pack while cloning locally Junio C Hamano
2005-07-06 16:13 ` Linus Torvalds
2005-07-06 18:00 ` Junio C Hamano
2005-07-06 20:04 ` [PATCH] Short-circuit git-clone-pack while cloning locally (take 2) Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=7vekaddn38.fsf_-_@assigned-by-dhcp.cox.net \
--to=junkio@cox.net \
--cc=davem@davemloft.net \
--cc=git@vger.kernel.org \
--cc=torvalds@osdl.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox