projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
pretty_print_commit: add different formats
[git.git]
/
rpull.c
diff --git
a/rpull.c
b/rpull.c
index
36e49f7
..
f4ab898
100644
(file)
--- a/
rpull.c
+++ b/
rpull.c
@@
-6,16
+6,39
@@
static int fd_in;
static int fd_out;
static int fd_in;
static int fd_out;
+static unsigned char remote_version = 0;
+static unsigned char local_version = 1;
+
int fetch(unsigned char *sha1)
{
int ret;
int fetch(unsigned char *sha1)
{
int ret;
+ signed char remote;
+ char type = 'o';
+ if (has_sha1_file(sha1))
+ return 0;
+ write(fd_out, &type, 1);
write(fd_out, sha1, 20);
write(fd_out, sha1, 20);
+ if (read(fd_in, &remote, 1) < 1)
+ return -1;
+ if (remote < 0)
+ return remote;
ret = write_sha1_from_fd(sha1, fd_in);
if (!ret)
pull_say("got %s\n", sha1_to_hex(sha1));
return ret;
}
ret = write_sha1_from_fd(sha1, fd_in);
if (!ret)
pull_say("got %s\n", sha1_to_hex(sha1));
return ret;
}
+int get_version(void)
+{
+ char type = 'v';
+ write(fd_out, &type, 1);
+ write(fd_out, &local_version, 1);
+ if (read(fd_in, &remote_version, 1) < 1) {
+ return error("Couldn't read version from remote end");
+ }
+ return 0;
+}
+
int main(int argc, char **argv)
{
char *commit_id;
int main(int argc, char **argv)
{
char *commit_id;
@@
-27,6
+50,8
@@
int main(int argc, char **argv)
get_tree = 1;
} else if (argv[arg][1] == 'c') {
get_history = 1;
get_tree = 1;
} else if (argv[arg][1] == 'c') {
get_history = 1;
+ } else if (argv[arg][1] == 'd') {
+ get_delta = 0;
} else if (argv[arg][1] == 'a') {
get_all = 1;
get_tree = 1;
} else if (argv[arg][1] == 'a') {
get_all = 1;
get_tree = 1;
@@
-37,7
+62,7
@@
int main(int argc, char **argv)
arg++;
}
if (argc < arg + 2) {
arg++;
}
if (argc < arg + 2) {
- usage("git-rpull [-c] [-t] [-a] [-v] commit-id url");
+ usage("git-rpull [-c] [-t] [-a] [-v]
[-d]
commit-id url");
return 1;
}
commit_id = argv[arg];
return 1;
}
commit_id = argv[arg];
@@
-46,6
+71,9
@@
int main(int argc, char **argv)
if (setup_connection(&fd_in, &fd_out, "git-rpush", url, arg, argv + 1))
return 1;
if (setup_connection(&fd_in, &fd_out, "git-rpush", url, arg, argv + 1))
return 1;
+ if (get_version())
+ return 1;
+
if (pull(commit_id))
return 1;
if (pull(commit_id))
return 1;