X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=local-pull.c;h=8bfe67b4071b6445210a06e51b0d5f1c5b1ba113;hb=1cc92ff6cab993c119a5d125a04a5a4e9cc4b09e;hp=acfcbb69f570d2e4cd6cfb2e2fed030ff9065ef0;hpb=a1df57abb90d456b6b600b8cf6a5232a39cd3f5e;p=git.git diff --git a/local-pull.c b/local-pull.c index acfcbb69f..8bfe67b40 100644 --- a/local-pull.c +++ b/local-pull.c @@ -1,15 +1,8 @@ /* * Copyright (C) 2005 Junio C Hamano */ -#include -#include -#include -#include -#include #include "cache.h" #include "commit.h" -#include -#include #include "pull.h" static int use_link = 0; @@ -71,8 +64,7 @@ int fetch(unsigned char *sha1) munmap(map, st.st_size); close(ofd); if (status) - fprintf(stderr, "cannot write %s (%ld bytes)\n", - dest_filename, st.st_size); + fprintf(stderr, "cannot write %s\n", dest_filename); else pull_say("copy %s\n", hex); return status; @@ -81,8 +73,13 @@ int fetch(unsigned char *sha1) return -1; } +int fetch_ref(char *ref, unsigned char *sha1) +{ + return -1; +} + static const char *local_pull_usage = -"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] commit-id path"; +"git-local-pull [-c] [-t] [-a] [-l] [-s] [-n] [-v] [-d] [--recover] commit-id path"; /* * By default we only use file copy. @@ -100,6 +97,10 @@ int main(int argc, char **argv) get_tree = 1; else if (argv[arg][1] == 'c') get_history = 1; + else if (argv[arg][1] == 'd') + get_delta = 0; + else if (!strcmp(argv[arg], "--recover")) + get_delta = 2; else if (argv[arg][1] == 'a') { get_all = 1; get_tree = 1;