Git development
 help / color / mirror / Atom feed
From: Sergey Vlasov <vsu@altlinux.ru>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: [PATCH 5/6] Fix "git-local-fetch -s" with packed source repository
Date: Fri, 23 Sep 2005 16:28:33 +0400 (MSD)	[thread overview]
Message-ID: <20050923122833.49AD2E010FC@center4.mivlgu.local> (raw)
In-Reply-To: <20050923122754.GB2197@master.mivlgu.local>

"git-local-fetch -s" did not work with a packed repository, because
symlink() happily created a link to a non-existing object file,
therefore fetch_file() always returned success, and fetch_pack() was
not called.  Fixed by calling stat() before symlink() to ensure the
file really exists.

Signed-off-by: Sergey Vlasov <vsu@altlinux.ru>


---

 local-fetch.c |   14 +++++++++++---
 1 files changed, 11 insertions(+), 3 deletions(-)

40d9d7c0c86ee790a330f2fb3e1355bde4e9d434
diff --git a/local-fetch.c b/local-fetch.c
--- a/local-fetch.c
+++ b/local-fetch.c
@@ -65,9 +65,17 @@ static int copy_file(const char *source,
 			return -1;
 		}
 	}
-	if (use_symlink && !symlink(source, dest)) {
-		pull_say("symlink %s\n", hex);
-		return 0;
+	if (use_symlink) {
+		struct stat st;
+		if (stat(source, &st)) {
+			fprintf(stderr, "cannot stat %s: %s\n", source,
+				strerror(errno));
+			return -1;
+		}
+		if (!symlink(source, dest)) {
+			pull_say("symlink %s\n", hex);
+			return 0;
+		}
 	}
 	if (use_filecopy) {
 		int ifd, ofd, status;

  parent reply	other threads:[~2005-09-23 12:28 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2005-09-23 12:27 [PATCH 0/6] More fetch fixes Sergey Vlasov
2005-09-23 12:28 ` [PATCH 1/6] fetch.c: Do not build object ref lists Sergey Vlasov
2005-09-23 12:28 ` [PATCH 2/6] fetch.c: Plug memory leak in process_tree() Sergey Vlasov
2005-09-23 12:28 ` [PATCH 3/6] git-local-fetch: Fix error checking and leak in setup_indices() Sergey Vlasov
2005-09-23 12:28 ` [PATCH 4/6] git-local-fetch: Avoid calling close(-1) Sergey Vlasov
2005-09-23 12:28 ` Sergey Vlasov [this message]
2005-09-23 12:28 ` [PATCH 6/6] git-local-fetch: Avoid confusing error messages on packed repositories Sergey Vlasov

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=20050923122833.49AD2E010FC@center4.mivlgu.local \
    --to=vsu@altlinux.ru \
    --cc=git@vger.kernel.org \
    --cc=junkio@cox.net \
    /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