summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-09-23 12:28:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-23 21:30:45 (GMT)
commite2b77f026a251a47ebdf634107e76f7b457087af (patch)
tree087a6bf8af105edb27a222540fd0ce8bd1398008
parent1a951815ddaa4e4b570cc67e204f45e9a12841e0 (diff)
downloadgit-e2b77f026a251a47ebdf634107e76f7b457087af.zip
git-e2b77f026a251a47ebdf634107e76f7b457087af.tar.gz
git-e2b77f026a251a47ebdf634107e76f7b457087af.tar.bz2
[PATCH] Fix "git-local-fetch -s" with packed source repository
"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> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--local-fetch.c14
1 files changed, 11 insertions, 3 deletions
diff --git a/local-fetch.c b/local-fetch.c
index a3e35f9..6216c68 100644
--- a/local-fetch.c
+++ b/local-fetch.c
@@ -65,9 +65,17 @@ static int copy_file(const char *source, const char *dest, const char *hex)
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;