X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=local-fetch.c;h=ffa4887570319a2cbcf4042bd6e00063a48a4b6d;hb=5e3a620cd5f7baaf27198192a614271c6145ec3b;hp=0a071144b584a419270d0bc8bf34273b85962de0;hpb=0ffdbbfe36a25682cbb2e6b18b9217c93c97b424;p=git.git diff --git a/local-fetch.c b/local-fetch.c index 0a071144..ffa48875 100644 --- a/local-fetch.c +++ b/local-fetch.c @@ -83,31 +83,23 @@ static int copy_file(const char *source, char *dest, const char *hex, } } if (use_filecopy) { - int ifd, ofd, status; - struct stat st; - void *map; + int ifd, ofd, status = 0; + 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) + if (ifd < 0) { + if (!warn_if_not_exists && errno == ENOENT) return -1; fprintf(stderr, "cannot open %s\n", source); return -1; } - map = mmap(NULL, st.st_size, PROT_READ, MAP_PRIVATE, ifd, 0); - close(ifd); - if (map == MAP_FAILED) { - fprintf(stderr, "cannot mmap %s\n", source); + ofd = open(dest, O_WRONLY | O_CREAT | O_EXCL, 0666); + if (ofd < 0) { + fprintf(stderr, "cannot open %s\n", dest); + close(ifd); return -1; } - ofd = open(dest, O_WRONLY | O_CREAT | O_EXCL, 0666); - status = ((ofd < 0) || - (write(ofd, map, st.st_size) != st.st_size)); - munmap(map, st.st_size); - if (ofd >= 0) - close(ofd); + status = copy_fd(ifd, ofd); + close(ofd); if (status) fprintf(stderr, "cannot write %s\n", dest); else @@ -215,6 +207,9 @@ int main(int argc, char **argv) char *commit_id; int arg = 1; + setup_git_directory(); + git_config(git_default_config); + while (arg < argc && argv[arg][0] == '-') { if (argv[arg][1] == 't') get_tree = 1; @@ -245,6 +240,7 @@ int main(int argc, char **argv) usage(local_pull_usage); commit_id = argv[arg]; path = argv[arg + 1]; + write_ref_log_details = path; if (pull(commit_id)) return 1;