2005-06-30 04:09:05 +02:00
|
|
|
#include "cache.h"
|
2005-07-19 13:03:47 +02:00
|
|
|
#include "commit.h"
|
2005-08-05 09:47:56 +02:00
|
|
|
#include "tag.h"
|
2005-07-08 22:58:40 +02:00
|
|
|
#include "refs.h"
|
2005-06-30 05:50:15 +02:00
|
|
|
#include "pkt-line.h"
|
2006-01-11 03:12:17 +01:00
|
|
|
#include "exec_cmd.h"
|
2005-06-30 04:09:05 +02:00
|
|
|
|
2005-07-14 09:10:05 +02:00
|
|
|
static const char send_pack_usage[] =
|
2005-08-02 21:20:27 +02:00
|
|
|
"git-send-pack [--all] [--exec=git-receive-pack] <remote> [<head>...]\n"
|
|
|
|
|
" --all and explicit <head> specification are mutually exclusive.";
|
2005-06-30 04:09:05 +02:00
|
|
|
static const char *exec = "git-receive-pack";
|
2006-08-15 19:23:48 +02:00
|
|
|
static int verbose;
|
|
|
|
|
static int send_all;
|
|
|
|
|
static int force_update;
|
|
|
|
|
static int use_thin_pack;
|
2005-06-30 04:09:05 +02:00
|
|
|
|
2005-07-08 22:58:40 +02:00
|
|
|
static int is_zero_sha1(const unsigned char *sha1)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < 20; i++) {
|
|
|
|
|
if (*sha1++)
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
return 1;
|
|
|
|
|
}
|
|
|
|
|
|
2005-06-30 19:17:39 +02:00
|
|
|
static void exec_pack_objects(void)
|
|
|
|
|
{
|
2006-03-05 11:47:29 +01:00
|
|
|
static const char *args[] = {
|
2006-01-11 03:12:17 +01:00
|
|
|
"pack-objects",
|
2006-10-31 22:58:32 +01:00
|
|
|
"--all-progress",
|
2005-06-30 19:17:39 +02:00
|
|
|
"--stdout",
|
|
|
|
|
NULL
|
|
|
|
|
};
|
2006-01-11 03:12:17 +01:00
|
|
|
execv_git_cmd(args);
|
2005-06-30 19:17:39 +02:00
|
|
|
die("git-pack-objects exec failed (%s)", strerror(errno));
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
static void exec_rev_list(struct ref *refs)
|
|
|
|
|
{
|
2006-09-05 23:52:12 +02:00
|
|
|
static const char *args[4];
|
|
|
|
|
int i = 0;
|
2005-06-30 19:17:39 +02:00
|
|
|
|
2006-01-11 03:12:17 +01:00
|
|
|
args[i++] = "rev-list"; /* 0 */
|
2006-02-20 00:03:49 +01:00
|
|
|
if (use_thin_pack) /* 1 */
|
|
|
|
|
args[i++] = "--objects-edge";
|
|
|
|
|
else
|
|
|
|
|
args[i++] = "--objects";
|
2006-02-22 03:59:37 +01:00
|
|
|
|
2006-09-05 23:52:12 +02:00
|
|
|
args[i++] = "--stdin";
|
2006-02-22 03:59:37 +01:00
|
|
|
|
2005-06-30 19:17:39 +02:00
|
|
|
args[i] = NULL;
|
2006-01-11 03:12:17 +01:00
|
|
|
execv_git_cmd(args);
|
2005-06-30 19:17:39 +02:00
|
|
|
die("git-rev-list exec failed (%s)", strerror(errno));
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-05 23:52:12 +02:00
|
|
|
/*
|
|
|
|
|
* Run "rev-list --stdin | pack-objects" pipe.
|
|
|
|
|
*/
|
2005-06-30 19:17:39 +02:00
|
|
|
static void rev_list(int fd, struct ref *refs)
|
|
|
|
|
{
|
|
|
|
|
int pipe_fd[2];
|
|
|
|
|
pid_t pack_objects_pid;
|
|
|
|
|
|
|
|
|
|
if (pipe(pipe_fd) < 0)
|
|
|
|
|
die("rev-list setup: pipe failed");
|
|
|
|
|
pack_objects_pid = fork();
|
|
|
|
|
if (!pack_objects_pid) {
|
2006-09-05 23:52:12 +02:00
|
|
|
/* The child becomes pack-objects; reads from pipe
|
|
|
|
|
* and writes to the original fd
|
|
|
|
|
*/
|
2005-06-30 19:17:39 +02:00
|
|
|
dup2(pipe_fd[0], 0);
|
|
|
|
|
dup2(fd, 1);
|
|
|
|
|
close(pipe_fd[0]);
|
|
|
|
|
close(pipe_fd[1]);
|
|
|
|
|
close(fd);
|
|
|
|
|
exec_pack_objects();
|
|
|
|
|
die("pack-objects setup failed");
|
|
|
|
|
}
|
|
|
|
|
if (pack_objects_pid < 0)
|
|
|
|
|
die("pack-objects fork failed");
|
2006-09-05 23:52:12 +02:00
|
|
|
|
|
|
|
|
/* We become rev-list --stdin; output goes to pipe. */
|
2005-06-30 19:17:39 +02:00
|
|
|
dup2(pipe_fd[1], 1);
|
|
|
|
|
close(pipe_fd[0]);
|
|
|
|
|
close(pipe_fd[1]);
|
|
|
|
|
close(fd);
|
|
|
|
|
exec_rev_list(refs);
|
|
|
|
|
}
|
|
|
|
|
|
2006-09-05 23:52:12 +02:00
|
|
|
/*
|
|
|
|
|
* Create "rev-list --stdin | pack-objects" pipe and feed
|
|
|
|
|
* the refs into the pipeline.
|
|
|
|
|
*/
|
|
|
|
|
static void rev_list_generate(int fd, struct ref *refs)
|
|
|
|
|
{
|
|
|
|
|
int pipe_fd[2];
|
|
|
|
|
pid_t rev_list_generate_pid;
|
|
|
|
|
|
|
|
|
|
if (pipe(pipe_fd) < 0)
|
|
|
|
|
die("rev-list-generate setup: pipe failed");
|
|
|
|
|
rev_list_generate_pid = fork();
|
|
|
|
|
if (!rev_list_generate_pid) {
|
|
|
|
|
/* The child becomes the "rev-list | pack-objects"
|
|
|
|
|
* pipeline. It takes input from us, and its output
|
|
|
|
|
* goes to fd.
|
|
|
|
|
*/
|
|
|
|
|
dup2(pipe_fd[0], 0);
|
|
|
|
|
dup2(fd, 1);
|
|
|
|
|
close(pipe_fd[0]);
|
|
|
|
|
close(pipe_fd[1]);
|
|
|
|
|
close(fd);
|
|
|
|
|
rev_list(fd, refs);
|
|
|
|
|
die("rev-list setup failed");
|
|
|
|
|
}
|
|
|
|
|
if (rev_list_generate_pid < 0)
|
|
|
|
|
die("rev-list-generate fork failed");
|
|
|
|
|
|
|
|
|
|
/* We feed the rev parameters to them. We do not write into
|
|
|
|
|
* fd nor read from the pipe.
|
|
|
|
|
*/
|
|
|
|
|
close(pipe_fd[0]);
|
|
|
|
|
close(fd);
|
|
|
|
|
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';
|
|
|
|
|
write(pipe_fd[1], buf, 42);
|
|
|
|
|
}
|
|
|
|
|
if (!is_null_sha1(refs->new_sha1)) {
|
|
|
|
|
memcpy(buf, sha1_to_hex(refs->new_sha1), 40);
|
|
|
|
|
buf[40] = '\n';
|
|
|
|
|
write(pipe_fd[1], buf, 41);
|
|
|
|
|
}
|
|
|
|
|
refs = refs->next;
|
|
|
|
|
}
|
|
|
|
|
close(pipe_fd[1]);
|
|
|
|
|
// waitpid(rev_list_generate_pid);
|
|
|
|
|
exit(0);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
* Make a pack stream and spit it out into file descriptor fd
|
|
|
|
|
*/
|
2006-08-14 22:38:50 +02:00
|
|
|
static void pack_objects(int fd, struct ref *refs)
|
2005-06-30 19:17:39 +02:00
|
|
|
{
|
|
|
|
|
pid_t rev_list_pid;
|
|
|
|
|
|
|
|
|
|
rev_list_pid = fork();
|
|
|
|
|
if (!rev_list_pid) {
|
2006-09-05 23:52:12 +02:00
|
|
|
rev_list_generate(fd, refs);
|
2005-06-30 19:17:39 +02:00
|
|
|
die("rev-list setup failed");
|
|
|
|
|
}
|
|
|
|
|
if (rev_list_pid < 0)
|
|
|
|
|
die("rev-list fork failed");
|
|
|
|
|
/*
|
|
|
|
|
* We don't wait for the rev-list pipeline in the parent:
|
|
|
|
|
* we end up waiting for the other end instead
|
|
|
|
|
*/
|
|
|
|
|
}
|
2005-06-30 07:31:41 +02:00
|
|
|
|
2005-08-06 08:05:33 +02: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 09:47:56 +02:00
|
|
|
static int ref_newer(const unsigned char *new_sha1,
|
|
|
|
|
const unsigned char *old_sha1)
|
2005-07-08 22:58:40 +02:00
|
|
|
{
|
2005-08-05 09:47:56 +02:00
|
|
|
struct object *o;
|
|
|
|
|
struct commit *old, *new;
|
2005-08-06 08:05:33 +02:00
|
|
|
struct commit_list *list, *used;
|
|
|
|
|
int found = 0;
|
2005-07-19 13:03:47 +02:00
|
|
|
|
2005-08-05 09:47:56 +02:00
|
|
|
/* Both new and old must be commit-ish and new is descendant of
|
|
|
|
|
* old. Otherwise we require --force.
|
|
|
|
|
*/
|
2005-11-03 00:19:13 +01:00
|
|
|
o = deref_tag(parse_object(old_sha1), NULL, 0);
|
2006-07-12 05:45:31 +02:00
|
|
|
if (!o || o->type != OBJ_COMMIT)
|
2005-07-08 22:58:40 +02:00
|
|
|
return 0;
|
2005-08-05 09:47:56 +02:00
|
|
|
old = (struct commit *) o;
|
|
|
|
|
|
2005-11-03 00:19:13 +01:00
|
|
|
o = deref_tag(parse_object(new_sha1), NULL, 0);
|
2006-07-12 05:45:31 +02:00
|
|
|
if (!o || o->type != OBJ_COMMIT)
|
2005-07-19 13:03:47 +02:00
|
|
|
return 0;
|
2005-08-05 09:47:56 +02:00
|
|
|
new = (struct commit *) o;
|
|
|
|
|
|
2005-07-19 13:03:47 +02:00
|
|
|
if (parse_commit(new) < 0)
|
|
|
|
|
return 0;
|
2005-08-06 08:05:33 +02:00
|
|
|
|
|
|
|
|
used = list = NULL;
|
2005-07-19 13:03:47 +02:00
|
|
|
commit_list_insert(new, &list);
|
2005-07-27 05:04:22 +02:00
|
|
|
while (list) {
|
|
|
|
|
new = pop_most_recent_commit(&list, 1);
|
2005-08-06 08:05:33 +02:00
|
|
|
commit_list_insert(new, &used);
|
|
|
|
|
if (new == old) {
|
|
|
|
|
found = 1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
2005-07-19 13:03:47 +02:00
|
|
|
}
|
2005-08-06 08:05:33 +02:00
|
|
|
unmark_and_free(list, 1);
|
|
|
|
|
unmark_and_free(used, 1);
|
|
|
|
|
return found;
|
2005-07-08 22:58:40 +02:00
|
|
|
}
|
|
|
|
|
|
2005-08-04 01:35:29 +02:00
|
|
|
static struct ref *local_refs, **local_tail;
|
|
|
|
|
static struct ref *remote_refs, **remote_tail;
|
2005-07-08 22:58:40 +02:00
|
|
|
|
2006-09-21 07:02:01 +02:00
|
|
|
static int one_local_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
|
2005-07-08 22:58:40 +02:00
|
|
|
{
|
|
|
|
|
struct ref *ref;
|
2005-08-04 01:35:29 +02:00
|
|
|
int len = strlen(refname) + 1;
|
|
|
|
|
ref = xcalloc(1, sizeof(*ref) + len);
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(ref->new_sha1, sha1);
|
2005-07-08 22:58:40 +02:00
|
|
|
memcpy(ref->name, refname, len);
|
2005-08-04 01:35:29 +02:00
|
|
|
*local_tail = ref;
|
|
|
|
|
local_tail = &ref->next;
|
2005-07-08 22:58:40 +02:00
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2005-08-04 01:35:29 +02:00
|
|
|
static void get_local_heads(void)
|
|
|
|
|
{
|
|
|
|
|
local_tail = &local_refs;
|
2006-09-21 06:47:42 +02:00
|
|
|
for_each_ref(one_local_ref, NULL);
|
2005-08-04 01:35:29 +02:00
|
|
|
}
|
|
|
|
|
|
2005-12-26 08:18:37 +01:00
|
|
|
static int receive_status(int in)
|
|
|
|
|
{
|
|
|
|
|
char line[1000];
|
|
|
|
|
int ret = 0;
|
|
|
|
|
int len = packet_read_line(in, line, sizeof(line));
|
|
|
|
|
if (len < 10 || memcmp(line, "unpack ", 7)) {
|
|
|
|
|
fprintf(stderr, "did not receive status back\n");
|
|
|
|
|
return -1;
|
|
|
|
|
}
|
|
|
|
|
if (memcmp(line, "unpack ok\n", 10)) {
|
|
|
|
|
fputs(line, stderr);
|
|
|
|
|
ret = -1;
|
|
|
|
|
}
|
|
|
|
|
while (1) {
|
|
|
|
|
len = packet_read_line(in, line, sizeof(line));
|
|
|
|
|
if (!len)
|
|
|
|
|
break;
|
|
|
|
|
if (len < 3 ||
|
|
|
|
|
(memcmp(line, "ok", 2) && memcmp(line, "ng", 2))) {
|
|
|
|
|
fprintf(stderr, "protocol error: %s\n", line);
|
|
|
|
|
ret = -1;
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!memcmp(line, "ok", 2))
|
|
|
|
|
continue;
|
|
|
|
|
fputs(line, stderr);
|
|
|
|
|
ret = -1;
|
|
|
|
|
}
|
|
|
|
|
return ret;
|
|
|
|
|
}
|
|
|
|
|
|
2005-08-04 01:35:29 +02:00
|
|
|
static int send_pack(int in, int out, int nr_refspec, char **refspec)
|
2005-06-30 04:09:05 +02:00
|
|
|
{
|
2005-06-30 07:50:48 +02:00
|
|
|
struct ref *ref;
|
2005-07-08 22:58:40 +02:00
|
|
|
int new_refs;
|
2005-12-14 01:45:40 +01:00
|
|
|
int ret = 0;
|
2005-12-26 08:18:37 +01:00
|
|
|
int ask_for_status_report = 0;
|
2006-11-24 09:26:49 +01:00
|
|
|
int allow_deleting_refs = 0;
|
2005-12-26 08:18:37 +01:00
|
|
|
int expect_status_report = 0;
|
2005-06-30 07:50:48 +02:00
|
|
|
|
2005-08-04 01:35:29 +02: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 21:29:10 +02:00
|
|
|
remote_tail = get_remote_heads(in, &remote_refs, 0, NULL, REF_NORMAL);
|
2005-08-04 01:35:29 +02:00
|
|
|
get_local_heads();
|
2005-07-08 22:58:40 +02:00
|
|
|
|
2005-12-26 08:18:37 +01:00
|
|
|
/* Does the other end support the reporting? */
|
|
|
|
|
if (server_supports("report-status"))
|
|
|
|
|
ask_for_status_report = 1;
|
2006-11-24 09:26:49 +01:00
|
|
|
if (server_supports("delete-refs"))
|
|
|
|
|
allow_deleting_refs = 1;
|
2005-12-26 08:18:37 +01:00
|
|
|
|
2005-08-04 01:35:29 +02:00
|
|
|
/* match them up */
|
|
|
|
|
if (!remote_tail)
|
|
|
|
|
remote_tail = &remote_refs;
|
|
|
|
|
if (match_refs(local_refs, remote_refs, &remote_tail,
|
|
|
|
|
nr_refspec, refspec, send_all))
|
|
|
|
|
return -1;
|
2005-12-04 17:59:37 +01:00
|
|
|
|
|
|
|
|
if (!remote_refs) {
|
|
|
|
|
fprintf(stderr, "No refs in common and none specified; doing nothing.\n");
|
|
|
|
|
return 0;
|
|
|
|
|
}
|
|
|
|
|
|
2005-07-08 22:58:40 +02:00
|
|
|
/*
|
2005-08-04 01:35:29 +02:00
|
|
|
* Finally, tell the other end!
|
2005-07-08 22:58:40 +02:00
|
|
|
*/
|
2005-08-04 01:35:29 +02:00
|
|
|
new_refs = 0;
|
|
|
|
|
for (ref = remote_refs; ref; ref = ref->next) {
|
|
|
|
|
char old_hex[60], *new_hex;
|
2006-11-24 09:26:49 +01:00
|
|
|
int delete_ref;
|
|
|
|
|
|
2005-08-04 01:35:29 +02:00
|
|
|
if (!ref->peer_ref)
|
2005-06-30 07:50:48 +02:00
|
|
|
continue;
|
2006-11-24 09:26:49 +01:00
|
|
|
|
|
|
|
|
delete_ref = is_null_sha1(ref->peer_ref->new_sha1);
|
|
|
|
|
if (delete_ref && !allow_deleting_refs) {
|
|
|
|
|
error("remote does not support deleting refs");
|
|
|
|
|
ret = -2;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
if (!delete_ref &&
|
|
|
|
|
!hashcmp(ref->old_sha1, ref->peer_ref->new_sha1)) {
|
2005-12-21 03:13:02 +01:00
|
|
|
if (verbose)
|
|
|
|
|
fprintf(stderr, "'%s': up-to-date\n", ref->name);
|
2005-08-05 09:47:56 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
/* This part determines what can overwrite what.
|
|
|
|
|
* The rules are:
|
|
|
|
|
*
|
2005-08-24 09:40:14 +02:00
|
|
|
* (0) you can always use --force or +A:B notation to
|
|
|
|
|
* selectively force individual ref pairs.
|
2005-08-05 09:47:56 +02: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 09:26:49 +01:00
|
|
|
*
|
|
|
|
|
* (4) regardless of all of the above, removing :B is
|
|
|
|
|
* always allowed.
|
2005-08-05 09:47:56 +02:00
|
|
|
*/
|
|
|
|
|
|
2005-08-24 09:40:14 +02:00
|
|
|
if (!force_update &&
|
2006-11-24 09:26:49 +01:00
|
|
|
!delete_ref &&
|
2005-08-24 09:40:14 +02:00
|
|
|
!is_zero_sha1(ref->old_sha1) &&
|
|
|
|
|
!ref->force) {
|
2005-12-22 21:39:39 +01:00
|
|
|
if (!has_sha1_file(ref->old_sha1) ||
|
|
|
|
|
!ref_newer(ref->peer_ref->new_sha1,
|
2005-08-04 01:35:29 +02:00
|
|
|
ref->old_sha1)) {
|
2005-12-22 21:39:39 +01:00
|
|
|
/* We do not have the remote ref, or
|
|
|
|
|
* we know that the remote ref is not
|
|
|
|
|
* an ancestor of what we are trying to
|
|
|
|
|
* push. Either way this can be losing
|
|
|
|
|
* commits at the remote end and likely
|
|
|
|
|
* we were not up to date to begin with.
|
|
|
|
|
*/
|
|
|
|
|
error("remote '%s' is not a strict "
|
|
|
|
|
"subset of local ref '%s'. "
|
|
|
|
|
"maybe you are not up-to-date and "
|
|
|
|
|
"need to pull first?",
|
|
|
|
|
ref->name,
|
2005-08-04 01:35:29 +02:00
|
|
|
ref->peer_ref->name);
|
2005-12-14 01:45:40 +01:00
|
|
|
ret = -2;
|
2005-08-04 01:35:29 +02:00
|
|
|
continue;
|
|
|
|
|
}
|
2005-06-30 07:31:41 +02:00
|
|
|
}
|
2006-08-23 08:49:00 +02:00
|
|
|
hashcpy(ref->new_sha1, ref->peer_ref->new_sha1);
|
2006-11-24 09:26:49 +01:00
|
|
|
if (!delete_ref)
|
|
|
|
|
new_refs++;
|
2005-06-30 07:50:48 +02:00
|
|
|
strcpy(old_hex, sha1_to_hex(ref->old_sha1));
|
|
|
|
|
new_hex = sha1_to_hex(ref->new_sha1);
|
2005-12-26 08:18:37 +01: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);
|
2006-11-24 09:26:49 +01:00
|
|
|
if (delete_ref)
|
|
|
|
|
fprintf(stderr, "deleting '%s'\n", ref->name);
|
|
|
|
|
else {
|
|
|
|
|
fprintf(stderr, "updating '%s'", ref->name);
|
|
|
|
|
if (strcmp(ref->name, ref->peer_ref->name))
|
|
|
|
|
fprintf(stderr, " using '%s'",
|
|
|
|
|
ref->peer_ref->name);
|
|
|
|
|
fprintf(stderr, "\n from %s\n to %s\n",
|
|
|
|
|
old_hex, new_hex);
|
|
|
|
|
}
|
2005-06-30 04:09:05 +02:00
|
|
|
}
|
2005-08-04 01:35:29 +02:00
|
|
|
|
2005-06-30 05:50:15 +02:00
|
|
|
packet_flush(out);
|
2005-07-08 22:58:40 +02:00
|
|
|
if (new_refs)
|
2005-08-04 01:35:29 +02:00
|
|
|
pack_objects(out, remote_refs);
|
2005-06-30 04:09:05 +02:00
|
|
|
close(out);
|
2005-12-26 08:18:37 +01:00
|
|
|
|
|
|
|
|
if (expect_status_report) {
|
|
|
|
|
if (receive_status(in))
|
|
|
|
|
ret = -4;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!new_refs && ret == 0)
|
|
|
|
|
fprintf(stderr, "Everything up-to-date\n");
|
2005-12-14 01:45:40 +01:00
|
|
|
return ret;
|
2005-06-30 04:09:05 +02:00
|
|
|
}
|
|
|
|
|
|
2006-12-13 19:30:11 +01:00
|
|
|
static void verify_remote_names(int nr_heads, char **heads)
|
|
|
|
|
{
|
|
|
|
|
int i;
|
|
|
|
|
|
|
|
|
|
for (i = 0; i < nr_heads; i++) {
|
|
|
|
|
const char *remote = strchr(heads[i], ':');
|
|
|
|
|
|
|
|
|
|
remote = remote ? (remote + 1) : heads[i];
|
|
|
|
|
switch (check_ref_format(remote)) {
|
|
|
|
|
case 0: /* ok */
|
|
|
|
|
case -2: /* ok but a single level -- that is fine for
|
|
|
|
|
* a match pattern.
|
|
|
|
|
*/
|
|
|
|
|
continue;
|
|
|
|
|
}
|
|
|
|
|
die("remote part of refspec is not a valid name in %s",
|
|
|
|
|
heads[i]);
|
|
|
|
|
}
|
|
|
|
|
}
|
2005-08-04 01:35:29 +02:00
|
|
|
|
2005-06-30 04:09:05 +02:00
|
|
|
int main(int argc, char **argv)
|
|
|
|
|
{
|
|
|
|
|
int i, nr_heads = 0;
|
|
|
|
|
char *dest = NULL;
|
|
|
|
|
char **heads = NULL;
|
2005-06-30 07:50:48 +02:00
|
|
|
int fd[2], ret;
|
|
|
|
|
pid_t pid;
|
2005-06-30 04:09:05 +02:00
|
|
|
|
2005-11-26 09:47:59 +01:00
|
|
|
setup_git_directory();
|
2006-03-24 08:41:18 +01:00
|
|
|
git_config(git_default_config);
|
|
|
|
|
|
2005-06-30 04:09:05 +02:00
|
|
|
argv++;
|
2005-07-16 22:26:33 +02:00
|
|
|
for (i = 1; i < argc; i++, argv++) {
|
|
|
|
|
char *arg = *argv;
|
2005-06-30 04:09:05 +02:00
|
|
|
|
|
|
|
|
if (*arg == '-') {
|
|
|
|
|
if (!strncmp(arg, "--exec=", 7)) {
|
|
|
|
|
exec = arg + 7;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-07-16 22:26:33 +02:00
|
|
|
if (!strcmp(arg, "--all")) {
|
|
|
|
|
send_all = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-07-19 13:03:47 +02:00
|
|
|
if (!strcmp(arg, "--force")) {
|
|
|
|
|
force_update = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-12-21 03:13:02 +01:00
|
|
|
if (!strcmp(arg, "--verbose")) {
|
|
|
|
|
verbose = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2006-02-20 00:03:49 +01:00
|
|
|
if (!strcmp(arg, "--thin")) {
|
|
|
|
|
use_thin_pack = 1;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-06-30 04:09:05 +02:00
|
|
|
usage(send_pack_usage);
|
|
|
|
|
}
|
2005-07-16 22:26:33 +02:00
|
|
|
if (!dest) {
|
|
|
|
|
dest = arg;
|
|
|
|
|
continue;
|
|
|
|
|
}
|
2005-06-30 04:09:05 +02:00
|
|
|
heads = argv;
|
2005-07-16 22:26:33 +02:00
|
|
|
nr_heads = argc - i;
|
2005-06-30 04:09:05 +02:00
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
if (!dest)
|
|
|
|
|
usage(send_pack_usage);
|
2005-08-02 21:20:27 +02:00
|
|
|
if (heads && send_all)
|
|
|
|
|
usage(send_pack_usage);
|
2006-12-13 19:30:11 +01:00
|
|
|
verify_remote_names(nr_heads, heads);
|
|
|
|
|
|
2005-07-04 20:57:58 +02:00
|
|
|
pid = git_connect(fd, dest, exec);
|
2005-06-30 07:50:48 +02:00
|
|
|
if (pid < 0)
|
2005-06-30 04:09:05 +02:00
|
|
|
return 1;
|
2005-06-30 21:28:24 +02:00
|
|
|
ret = send_pack(fd[0], fd[1], nr_heads, heads);
|
2005-06-30 07:50:48 +02:00
|
|
|
close(fd[0]);
|
|
|
|
|
close(fd[1]);
|
2006-09-13 10:26:47 +02:00
|
|
|
ret |= finish_connect(pid);
|
|
|
|
|
return !!ret;
|
2005-06-30 04:09:05 +02:00
|
|
|
}
|