git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <junkio@cox.net>
To: Linus Torvalds <torvalds@osdl.org>
Cc: Daniel Barkalow <barkalow@iabervon.org>
Cc: git@vger.kernel.org
Subject: [PATCH] local-pull: implement fetch_ref()
Date: Wed, 22 Jun 2005 01:52:06 -0700	[thread overview]
Message-ID: <7v8y12ixjd.fsf@assigned-by-dhcp.cox.net> (raw)
In-Reply-To: <Pine.LNX.4.21.0506212043540.30848-100000@iabervon.org> (Daniel Barkalow's message of "Tue, 21 Jun 2005 20:45:49 -0400 (EDT)")

This makes "-w ref" usable for git-local-pull.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

 Documentation/git-local-pull.txt |    7 +++++--
 local-pull.c                     |   31 ++++++++++++++++++++++++++++---
 2 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/Documentation/git-local-pull.txt b/Documentation/git-local-pull.txt
--- a/Documentation/git-local-pull.txt
+++ b/Documentation/git-local-pull.txt
@@ -9,7 +9,7 @@ git-local-pull - Duplicates another GIT 
 
 SYNOPSIS
 --------
-'git-local-pull' [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] [--recover] commit-id path
+'git-local-pull' [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path
 
 DESCRIPTION
 -----------
@@ -32,10 +32,13 @@ OPTIONS
 	usual, to recover after earlier pull that was interrupted.
 -v::
 	Report what is downloaded.
+-w::
+        Writes the commit-id into the filename under $GIT_DIR/refs/ on
+        the local end after the transfer is complete.
 
 Author
 ------
-Written by Linus Torvalds <torvalds@osdl.org>
+Written by Junio C Hamano <junkio@cox.net>
 
 Documentation
 --------------
diff --git a/local-pull.c b/local-pull.c
--- a/local-pull.c
+++ b/local-pull.c
@@ -9,7 +9,7 @@ static int use_link = 0;
 static int use_symlink = 0;
 static int use_filecopy = 1;
 
-static char *path;
+static char *path; /* "Remote" git repository */
 
 int fetch(unsigned char *sha1)
 {
@@ -75,11 +75,34 @@ int fetch(unsigned char *sha1)
 
 int fetch_ref(char *ref, unsigned char *sha1)
 {
-	return -1;
+	static int ref_name_start = -1;
+	static char filename[PATH_MAX];
+	static char hex[41];
+	int ifd;
+
+	if (ref_name_start < 0) {
+		sprintf(filename, "%s/refs/", path);
+		ref_name_start = strlen(filename);
+	}
+	strcpy(filename + ref_name_start, ref);
+	ifd = open(filename, O_RDONLY);
+	if (ifd < 0) {
+		close(ifd);
+		fprintf(stderr, "cannot open %s\n", filename);
+		return -1;
+	}
+	if (read(ifd, hex, 40) != 40 || get_sha1_hex(hex, sha1)) {
+		close(ifd);
+		fprintf(stderr, "cannot read from %s\n", filename);
+		return -1;
+	}
+	close(ifd);
+	pull_say("ref %s\n", sha1_to_hex(sha1));
+	return 0;
 }
 
 static const char *local_pull_usage = 
-"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] [--recover] commit-id path";
+"git-local-pull [-c] [-t] [-a] [-d] [-v] [-w filename] [--recover] [-l] [-s] [-n] commit-id path";
 
 /* 
  * By default we only use file copy.
@@ -114,6 +137,8 @@ int main(int argc, char **argv)
 			use_filecopy = 0;
 		else if (argv[arg][1] == 'v')
 			get_verbosely = 1;
+		else if (argv[arg][1] == 'w')
+			write_ref = argv[++arg];
 		else
 			usage(local_pull_usage);
 		arg++;
------------------------------------------------


      reply	other threads:[~2005-06-22  8:55 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-06-22  0:45 [PATCH] Pull refs by HTTP Daniel Barkalow
2005-06-22  8:52 ` Junio C Hamano [this message]

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

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7v8y12ixjd.fsf@assigned-by-dhcp.cox.net \
    --to=junkio@cox.net \
    --cc=barkalow@iabervon.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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).