projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
GIT 0.99.9n aka 1.0rc6
[git.git]
/
send-pack.c
diff --git
a/send-pack.c
b/send-pack.c
index
9f9a6e7
..
6ce0d9f
100644
(file)
--- a/
send-pack.c
+++ b/
send-pack.c
@@
-126,12
+126,12
@@
static int ref_newer(const unsigned char *new_sha1,
/* Both new and old must be commit-ish and new is descendant of
* old. Otherwise we require --force.
*/
/* Both new and old must be commit-ish and new is descendant of
* old. Otherwise we require --force.
*/
- o = deref_tag(parse_object(old_sha1));
+ o = deref_tag(parse_object(old_sha1)
, NULL, 0
);
if (!o || o->type != commit_type)
return 0;
old = (struct commit *) o;
if (!o || o->type != commit_type)
return 0;
old = (struct commit *) o;
- o = deref_tag(parse_object(new_sha1));
+ o = deref_tag(parse_object(new_sha1)
, NULL, 0
);
if (!o || o->type != commit_type)
return 0;
new = (struct commit *) o;
if (!o || o->type != commit_type)
return 0;
new = (struct commit *) o;
@@
-179,6
+179,7
@@
static int send_pack(int in, int out, int nr_refspec, char **refspec)
{
struct ref *ref;
int new_refs;
{
struct ref *ref;
int new_refs;
+ int ret = 0;
/* No funny business with the matcher */
remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1);
/* No funny business with the matcher */
remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, 1);
@@
-190,6
+191,12
@@
static int send_pack(int in, int out, int nr_refspec, char **refspec)
if (match_refs(local_refs, remote_refs, &remote_tail,
nr_refspec, refspec, send_all))
return -1;
if (match_refs(local_refs, remote_refs, &remote_tail,
nr_refspec, refspec, send_all))
return -1;
+
+ if (!remote_refs) {
+ fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
+ return 0;
+ }
+
/*
* Finally, tell the other end!
*/
/*
* Finally, tell the other end!
*/
@@
-226,6
+233,7
@@
static int send_pack(int in, int out, int nr_refspec, char **refspec)
error("remote '%s' object %s does not "
"exist on local",
ref->name, sha1_to_hex(ref->old_sha1));
error("remote '%s' object %s does not "
"exist on local",
ref->name, sha1_to_hex(ref->old_sha1));
+ ret = -2;
continue;
}
continue;
}
@@
-239,12
+247,14
@@
static int send_pack(int in, int out, int nr_refspec, char **refspec)
error("remote ref '%s' is not a strict "
"subset of local ref '%s'.", ref->name,
ref->peer_ref->name);
error("remote ref '%s' is not a strict "
"subset of local ref '%s'.", ref->name,
ref->peer_ref->name);
+ ret = -2;
continue;
}
}
memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20);
if (is_zero_sha1(ref->new_sha1)) {
error("cannot happen anymore");
continue;
}
}
memcpy(ref->new_sha1, ref->peer_ref->new_sha1, 20);
if (is_zero_sha1(ref->new_sha1)) {
error("cannot happen anymore");
+ ret = -3;
continue;
}
new_refs++;
continue;
}
new_refs++;
@@
-261,7
+271,7
@@
static int send_pack(int in, int out, int nr_refspec, char **refspec)
if (new_refs)
pack_objects(out, remote_refs);
close(out);
if (new_refs)
pack_objects(out, remote_refs);
close(out);
- return
0
;
+ return
ret
;
}
}
@@
-273,6
+283,7
@@
int main(int argc, char **argv)
int fd[2], ret;
pid_t pid;
int fd[2], ret;
pid_t pid;
+ setup_git_directory();
argv++;
for (i = 1; i < argc; i++, argv++) {
char *arg = *argv;
argv++;
for (i = 1; i < argc; i++, argv++) {
char *arg = *argv;