projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[PATCH] Add the merge test Linus called "test script from hell".
[git.git]
/
rpull.c
diff --git
a/rpull.c
b/rpull.c
index
6624440
..
b48e631
100644
(file)
--- a/
rpull.c
+++ b/
rpull.c
@@
-14,10
+14,12
@@
static int fd_out;
int fetch(unsigned char *sha1)
{
int fetch(unsigned char *sha1)
{
- if (has_sha1_file(sha1))
- return 0;
+ int ret;
write(fd_out, sha1, 20);
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)
}
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;
get_all = 1;
get_tree = 1;
get_history = 1;
+ } else if (argv[arg][1] == 'v') {
+ get_verbosely = 1;
}
arg++;
}
if (argc < arg + 2) {
}
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];
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))
return 1;
if (pull(commit_id))