X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=rpull.c;h=b48e63157c66c160b9751603a92831f77106044c;hb=06cd3b94b27c285fc9877e7c6d9e1f35fbc0a7a4;hp=6624440d5ad24854e1bd1a8dff628427581198e0;hpb=4250a5e5b1755e45153248217fe1d5550c972c8d;p=git.git diff --git a/rpull.c b/rpull.c index 6624440d..b48e6315 100644 --- a/rpull.c +++ b/rpull.c @@ -14,10 +14,12 @@ static int fd_out; int fetch(unsigned char *sha1) { - if (has_sha1_file(sha1)) - return 0; + int ret; write(fd_out, sha1, 20); - return write_sha1_from_fd(sha1, fd_in); + ret = write_sha1_from_fd(sha1, fd_in); + if (!ret) + pull_say("got %s\n", sha1_to_hex(sha1)); + return ret; } int main(int argc, char **argv) @@ -35,17 +37,19 @@ int main(int argc, char **argv) get_all = 1; get_tree = 1; get_history = 1; + } else if (argv[arg][1] == 'v') { + get_verbosely = 1; } arg++; } if (argc < arg + 2) { - usage("rpull [-c] [-t] [-a] commit-id url"); + usage("git-rpull [-c] [-t] [-a] [-v] commit-id url"); return 1; } commit_id = argv[arg]; url = argv[arg + 1]; - if (setup_connection(&fd_in, &fd_out, "rpush", url, arg, argv + 1)) + if (setup_connection(&fd_in, &fd_out, "git-rpush", url, arg, argv + 1)) return 1; if (pull(commit_id))