2005-06-30 06:09:05 +04:00
|
|
|
#include "cache.h"
|
2005-07-19 15:03:47 +04:00
|
|
|
#include "commit.h"
|
2005-08-05 11:47:56 +04:00
|
|
|
#include "tag.h"
|
2005-07-09 00:58:40 +04:00
|
|
|
#include "refs.h"
|
2005-06-30 07:50:15 +04:00
|
|
|
#include "pkt-line.h"
|
2007-03-13 02:00:29 +03:00
|
|
|
#include "run-command.h"
|
2007-05-12 19:45:59 +04:00
|
|
|
#include "remote.h"
|
2007-10-30 05:03:39 +03:00
|
|
|
#include "send-pack.h"
|
2005-06-30 06:09:05 +04:00
|
|
|
|
2005-07-14 11:10:05 +04:00
|
|
|
static const char send_pack_usage[] =
|
2007-11-10 02:32:10 +03:00
|
|
|
"git-send-pack [--all | --mirror] [--dry-run] [--force] [--receive-pack=<git-receive-pack>] [--verbose] [--thin] [<host>:]<directory> [<ref>...]\n"
|
2007-01-19 15:43:00 +03:00
|
|
|
" --all and explicit <ref> specification are mutually exclusive.";
|
2007-10-30 05:03:39 +03:00
|
|
|
|
|
|
|
static struct send_pack_args args = {
|
|
|
|
/* .receivepack = */ "git-receive-pack",
|
|
|
|
};
|
2005-06-30 06:09:05 +04:00
|
|
|
|
2006-09-06 01:52:12 +04:00
|
|
|
/*
|
2006-12-31 12:26:53 +03:00
|
|
|
* Make a pack stream and spit it out into file descriptor fd
|
2006-09-06 01:52:12 +04:00
|
|
|
*/
|
2006-12-31 12:26:53 +03:00
|
|
|
static int pack_objects(int fd, struct ref *refs)
|
2006-09-06 01:52:12 +04:00
|
|
|
{
|
2007-03-13 02:00:29 +03:00
|
|
|
/*
|
|
|
|
* The child becomes pack-objects --revs; we feed
|
|
|
|
* the revision parameters to it via its stdin and
|
|
|
|
* let its stdout go back to the other end.
|
|
|
|
*/
|
2007-10-30 05:03:39 +03:00
|
|
|
const char *argv[] = {
|
2007-03-13 02:00:29 +03:00
|
|
|
"pack-objects",
|
|
|
|
"--all-progress",
|
|
|
|
"--revs",
|
|
|
|
"--stdout",
|
|
|
|
NULL,
|
|
|
|
NULL,
|
|
|
|
};
|
|
|
|
struct child_process po;
|
2006-09-06 01:52:12 +04:00
|
|
|
|
2007-10-30 05:03:39 +03:00
|
|
|
if (args.use_thin_pack)
|
|
|
|
argv[4] = "--thin";
|
2007-03-13 02:00:29 +03:00
|
|
|
memset(&po, 0, sizeof(po));
|
2007-10-30 05:03:39 +03:00
|
|
|
po.argv = argv;
|
2007-03-13 02:00:29 +03:00
|
|
|
po.in = -1;
|
|
|
|
po.out = fd;
|
|
|
|
po.git_cmd = 1;
|
|
|
|
if (start_command(&po))
|
|
|
|
die("git-pack-objects failed (%s)", strerror(errno));
|
2006-09-06 01:52:12 +04:00
|
|
|
|
2006-12-31 12:26:53 +03:00
|
|
|
/*
|
|
|
|
* We feed the pack-objects we just spawned with revision
|
|
|
|
* parameters by writing to the pipe.
|
2006-09-06 01:52:12 +04:00
|
|
|
*/
|
|
|
|
while (refs) {
|
|
|
|
char buf[42];
|
|
|
|
|
|
|
|
if (!is_null_sha1(refs->old_sha1) &&
|
|
|
|
has_sha1_file(refs->old_sha1)) {
|
|
|
|
memcpy(buf + 1, sha1_to_hex(refs->old_sha1), 40);
|
|
|
|
buf[0] = '^';
|
|
|
|
buf[41] = '\n';
|
2007-03-13 02:00:29 +03:00
|
|
|
if (!write_or_whine(po.in, buf, 42,
|
2007-01-02 17:12:09 +03:00
|
|
|
"send-pack: send refs"))
|
|
|
|
break;
|
2006-09-06 01:52:12 +04:00
|
|
|
}
|
|
|
|
if (!is_null_sha1(refs->new_sha1)) {
|
|
|
|
memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
|
|
|
|
buf[40] = '\n';
|
2007-03-13 02:00:29 +03:00
|
|
|
if (!write_or_whine(po.in, buf, 41,
|
2007-01-02 17:12:09 +03:00
|
|
|
"send-pack: send refs"))
|
|
|
|
break;
|
2006-09-06 01:52:12 +04:00
|
|
|
}
|
|
|
|
refs = refs->next;
|
|
|
|
}
|
|
|
|
|
2008-02-16 20:36:38 +03:00
|
|
|
close(po.in);
|
2007-03-13 02:00:29 +03:00
|
|
|
if (finish_command(&po))
|
|
|
|
return error("pack-objects died with strange error");
|
|
|
|
return 0;
|
2005-06-30 21:17:39 +04:00
|
|
|
}
|
2005-06-30 09:31:41 +04:00
|
|
|
|
2005-08-06 10:05:33 +04:00
|
|
|
static void unmark_and_free(struct commit_list *list, unsigned int mark)
|
|
|
|
{
|
|
|
|
while (list) {
|
|
|
|
struct commit_list *temp = list;
|
|
|
|
temp->item->object.flags &= ~mark;
|
|
|
|
list = temp->next;
|
|
|
|
free(temp);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2005-08-05 11:47:56 +04:00
|
|
|
static int ref_newer(const unsigned char *new_sha1,
|
|
|
|
const unsigned char *old_sha1)
|
2005-07-09 00:58:40 +04:00
|
|
|
{
|
2005-08-05 11:47:56 +04:00
|
|
|
struct object *o;
|
|
|
|
struct commit *old, *new;
|
2005-08-06 10:05:33 +04:00
|
|
|
struct commit_list *list, *used;
|
|
|
|
int found = 0;
|
2005-07-19 15:03:47 +04:00
|
|
|
|
2005-08-05 11:47:56 +04:00
|
|
|
/* Both new and old must be commit-ish and new is descendant of
|
|
|
|
* old. Otherwise we require --force.
|
|
|
|
*/
|
2005-11-03 02:19:13 +03:00
|
|
|
o = deref_tag(parse_object(old_sha1), NULL, 0);
|
2006-07-12 07:45:31 +04:00
|
|
|
if (!o || o->type != OBJ_COMMIT)
|
2005-07-09 00:58:40 +04:00
|
|
|
return 0;
|
2005-08-05 11:47:56 +04:00
|
|
|
old = (struct commit *) o;
|
|
|
|
|
2005-11-03 02:19:13 +03:00
|
|
|
o = deref_tag(parse_object(new_sha1), NULL, 0);
|
2006-07-12 07:45:31 +04:00
|
|
|
if (!o || o->type != OBJ_COMMIT)
|
2005-07-19 15:03:47 +04:00
|
|
|
return 0;
|
2005-08-05 11:47:56 +04:00
|
|
|
new = (struct commit *) o;
|
|
|
|
|
2005-07-19 15:03:47 +04:00
|
|
|
if (parse_commit(new) < 0)
|
|
|
|
return 0;
|
2005-08-06 10:05:33 +04:00
|
|
|
|
|
|
|
used = list = NULL;
|
2005-07-19 15:03:47 +04:00
|
|
|
commit_list_insert(new, &list);
|
2005-07-27 07:04:22 +04:00
|
|
|
while (list) {
|
|
|
|
new = pop_most_recent_commit(&list, 1);
|
2005-08-06 10:05:33 +04:00
|
|
|
commit_list_insert(new, &used);
|
|
|
|
if (new == old) {
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
2005-07-19 15:03:47 +04:00
|
|
|
}
|
2005-08-06 10:05:33 +04:00
|
|
|
unmark_and_free(list, 1);
|
|
|
|
unmark_and_free(used, 1);
|
|
|
|
return found;
|
2005-07-09 00:58:40 +04:00
|
|
|
}
|
|
|
|
|
2005-08-04 03:35:29 +04:00
|
|
|
static struct ref *local_refs, **local_tail;
|
|
|
|
static struct ref *remote_refs, **remote_tail;
|
2005-07-09 00:58:40 +04:00
|
|
|
|
2006-09-21 09:02:01 +04:00
|
|
|
static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
|
2005-07-09 00:58:40 +04:00
|
|
|
{
|
|
|
|
struct ref *ref;
|
2005-08-04 03:35:29 +04:00
|
|
|
int len = strlen(refname) + 1;
|
|
|
|
ref = xcalloc(1, sizeof(*ref) + len);
|
2006-08-23 10:49:00 +04:00
|
|
|
hashcpy(ref->new_sha1, sha1);
|
2005-07-09 00:58:40 +04:00
|
|
|
memcpy(ref->name, refname, len);
|
2005-08-04 03:35:29 +04:00
|
|
|
*local_tail = ref;
|
|
|
|
local_tail = &ref->next;
|
2005-07-09 00:58:40 +04:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-08-04 03:35:29 +04:00
|
|
|
static void get_local_heads(void)
|
|
|
|
{
|
|
|
|
local_tail = &local_refs;
|
2006-09-21 08:47:42 +04:00
|
|
|
for_each_ref(one_local_ref, NULL);
|
2005-08-04 03:35:29 +04:00
|
|
|
}
|
|
|
|
|
2007-11-17 15:56:03 +03:00
|
|
|
static int receive_status(int in, struct ref *refs)
|
|
|
|
{
|
|
|
|
struct ref *hint;
|
2005-12-26 10:18:37 +03:00
|
|
|
char line[1000];
|
|
|
|
int ret = 0;
|
|
|
|
int len = packet_read_line(in, line, sizeof(line));
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
if (len < 10 || memcmp(line, "unpack ", 7))
|
|
|
|
return error("did not receive remote status");
|
2005-12-26 10:18:37 +03:00
|
|
|
if (memcmp(line, "unpack ok\n", 10)) {
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
char *p = line + strlen(line) - 1;
|
|
|
|
if (*p == '\n')
|
|
|
|
*p = '\0';
|
|
|
|
error("unpack failed: %s", line + 7);
|
2005-12-26 10:18:37 +03:00
|
|
|
ret = -1;
|
|
|
|
}
|
2007-11-17 15:56:03 +03:00
|
|
|
hint = NULL;
|
2005-12-26 10:18:37 +03:00
|
|
|
while (1) {
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
char *refname;
|
|
|
|
char *msg;
|
2005-12-26 10:18:37 +03:00
|
|
|
len = packet_read_line(in, line, sizeof(line));
|
|
|
|
if (!len)
|
|
|
|
break;
|
|
|
|
if (len < 3 ||
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
(memcmp(line, "ok ", 3) && memcmp(line, "ng ", 3))) {
|
2005-12-26 10:18:37 +03:00
|
|
|
fprintf(stderr, "protocol error: %s\n", line);
|
|
|
|
ret = -1;
|
|
|
|
break;
|
|
|
|
}
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
|
|
|
|
line[strlen(line)-1] = '\0';
|
|
|
|
refname = line + 3;
|
|
|
|
msg = strchr(refname, ' ');
|
|
|
|
if (msg)
|
|
|
|
*msg++ = '\0';
|
|
|
|
|
|
|
|
/* first try searching at our hint, falling back to all refs */
|
2007-11-17 15:56:03 +03:00
|
|
|
if (hint)
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
hint = find_ref_by_name(hint, refname);
|
2007-11-17 15:56:03 +03:00
|
|
|
if (!hint)
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
hint = find_ref_by_name(refs, refname);
|
|
|
|
if (!hint) {
|
|
|
|
warning("remote reported status on unknown ref: %s",
|
|
|
|
refname);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
if (hint->status != REF_STATUS_EXPECTING_REPORT) {
|
|
|
|
warning("remote reported status on unexpected ref: %s",
|
|
|
|
refname);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (line[0] == 'o' && line[1] == 'k')
|
|
|
|
hint->status = REF_STATUS_OK;
|
|
|
|
else {
|
|
|
|
hint->status = REF_STATUS_REMOTE_REJECT;
|
|
|
|
ret = -1;
|
|
|
|
}
|
|
|
|
if (msg)
|
|
|
|
hint->remote_status = xstrdup(msg);
|
|
|
|
/* start our next search from the next ref */
|
|
|
|
hint = hint->next;
|
2005-12-26 10:18:37 +03:00
|
|
|
}
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2007-10-18 10:19:15 +04:00
|
|
|
static void update_tracking_ref(struct remote *remote, struct ref *ref)
|
|
|
|
{
|
|
|
|
struct refspec rs;
|
|
|
|
|
2007-11-17 15:55:15 +03:00
|
|
|
if (ref->status != REF_STATUS_OK)
|
2007-10-18 10:19:15 +04:00
|
|
|
return;
|
|
|
|
|
2007-11-17 15:55:15 +03:00
|
|
|
rs.src = ref->name;
|
|
|
|
rs.dst = NULL;
|
2007-10-18 10:19:15 +04:00
|
|
|
|
|
|
|
if (!remote_find_tracking(remote, &rs)) {
|
2007-11-05 08:12:18 +03:00
|
|
|
if (args.verbose)
|
|
|
|
fprintf(stderr, "updating local tracking ref '%s'\n", rs.dst);
|
2007-11-17 15:55:15 +03:00
|
|
|
if (ref->deletion) {
|
make deleting a missing ref more quiet
If git attempts to delete a ref, but the unlink of the ref
file fails, we print a message to stderr. This is usually a
good thing, but if the error is ENOENT, then it indicates
that the ref has _already_ been deleted. And since that's
our goal, it doesn't make sense to complain to the user.
This harmonizes the error reporting behavior for the
unpacked and packed cases; the packed case already printed
nothing on ENOENT, but the unpacked printed unconditionally.
Additionally, send-pack would, when deleting the tracking
ref corresponding to a remote delete, print "Failed to
delete" on any failure. This can be a misleading
message, since we actually _did_ delete at the remote side,
but we failed to delete locally. Rather than make the
message more precise, let's just eliminate it entirely; the
delete_ref routine already takes care of printing out a much
more specific message about what went wrong.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-07-08 08:08:02 +04:00
|
|
|
delete_ref(rs.dst, NULL);
|
2007-10-18 10:19:15 +04:00
|
|
|
} else
|
|
|
|
update_ref("update by push", rs.dst,
|
|
|
|
ref->new_sha1, NULL, 0, 0);
|
|
|
|
free(rs.dst);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-17 15:54:27 +03:00
|
|
|
static const char *prettify_ref(const struct ref *ref)
|
2007-11-05 08:11:15 +03:00
|
|
|
{
|
2007-11-17 15:54:27 +03:00
|
|
|
const char *name = ref->name;
|
2007-11-05 08:11:15 +03:00
|
|
|
return name + (
|
|
|
|
!prefixcmp(name, "refs/heads/") ? 11 :
|
|
|
|
!prefixcmp(name, "refs/tags/") ? 10 :
|
|
|
|
!prefixcmp(name, "refs/remotes/") ? 13 :
|
|
|
|
0);
|
|
|
|
}
|
|
|
|
|
|
|
|
#define SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
|
|
|
|
|
2007-11-17 15:54:27 +03:00
|
|
|
static void print_ref_status(char flag, const char *summary, struct ref *to, struct ref *from, const char *msg)
|
|
|
|
{
|
|
|
|
fprintf(stderr, " %c %-*s ", flag, SUMMARY_WIDTH, summary);
|
|
|
|
if (from)
|
|
|
|
fprintf(stderr, "%s -> %s", prettify_ref(from), prettify_ref(to));
|
|
|
|
else
|
|
|
|
fputs(prettify_ref(to), stderr);
|
|
|
|
if (msg) {
|
|
|
|
fputs(" (", stderr);
|
|
|
|
fputs(msg, stderr);
|
|
|
|
fputc(')', stderr);
|
|
|
|
}
|
|
|
|
fputc('\n', stderr);
|
|
|
|
}
|
|
|
|
|
|
|
|
static const char *status_abbrev(unsigned char sha1[20])
|
|
|
|
{
|
2008-03-02 10:43:32 +03:00
|
|
|
return find_unique_abbrev(sha1, DEFAULT_ABBREV);
|
2007-11-17 15:54:27 +03:00
|
|
|
}
|
|
|
|
|
|
|
|
static void print_ok_ref_status(struct ref *ref)
|
|
|
|
{
|
|
|
|
if (ref->deletion)
|
|
|
|
print_ref_status('-', "[deleted]", ref, NULL, NULL);
|
|
|
|
else if (is_null_sha1(ref->old_sha1))
|
|
|
|
print_ref_status('*',
|
|
|
|
(!prefixcmp(ref->name, "refs/tags/") ? "[new tag]" :
|
|
|
|
"[new branch]"),
|
|
|
|
ref, ref->peer_ref, NULL);
|
|
|
|
else {
|
|
|
|
char quickref[84];
|
|
|
|
char type;
|
|
|
|
const char *msg;
|
|
|
|
|
|
|
|
strcpy(quickref, status_abbrev(ref->old_sha1));
|
|
|
|
if (ref->nonfastforward) {
|
|
|
|
strcat(quickref, "...");
|
|
|
|
type = '+';
|
|
|
|
msg = "forced update";
|
|
|
|
} else {
|
|
|
|
strcat(quickref, "..");
|
|
|
|
type = ' ';
|
|
|
|
msg = NULL;
|
|
|
|
}
|
|
|
|
strcat(quickref, status_abbrev(ref->new_sha1));
|
|
|
|
|
|
|
|
print_ref_status(type, quickref, ref, ref->peer_ref, msg);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-20 14:18:01 +03:00
|
|
|
static int print_one_push_status(struct ref *ref, const char *dest, int count)
|
|
|
|
{
|
|
|
|
if (!count)
|
|
|
|
fprintf(stderr, "To %s\n", dest);
|
|
|
|
|
|
|
|
switch(ref->status) {
|
|
|
|
case REF_STATUS_NONE:
|
|
|
|
print_ref_status('X', "[no match]", ref, NULL, NULL);
|
|
|
|
break;
|
|
|
|
case REF_STATUS_REJECT_NODELETE:
|
|
|
|
print_ref_status('!', "[rejected]", ref, NULL,
|
|
|
|
"remote does not support deleting refs");
|
|
|
|
break;
|
|
|
|
case REF_STATUS_UPTODATE:
|
|
|
|
print_ref_status('=', "[up to date]", ref,
|
|
|
|
ref->peer_ref, NULL);
|
|
|
|
break;
|
|
|
|
case REF_STATUS_REJECT_NONFASTFORWARD:
|
|
|
|
print_ref_status('!', "[rejected]", ref, ref->peer_ref,
|
|
|
|
"non-fast forward");
|
|
|
|
break;
|
|
|
|
case REF_STATUS_REMOTE_REJECT:
|
|
|
|
print_ref_status('!', "[remote rejected]", ref,
|
|
|
|
ref->deletion ? NULL : ref->peer_ref,
|
|
|
|
ref->remote_status);
|
|
|
|
break;
|
|
|
|
case REF_STATUS_EXPECTING_REPORT:
|
|
|
|
print_ref_status('!', "[remote failure]", ref,
|
|
|
|
ref->deletion ? NULL : ref->peer_ref,
|
|
|
|
"remote failed to report status");
|
|
|
|
break;
|
|
|
|
case REF_STATUS_OK:
|
|
|
|
print_ok_ref_status(ref);
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
|
2007-11-17 15:54:27 +03:00
|
|
|
static void print_push_status(const char *dest, struct ref *refs)
|
|
|
|
{
|
|
|
|
struct ref *ref;
|
2007-11-20 14:18:01 +03:00
|
|
|
int n = 0;
|
2007-11-17 15:54:27 +03:00
|
|
|
|
2007-11-20 14:18:01 +03:00
|
|
|
if (args.verbose) {
|
|
|
|
for (ref = refs; ref; ref = ref->next)
|
|
|
|
if (ref->status == REF_STATUS_UPTODATE)
|
|
|
|
n += print_one_push_status(ref, dest, n);
|
|
|
|
}
|
2007-11-17 15:54:27 +03:00
|
|
|
|
2007-11-20 14:18:01 +03:00
|
|
|
for (ref = refs; ref; ref = ref->next)
|
|
|
|
if (ref->status == REF_STATUS_OK)
|
|
|
|
n += print_one_push_status(ref, dest, n);
|
2007-11-17 15:54:27 +03:00
|
|
|
|
2007-11-20 14:18:01 +03:00
|
|
|
for (ref = refs; ref; ref = ref->next) {
|
|
|
|
if (ref->status != REF_STATUS_NONE &&
|
|
|
|
ref->status != REF_STATUS_UPTODATE &&
|
|
|
|
ref->status != REF_STATUS_OK)
|
|
|
|
n += print_one_push_status(ref, dest, n);
|
2007-11-17 15:54:27 +03:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-11-18 11:08:22 +03:00
|
|
|
static int refs_pushed(struct ref *ref)
|
|
|
|
{
|
|
|
|
for (; ref; ref = ref->next) {
|
|
|
|
switch(ref->status) {
|
|
|
|
case REF_STATUS_NONE:
|
|
|
|
case REF_STATUS_UPTODATE:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2007-11-05 08:11:15 +03:00
|
|
|
static int do_send_pack(int in, int out, struct remote *remote, const char *dest, int nr_refspec, const char **refspec)
|
2005-06-30 06:09:05 +04:00
|
|
|
{
|
2005-06-30 09:50:48 +04:00
|
|
|
struct ref *ref;
|
2005-07-09 00:58:40 +04:00
|
|
|
int new_refs;
|
2005-12-26 10:18:37 +03:00
|
|
|
int ask_for_status_report = 0;
|
2006-11-24 11:26:49 +03:00
|
|
|
int allow_deleting_refs = 0;
|
2005-12-26 10:18:37 +03:00
|
|
|
int expect_status_report = 0;
|
2007-11-10 02:32:10 +03:00
|
|
|
int flags = MATCH_REFS_NONE;
|
2007-11-17 15:56:03 +03:00
|
|
|
int ret;
|
2007-11-10 02:32:10 +03:00
|
|
|
|
|
|
|
if (args.send_all)
|
|
|
|
flags |= MATCH_REFS_ALL;
|
|
|
|
if (args.send_mirror)
|
|
|
|
flags |= MATCH_REFS_MIRROR;
|
2005-06-30 09:50:48 +04:00
|
|
|
|
2005-08-04 03:35:29 +04:00
|
|
|
/* No funny business with the matcher */
|
Improve git-peek-remote
This makes git-peek-remote able to basically do everything that
git-ls-remote does (but obviously just for the native protocol, so no
http[s]: or rsync: support).
The default behaviour is the same, but you can now give a mixture of
"--refs", "--tags" and "--heads" flags, where "--refs" forces
git-peek-remote to only show real refs (ie none of the fakey tag lookups,
but also not the special pseudo-refs like HEAD and MERGE_HEAD).
The "--tags" and "--heads" flags respectively limit the output to just
regular tags and heads, of course.
You can still also ask to limit them by name too.
You can combine the flags, so
git peek-remote --refs --tags .
will show all local _true_ tags, without the generated tag lookups
(compare the output without the "--refs" flag).
And "--tags --heads" will show both tags and heads, but will avoid (for
example) any special refs outside of the standard locations.
I'm also planning on adding a "--ignore-local" flag that allows us to ask
it to ignore any refs that we already have in the local tree, but that's
an independent thing.
All this is obviously gearing up to making "git fetch" cheaper.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2006-07-04 23:29:10 +04:00
|
|
|
remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
|
2005-08-04 03:35:29 +04:00
|
|
|
get_local_heads();
|
2005-07-09 00:58:40 +04:00
|
|
|
|
2005-12-26 10:18:37 +03:00
|
|
|
/* Does the other end support the reporting? */
|
|
|
|
if (server_supports("report-status"))
|
|
|
|
ask_for_status_report = 1;
|
2006-11-24 11:26:49 +03:00
|
|
|
if (server_supports("delete-refs"))
|
|
|
|
allow_deleting_refs = 1;
|
2005-12-26 10:18:37 +03:00
|
|
|
|
2005-08-04 03:35:29 +04:00
|
|
|
/* match them up */
|
|
|
|
if (!remote_tail)
|
|
|
|
remote_tail = &remote_refs;
|
|
|
|
if (match_refs(local_refs, remote_refs, &remote_tail,
|
2008-02-22 01:42:56 +03:00
|
|
|
nr_refspec, refspec, flags)) {
|
|
|
|
close(out);
|
2005-08-04 03:35:29 +04:00
|
|
|
return -1;
|
2008-02-22 01:42:56 +03:00
|
|
|
}
|
2005-12-04 19:59:37 +03:00
|
|
|
|
|
|
|
if (!remote_refs) {
|
2007-10-17 01:16:05 +04:00
|
|
|
fprintf(stderr, "No refs in common and none specified; doing nothing.\n"
|
|
|
|
"Perhaps you should specify a branch such as 'master'.\n");
|
2008-02-22 01:42:56 +03:00
|
|
|
close(out);
|
2005-12-04 19:59:37 +03:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2005-07-09 00:58:40 +04:00
|
|
|
/*
|
2005-08-04 03:35:29 +04:00
|
|
|
* Finally, tell the other end!
|
2005-07-09 00:58:40 +04:00
|
|
|
*/
|
2005-08-04 03:35:29 +04:00
|
|
|
new_refs = 0;
|
|
|
|
for (ref = remote_refs; ref; ref = ref->next) {
|
2007-11-10 02:32:10 +03:00
|
|
|
const unsigned char *new_sha1;
|
2006-11-24 11:26:49 +03:00
|
|
|
|
2007-11-10 02:32:10 +03:00
|
|
|
if (!ref->peer_ref) {
|
|
|
|
if (!args.send_mirror)
|
|
|
|
continue;
|
|
|
|
new_sha1 = null_sha1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
new_sha1 = ref->peer_ref->new_sha1;
|
2006-11-24 11:26:49 +03:00
|
|
|
|
2007-11-10 02:32:10 +03:00
|
|
|
|
2007-11-17 15:54:27 +03:00
|
|
|
ref->deletion = is_null_sha1(new_sha1);
|
|
|
|
if (ref->deletion && !allow_deleting_refs) {
|
|
|
|
ref->status = REF_STATUS_REJECT_NODELETE;
|
2006-11-24 11:26:49 +03:00
|
|
|
continue;
|
|
|
|
}
|
2007-11-17 15:54:27 +03:00
|
|
|
if (!ref->deletion &&
|
2007-11-10 02:32:10 +03:00
|
|
|
!hashcmp(ref->old_sha1, new_sha1)) {
|
2007-11-17 15:54:27 +03:00
|
|
|
ref->status = REF_STATUS_UPTODATE;
|
2005-08-05 11:47:56 +04:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* This part determines what can overwrite what.
|
|
|
|
* The rules are:
|
|
|
|
*
|
2005-08-24 11:40:14 +04:00
|
|
|
* (0) you can always use --force or +A:B notation to
|
|
|
|
* selectively force individual ref pairs.
|
2005-08-05 11:47:56 +04:00
|
|
|
*
|
|
|
|
* (1) if the old thing does not exist, it is OK.
|
|
|
|
*
|
|
|
|
* (2) if you do not have the old thing, you are not allowed
|
|
|
|
* to overwrite it; you would not know what you are losing
|
|
|
|
* otherwise.
|
|
|
|
*
|
|
|
|
* (3) if both new and old are commit-ish, and new is a
|
|
|
|
* descendant of old, it is OK.
|
2006-11-24 11:26:49 +03:00
|
|
|
*
|
|
|
|
* (4) regardless of all of the above, removing :B is
|
|
|
|
* always allowed.
|
2005-08-05 11:47:56 +04:00
|
|
|
*/
|
|
|
|
|
2007-11-17 15:54:27 +03:00
|
|
|
ref->nonfastforward =
|
|
|
|
!ref->deletion &&
|
2006-12-31 11:59:53 +03:00
|
|
|
!is_null_sha1(ref->old_sha1) &&
|
2007-11-17 15:54:27 +03:00
|
|
|
(!has_sha1_file(ref->old_sha1)
|
|
|
|
|| !ref_newer(new_sha1, ref->old_sha1));
|
|
|
|
|
|
|
|
if (ref->nonfastforward && !ref->force && !args.force_update) {
|
|
|
|
ref->status = REF_STATUS_REJECT_NONFASTFORWARD;
|
|
|
|
continue;
|
2005-06-30 09:31:41 +04:00
|
|
|
}
|
2007-11-17 15:54:27 +03:00
|
|
|
|
2007-11-10 02:32:10 +03:00
|
|
|
hashcpy(ref->new_sha1, new_sha1);
|
2007-11-17 15:54:27 +03:00
|
|
|
if (!ref->deletion)
|
2006-11-24 11:26:49 +03:00
|
|
|
new_refs++;
|
2005-12-26 10:18:37 +03:00
|
|
|
|
2007-10-30 05:03:39 +03:00
|
|
|
if (!args.dry_run) {
|
2007-11-17 15:54:27 +03:00
|
|
|
char *old_hex = sha1_to_hex(ref->old_sha1);
|
|
|
|
char *new_hex = sha1_to_hex(ref->new_sha1);
|
|
|
|
|
2007-10-11 23:32:26 +04:00
|
|
|
if (ask_for_status_report) {
|
|
|
|
packet_write(out, "%s %s %s%c%s",
|
|
|
|
old_hex, new_hex, ref->name, 0,
|
|
|
|
"report-status");
|
|
|
|
ask_for_status_report = 0;
|
|
|
|
expect_status_report = 1;
|
|
|
|
}
|
|
|
|
else
|
|
|
|
packet_write(out, "%s %s %s",
|
|
|
|
old_hex, new_hex, ref->name);
|
2005-12-26 10:18:37 +03:00
|
|
|
}
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
ref->status = expect_status_report ?
|
|
|
|
REF_STATUS_EXPECTING_REPORT :
|
|
|
|
REF_STATUS_OK;
|
2005-06-30 06:09:05 +04:00
|
|
|
}
|
2005-08-04 03:35:29 +04:00
|
|
|
|
2005-06-30 07:50:15 +04:00
|
|
|
packet_flush(out);
|
2007-11-17 15:54:27 +03:00
|
|
|
if (new_refs && !args.dry_run) {
|
2008-02-22 01:42:56 +03:00
|
|
|
if (pack_objects(out, remote_refs) < 0)
|
2007-11-17 15:54:27 +03:00
|
|
|
return -1;
|
|
|
|
}
|
2008-02-22 01:42:56 +03:00
|
|
|
else
|
|
|
|
close(out);
|
2005-12-26 10:18:37 +03:00
|
|
|
|
send-pack: tighten remote error reporting
Previously, we set all ref pushes to 'OK', and then marked
them as errors if the remote reported so. This has the
problem that if the remote dies or fails to report a ref, we
just assume it was OK.
Instead, we use a new non-OK state to indicate that we are
expecting status (if the remote doesn't support the
report-status feature, we fall back on the old behavior).
Thus we can flag refs for which we expected a status, but
got none (conversely, we now also print a warning for refs
for which we get a status, but weren't expecting one).
This also allows us to simplify the receive_status exit
code, since each ref is individually marked with failure
until we get a success response. We can just print the usual
status table, so the user still gets a sense of what we were
trying to do when the failure happened.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2007-11-18 10:16:52 +03:00
|
|
|
if (expect_status_report)
|
2007-11-17 15:56:03 +03:00
|
|
|
ret = receive_status(in, remote_refs);
|
|
|
|
else
|
|
|
|
ret = 0;
|
|
|
|
|
|
|
|
print_push_status(dest, remote_refs);
|
2005-12-26 10:18:37 +03:00
|
|
|
|
2007-11-17 15:54:27 +03:00
|
|
|
if (!args.dry_run && remote) {
|
2007-10-18 10:19:15 +04:00
|
|
|
for (ref = remote_refs; ref; ref = ref->next)
|
2007-11-17 15:55:15 +03:00
|
|
|
update_tracking_ref(remote, ref);
|
2007-10-18 10:19:15 +04:00
|
|
|
}
|
|
|
|
|
2007-11-18 11:08:22 +03:00
|
|
|
if (!refs_pushed(remote_refs))
|
2005-12-26 10:18:37 +03:00
|
|
|
fprintf(stderr, "Everything up-to-date\n");
|
2007-11-17 15:56:03 +03:00
|
|
|
if (ret < 0)
|
|
|
|
return ret;
|
2007-11-17 15:54:27 +03:00
|
|
|
for (ref = remote_refs; ref; ref = ref->next) {
|
|
|
|
switch (ref->status) {
|
|
|
|
case REF_STATUS_NONE:
|
|
|
|
case REF_STATUS_UPTODATE:
|
|
|
|
case REF_STATUS_OK:
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
return -1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
2005-06-30 06:09:05 +04:00
|
|
|
}
|
|
|
|
|
2007-10-30 04:05:40 +03:00
|
|
|
static void verify_remote_names(int nr_heads, const char **heads)
|
2006-12-13 21:30:11 +03:00
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < nr_heads; i++) {
|
2008-04-28 19:32:12 +04:00
|
|
|
const char *local = heads[i];
|
remote.c: Fix overtight refspec validation
We tightened the refspec validation code in an earlier commit ef00d15
(Tighten refspec processing, 2008-03-17) per my suggestion, but the
suggestion was misguided to begin with and it broke this usage:
$ git push origin HEAD~12:master
The syntax of push refspecs and fetch refspecs are similar in that they
are both colon separated LHS and RHS (possibly prefixed with a + to
force), but the similarity ends there. For example, LHS in a push refspec
can be anything that evaluates to a valid object name at runtime (except
when colon and RHS is missing, or it is a glob), while it must be a
valid-looking refname in a fetch refspec. To validate them correctly, the
caller needs to be able to say which kind of refspecs they are. It is
unreasonable to keep a single interface that cannot tell which kind it is
dealing with, and ask it to behave sensibly.
This commit separates the parsing of the two into different functions, and
clarifies the code to implement the parsing proper (i.e. splitting into
two parts, making sure both sides are wildcard or neither side is).
This happens to also allow pushing a commit named with the esoteric "look
for that string" syntax:
$ git push ../test.git ':/remote.c: Fix overtight refspec:master'
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-03-21 09:34:37 +03:00
|
|
|
const char *remote = strrchr(heads[i], ':');
|
2006-12-13 21:30:11 +03:00
|
|
|
|
2008-04-28 19:32:12 +04:00
|
|
|
if (*local == '+')
|
|
|
|
local++;
|
|
|
|
|
|
|
|
/* A matching refspec is okay. */
|
|
|
|
if (remote == local && remote[1] == '\0')
|
|
|
|
continue;
|
|
|
|
|
|
|
|
remote = remote ? (remote + 1) : local;
|
2006-12-13 21:30:11 +03:00
|
|
|
switch (check_ref_format(remote)) {
|
|
|
|
case 0: /* ok */
|
2008-01-02 22:14:40 +03:00
|
|
|
case CHECK_REF_FORMAT_ONELEVEL:
|
|
|
|
/* ok but a single level -- that is fine for
|
|
|
|
* a match pattern.
|
|
|
|
*/
|
|
|
|
case CHECK_REF_FORMAT_WILDCARD:
|
|
|
|
/* ok but ends with a pattern-match character */
|
2006-12-13 21:30:11 +03:00
|
|
|
continue;
|
|
|
|
}
|
|
|
|
die("remote part of refspec is not a valid name in %s",
|
|
|
|
heads[i]);
|
|
|
|
}
|
|
|
|
}
|
2005-08-04 03:35:29 +04:00
|
|
|
|
2007-10-30 05:03:39 +03:00
|
|
|
int cmd_send_pack(int argc, const char **argv, const char *prefix)
|
2005-06-30 06:09:05 +04:00
|
|
|
{
|
|
|
|
int i, nr_heads = 0;
|
2007-10-30 04:05:40 +03:00
|
|
|
const char **heads = NULL;
|
2007-10-30 05:03:39 +03:00
|
|
|
const char *remote_name = NULL;
|
2007-05-16 06:50:19 +04:00
|
|
|
struct remote *remote = NULL;
|
2007-10-30 05:03:39 +03:00
|
|
|
const char *dest = NULL;
|
2006-03-24 10:41:18 +03:00
|
|
|
|
2005-06-30 06:09:05 +04:00
|
|
|
argv++;
|
2005-07-17 00:26:33 +04:00
|
|
|
for (i = 1; i < argc; i++, argv++) {
|
2007-10-30 05:03:39 +03:00
|
|
|
const char *arg = *argv;
|
2005-06-30 06:09:05 +04:00
|
|
|
|
|
|
|
if (*arg == '-') {
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 12:53:29 +03:00
|
|
|
if (!prefixcmp(arg, "--receive-pack=")) {
|
2007-10-30 05:03:39 +03:00
|
|
|
args.receivepack = arg + 15;
|
2007-01-19 15:49:27 +03:00
|
|
|
continue;
|
|
|
|
}
|
Mechanical conversion to use prefixcmp()
This mechanically converts strncmp() to use prefixcmp(), but only when
the parameters match specific patterns, so that they can be verified
easily. Leftover from this will be fixed in a separate step, including
idiotic conversions like
if (!strncmp("foo", arg, 3))
=>
if (!(-prefixcmp(arg, "foo")))
This was done by using this script in px.perl
#!/usr/bin/perl -i.bak -p
if (/strncmp\(([^,]+), "([^\\"]*)", (\d+)\)/ && (length($2) == $3)) {
s|strncmp\(([^,]+), "([^\\"]*)", (\d+)\)|prefixcmp($1, "$2")|;
}
if (/strncmp\("([^\\"]*)", ([^,]+), (\d+)\)/ && (length($1) == $3)) {
s|strncmp\("([^\\"]*)", ([^,]+), (\d+)\)|(-prefixcmp($2, "$1"))|;
}
and running:
$ git grep -l strncmp -- '*.c' | xargs perl px.perl
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-20 12:53:29 +03:00
|
|
|
if (!prefixcmp(arg, "--exec=")) {
|
2007-10-30 05:03:39 +03:00
|
|
|
args.receivepack = arg + 7;
|
2005-06-30 06:09:05 +04:00
|
|
|
continue;
|
|
|
|
}
|
2007-05-16 06:50:19 +04:00
|
|
|
if (!prefixcmp(arg, "--remote=")) {
|
|
|
|
remote_name = arg + 9;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-17 00:26:33 +04:00
|
|
|
if (!strcmp(arg, "--all")) {
|
2007-10-30 05:03:39 +03:00
|
|
|
args.send_all = 1;
|
2005-07-17 00:26:33 +04:00
|
|
|
continue;
|
|
|
|
}
|
2007-10-11 23:32:26 +04:00
|
|
|
if (!strcmp(arg, "--dry-run")) {
|
2007-10-30 05:03:39 +03:00
|
|
|
args.dry_run = 1;
|
2007-10-11 23:32:26 +04:00
|
|
|
continue;
|
|
|
|
}
|
2007-11-10 02:32:10 +03:00
|
|
|
if (!strcmp(arg, "--mirror")) {
|
|
|
|
args.send_mirror = 1;
|
|
|
|
continue;
|
|
|
|
}
|
2005-07-19 15:03:47 +04:00
|
|
|
if (!strcmp(arg, "--force")) {
|
2007-10-30 05:03:39 +03:00
|
|
|
args.force_update = 1;
|
2005-07-19 15:03:47 +04:00
|
|
|
continue;
|
|
|
|
}
|
2005-12-21 05:13:02 +03:00
|
|
|
if (!strcmp(arg, "--verbose")) {
|
2007-10-30 05:03:39 +03:00
|
|
|
args.verbose = 1;
|
2005-12-21 05:13:02 +03:00
|
|
|
continue;
|
|
|
|
}
|
2006-02-20 02:03:49 +03:00
|
|
|
if (!strcmp(arg, "--thin")) {
|
2007-10-30 05:03:39 +03:00
|
|
|
args.use_thin_pack = 1;
|
2006-02-20 02:03:49 +03:00
|
|
|
continue;
|
|
|
|
}
|
2005-06-30 06:09:05 +04:00
|
|
|
usage(send_pack_usage);
|
|
|
|
}
|
2005-07-17 00:26:33 +04:00
|
|
|
if (!dest) {
|
|
|
|
dest = arg;
|
|
|
|
continue;
|
|
|
|
}
|
2007-10-30 04:05:40 +03:00
|
|
|
heads = (const char **) argv;
|
2005-07-17 00:26:33 +04:00
|
|
|
nr_heads = argc - i;
|
2005-06-30 06:09:05 +04:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
if (!dest)
|
|
|
|
usage(send_pack_usage);
|
2007-11-10 02:32:10 +03:00
|
|
|
/*
|
|
|
|
* --all and --mirror are incompatible; neither makes sense
|
|
|
|
* with any refspecs.
|
|
|
|
*/
|
|
|
|
if ((heads && (args.send_all || args.send_mirror)) ||
|
|
|
|
(args.send_all && args.send_mirror))
|
2005-08-02 23:20:27 +04:00
|
|
|
usage(send_pack_usage);
|
2006-12-13 21:30:11 +03:00
|
|
|
|
2007-05-16 06:50:19 +04:00
|
|
|
if (remote_name) {
|
|
|
|
remote = remote_get(remote_name);
|
2007-09-19 08:49:27 +04:00
|
|
|
if (!remote_has_url(remote, dest)) {
|
2007-05-16 06:50:19 +04:00
|
|
|
die("Destination %s is not a uri for %s",
|
|
|
|
dest, remote_name);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2007-10-30 05:03:39 +03:00
|
|
|
return send_pack(&args, dest, remote, nr_heads, heads);
|
|
|
|
}
|
|
|
|
|
|
|
|
int send_pack(struct send_pack_args *my_args,
|
|
|
|
const char *dest, struct remote *remote,
|
|
|
|
int nr_heads, const char **heads)
|
|
|
|
{
|
|
|
|
int fd[2], ret;
|
|
|
|
struct child_process *conn;
|
|
|
|
|
|
|
|
memcpy(&args, my_args, sizeof(args));
|
|
|
|
|
|
|
|
verify_remote_names(nr_heads, heads);
|
|
|
|
|
|
|
|
conn = git_connect(fd, dest, args.receivepack, args.verbose ? CONNECT_VERBOSE : 0);
|
2007-11-05 08:11:15 +03:00
|
|
|
ret = do_send_pack(fd[0], fd[1], remote, dest, nr_heads, heads);
|
2005-06-30 09:50:48 +04:00
|
|
|
close(fd[0]);
|
2008-02-22 01:42:56 +03:00
|
|
|
/* do_send_pack always closes fd[1] */
|
2007-10-19 23:47:53 +04:00
|
|
|
ret |= finish_connect(conn);
|
2006-09-13 12:26:47 +04:00
|
|
|
return !!ret;
|
2005-06-30 06:09:05 +04:00
|
|
|
}
|