summaryrefslogtreecommitdiff
path: root/local-fetch.c
diff options
context:
space:
mode:
authorSergey Vlasov <vsu@altlinux.ru>2005-09-23 12:28:38 (GMT)
committerJunio C Hamano <junkio@cox.net>2005-09-23 21:30:46 (GMT)
commit628cd5430fdf71a75c02af88ab7b557d29687db5 (patch)
tree348d2f05c4f4b246eef7330b4dd7bd9570c579fa /local-fetch.c
parente2b77f026a251a47ebdf634107e76f7b457087af (diff)
downloadgit-628cd5430fdf71a75c02af88ab7b557d29687db5.zip
git-628cd5430fdf71a75c02af88ab7b557d29687db5.tar.gz
git-628cd5430fdf71a75c02af88ab7b557d29687db5.tar.bz2
[PATCH] git-local-fetch: Avoid confusing error messages on packed repositories
If the source repository was packed, and git-local-fetch needed to fetch a pack file, it spewed a misleading error message about not being able to find the unpacked object. Fixed by adding the warn_if_not_exists argument to copy_file(), which controls printing of error messages in case the source file does not exist. Signed-off-by: Sergey Vlasov <vsu@altlinux.ru> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'local-fetch.c')
-rw-r--r--local-fetch.c17
1 files changed, 12 insertions, 5 deletions
diff --git a/local-fetch.c b/local-fetch.c
index 6216c68..0dbed89 100644
--- a/local-fetch.c
+++ b/local-fetch.c
@@ -52,7 +52,8 @@ static int setup_indices(void)
return 0;
}
-static int copy_file(const char *source, const char *dest, const char *hex)
+static int copy_file(const char *source, const char *dest, const char *hex,
+ int warn_if_not_exists)
{
if (use_link) {
if (!link(source, dest)) {
@@ -61,13 +62,16 @@ static int copy_file(const char *source, const char *dest, const char *hex)
}
/* If we got ENOENT there is no point continuing. */
if (errno == ENOENT) {
- fprintf(stderr, "does not exist %s\n", source);
+ if (warn_if_not_exists)
+ fprintf(stderr, "does not exist %s\n", source);
return -1;
}
}
if (use_symlink) {
struct stat st;
if (stat(source, &st)) {
+ if (!warn_if_not_exists && errno == ENOENT)
+ return -1;
fprintf(stderr, "cannot stat %s: %s\n", source,
strerror(errno));
return -1;
@@ -83,8 +87,11 @@ static int copy_file(const char *source, const char *dest, const char *hex)
void *map;
ifd = open(source, O_RDONLY);
if (ifd < 0 || fstat(ifd, &st) < 0) {
+ int err = errno;
if (ifd >= 0)
close(ifd);
+ if (!warn_if_not_exists && err == ENOENT)
+ return -1;
fprintf(stderr, "cannot open %s\n", source);
return -1;
}
@@ -129,11 +136,11 @@ static int fetch_pack(const unsigned char *sha1)
sprintf(filename, "%s/objects/pack/pack-%s.pack",
path, sha1_to_hex(target->sha1));
copy_file(filename, sha1_pack_name(target->sha1),
- sha1_to_hex(target->sha1));
+ sha1_to_hex(target->sha1), 1);
sprintf(filename, "%s/objects/pack/pack-%s.idx",
path, sha1_to_hex(target->sha1));
copy_file(filename, sha1_pack_index_name(target->sha1),
- sha1_to_hex(target->sha1));
+ sha1_to_hex(target->sha1), 1);
install_packed_git(target);
return 0;
}
@@ -154,7 +161,7 @@ static int fetch_file(const unsigned char *sha1)
filename[object_name_start+1] = hex[1];
filename[object_name_start+2] = '/';
strcpy(filename + object_name_start + 3, hex + 2);
- return copy_file(filename, dest_filename, hex);
+ return copy_file(filename, dest_filename, hex, 0);
}
int fetch(unsigned char *sha1)