[thirdparty/git.git] / bundle.c

#include "cache.h"
#include "bundle.h"
#include "object.h"
#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "list-objects.h"
#include "run-command.h"
#include "refs.h"
#include "argv-array.h"

static const char bundle_signature[] = "# v2 git bundle\n";

static void add_to_ref_list(const unsigned char *sha1, const char *name,
		struct ref_list *list)
{
	ALLOC_GROW(list->list, list->nr + 1, list->alloc);
	hashcpy(list->list[list->nr].sha1, sha1);
	list->list[list->nr].name = xstrdup(name);
	list->nr++;
}

static int parse_bundle_header(int fd, struct bundle_header *header,
			       const char *report_path)
{
	struct strbuf buf = STRBUF_INIT;
	int status = 0;

	/* The bundle header begins with the signature */
	if (strbuf_getwholeline_fd(&buf, fd, '\n') ||
	    strcmp(buf.buf, bundle_signature)) {
		if (report_path)
			error(_("'%s' does not look like a v2 bundle file"),
			      report_path);
		status = -1;
		goto abort;
	}

	/* The bundle header ends with an empty line */
	while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
	       buf.len && buf.buf[0] != '\n') {
		unsigned char sha1[20];
		int is_prereq = 0;

		if (*buf.buf == '-') {
			is_prereq = 1;
			strbuf_remove(&buf, 0, 1);
		}
		strbuf_rtrim(&buf);

		/*
		 * Tip lines have object name, SP, and refname.
		 * Prerequisites have object name that is optionally
		 * followed by SP and subject line.
		 */
		if (get_sha1_hex(buf.buf, sha1) ||
		    (buf.len > 40 && !isspace(buf.buf[40])) ||
		    (!is_prereq && buf.len <= 40)) {
			if (report_path)
				error(_("unrecognized header: %s%s (%d)"),
				      (is_prereq ? "-" : ""), buf.buf, (int)buf.len);
			status = -1;
			break;
		} else {
			if (is_prereq)
				add_to_ref_list(sha1, "", &header->prerequisites);
			else
				add_to_ref_list(sha1, buf.buf + 41, &header->references);
		}
	}

 abort:
	if (status) {
		close(fd);
		fd = -1;
	}
	strbuf_release(&buf);
	return fd;
}

int read_bundle_header(const char *path, struct bundle_header *header)
{
	int fd = open(path, O_RDONLY);

	if (fd < 0)
		return error(_("could not open '%s'"), path);
	return parse_bundle_header(fd, header, path);
}

int is_bundle(const char *path, int quiet)
{
	struct bundle_header header;
	int fd = open(path, O_RDONLY);

	if (fd < 0)
		return 0;
	memset(&header, 0, sizeof(header));
	fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
	if (fd >= 0)
		close(fd);
	return (fd >= 0);
}

static int list_refs(struct ref_list *r, int argc, const char **argv)
{
	int i;

	for (i = 0; i < r->nr; i++) {
		if (argc > 1) {
			int j;
			for (j = 1; j < argc; j++)
				if (!strcmp(r->list[i].name, argv[j]))
					break;
			if (j == argc)
				continue;
		}
		printf("%s %s\n", sha1_to_hex(r->list[i].sha1),
				r->list[i].name);
	}
	return 0;
}

/* Remember to update object flag allocation in object.h */
#define PREREQ_MARK (1u<<16)

int verify_bundle(struct bundle_header *header, int verbose)
{
	/*
	 * Do fast check, then if any prereqs are missing then go line by line
	 * to be verbose about the errors
	 */
	struct ref_list *p = &header->prerequisites;
	struct rev_info revs;
	const char *argv[] = {NULL, "--all", NULL};
	struct object_array refs;
	struct commit *commit;
	int i, ret = 0, req_nr;
	const char *message = _("Repository lacks these prerequisite commits:");

	init_revisions(&revs, NULL);
	for (i = 0; i < p->nr; i++) {
		struct ref_list_entry *e = p->list + i;
		struct object *o = parse_object(e->sha1);
		if (o) {
			o->flags |= PREREQ_MARK;
			add_pending_object(&revs, o, e->name);
			continue;
		}
		if (++ret == 1)
			error("%s", message);
		error("%s %s", sha1_to_hex(e->sha1), e->name);
	}
	if (revs.pending.nr != p->nr)
		return ret;
	req_nr = revs.pending.nr;
	setup_revisions(2, argv, &revs, NULL);

	refs = revs.pending;
	revs.leak_pending = 1;

	if (prepare_revision_walk(&revs))
		die(_("revision walk setup failed"));

	i = req_nr;
	while (i && (commit = get_revision(&revs)))
		if (commit->object.flags & PREREQ_MARK)
			i--;

	for (i = 0; i < req_nr; i++)
		if (!(refs.objects[i].item->flags & SHOWN)) {
			if (++ret == 1)
				error("%s", message);
			error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
				refs.objects[i].name);
		}

	clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
	free(refs.objects);

	if (verbose) {
		struct ref_list *r;

		r = &header->references;
		printf_ln(Q_("The bundle contains this ref:",
			     "The bundle contains these %d refs:",
			     r->nr),
			  r->nr);
		list_refs(r, 0, NULL);
		r = &header->prerequisites;
		if (!r->nr) {
			printf_ln(_("The bundle records a complete history."));
		} else {
			printf_ln(Q_("The bundle requires this ref:",
				     "The bundle requires these %d refs:",
				     r->nr),
				  r->nr);
			list_refs(r, 0, NULL);
		}
	}
	return ret;
}

int list_bundle_refs(struct bundle_header *header, int argc, const char **argv)
{
	return list_refs(&header->references, argc, argv);
}

static int is_tag_in_date_range(struct object *tag, struct rev_info *revs)
{
	unsigned long size;
	enum object_type type;
	char *buf, *line, *lineend;
	unsigned long date;

	if (revs->max_age == -1 && revs->min_age == -1)
		return 1;

	buf = read_sha1_file(tag->sha1, &type, &size);
	if (!buf)
		return 1;
	line = memmem(buf, size, "\ntagger ", 8);
	if (!line++)
		return 1;
	lineend = memchr(line, '\n', buf + size - line);
	line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
	if (!line++)
		return 1;
	date = strtoul(line, NULL, 10);
	free(buf);
	return (revs->max_age == -1 || revs->max_age < date) &&
		(revs->min_age == -1 || revs->min_age > date);
}

int create_bundle(struct bundle_header *header, const char *path,
		  int argc, const char **argv)
{
	static struct lock_file lock;
	int bundle_fd = -1;
	int bundle_to_stdout;
	int i, ref_count = 0;
	struct strbuf buf = STRBUF_INIT;
	struct rev_info revs;
	struct child_process rls = CHILD_PROCESS_INIT;
	FILE *rls_fout;

	bundle_to_stdout = !strcmp(path, "-");
	if (bundle_to_stdout)
		bundle_fd = 1;
	else
		bundle_fd = hold_lock_file_for_update(&lock, path,
						      LOCK_DIE_ON_ERROR);

	/* write signature */
	write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));

	/* init revs to list objects for pack-objects later */
	save_commit_buffer = 0;
	init_revisions(&revs, NULL);

	/* write prerequisites */
	argv_array_pushl(&rls.args,
			 "rev-list", "--boundary", "--pretty=oneline",
			 NULL);
	for (i = 1; i < argc; i++)
		argv_array_push(&rls.args, argv[i]);
	rls.out = -1;
	rls.git_cmd = 1;
	if (start_command(&rls))
		return -1;
	rls_fout = xfdopen(rls.out, "r");
	while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
		unsigned char sha1[20];
		if (buf.len > 0 && buf.buf[0] == '-') {
			write_or_die(bundle_fd, buf.buf, buf.len);
			if (!get_sha1_hex(buf.buf + 1, sha1)) {
				struct object *object = parse_object_or_die(sha1, buf.buf);
				object->flags |= UNINTERESTING;
				add_pending_object(&revs, object, buf.buf);
			}
		} else if (!get_sha1_hex(buf.buf, sha1)) {
			struct object *object = parse_object_or_die(sha1, buf.buf);
			object->flags |= SHOWN;
		}
	}
	strbuf_release(&buf);
	fclose(rls_fout);
	if (finish_command(&rls))
		return error(_("rev-list died"));

	/* write references */
	argc = setup_revisions(argc, argv, &revs, NULL);

	if (argc > 1)
		return error(_("unrecognized argument: %s"), argv[1]);

	object_array_remove_duplicates(&revs.pending);

	for (i = 0; i < revs.pending.nr; i++) {
		struct object_array_entry *e = revs.pending.objects + i;
		unsigned char sha1[20];
		char *ref;
		const char *display_ref;
		int flag;

		if (e->item->flags & UNINTERESTING)
			continue;
		if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
			continue;
		if (read_ref_full(e->name, sha1, 1, &flag))
			flag = 0;
		display_ref = (flag & REF_ISSYMREF) ? e->name : ref;

		if (e->item->type == OBJ_TAG &&
				!is_tag_in_date_range(e->item, &revs)) {
			e->item->flags |= UNINTERESTING;
			continue;
		}

		/*
		 * Make sure the refs we wrote out is correct; --max-count and
		 * other limiting options could have prevented all the tips
		 * from getting output.
		 *
		 * Non commit objects such as tags and blobs do not have
		 * this issue as they are not affected by those extra
		 * constraints.
		 */
		if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
			warning(_("ref '%s' is excluded by the rev-list options"),
				e->name);
			free(ref);
			continue;
		}
		/*
		 * If you run "git bundle create bndl v1.0..v2.0", the
		 * name of the positive ref is "v2.0" but that is the
		 * commit that is referenced by the tag, and not the tag
		 * itself.
		 */
		if (hashcmp(sha1, e->item->sha1)) {
			/*
			 * Is this the positive end of a range expressed
			 * in terms of a tag (e.g. v2.0 from the range
			 * "v1.0..v2.0")?
			 */
			struct commit *one = lookup_commit_reference(sha1);
			struct object *obj;

			if (e->item == &(one->object)) {
				/*
				 * Need to include e->name as an
				 * independent ref to the pack-objects
				 * input, so that the tag is included
				 * in the output; otherwise we would
				 * end up triggering "empty bundle"
				 * error.
				 */
				obj = parse_object_or_die(sha1, e->name);
				obj->flags |= SHOWN;
				add_pending_object(&revs, obj, e->name);
			}
			free(ref);
			continue;
		}

		ref_count++;
		write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
		write_or_die(bundle_fd, " ", 1);
		write_or_die(bundle_fd, display_ref, strlen(display_ref));
		write_or_die(bundle_fd, "\n", 1);
		free(ref);
	}
	if (!ref_count)
		die(_("Refusing to create empty bundle."));

	/* end header */
	write_or_die(bundle_fd, "\n", 1);

	/* write pack */
	memset(&rls, 0, sizeof(rls));
	argv_array_pushl(&rls.args,
			 "pack-objects", "--all-progress-implied",
			 "--stdout", "--thin", "--delta-base-offset",
			 NULL);
	rls.in = -1;
	rls.out = bundle_fd;
	rls.git_cmd = 1;
	if (start_command(&rls))
		return error(_("Could not spawn pack-objects"));

	/*
	 * start_command closed bundle_fd if it was > 1
	 * so set the lock fd to -1 so commit_lock_file()
	 * won't fail trying to close it.
	 */
	lock.fd = -1;

	for (i = 0; i < revs.pending.nr; i++) {
		struct object *object = revs.pending.objects[i].item;
		if (object->flags & UNINTERESTING)
			write_or_die(rls.in, "^", 1);
		write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
		write_or_die(rls.in, "\n", 1);
	}
	close(rls.in);
	if (finish_command(&rls))
		return error(_("pack-objects died"));
	if (!bundle_to_stdout) {
		if (commit_lock_file(&lock))
			die_errno(_("cannot create '%s'"), path);
	}
	return 0;
}

int unbundle(struct bundle_header *header, int bundle_fd, int flags)
{
	const char *argv_index_pack[] = {"index-pack",
					 "--fix-thin", "--stdin", NULL, NULL};
	struct child_process ip = CHILD_PROCESS_INIT;

	if (flags & BUNDLE_VERBOSE)
		argv_index_pack[3] = "-v";

	if (verify_bundle(header, 0))
		return -1;
	ip.argv = argv_index_pack;
	ip.in = bundle_fd;
	ip.no_stdout = 1;
	ip.git_cmd = 1;
	if (run_command(&ip))
		return error(_("index-pack died"));
	return 0;
}
Commit	Line	Data
30415d50 JS	1	#include "cache.h"
	2	#include "bundle.h"
	3	#include "object.h"
	4	#include "commit.h"
	5	#include "diff.h"
	6	#include "revision.h"
	7	#include "list-objects.h"
	8	#include "run-command.h"
fa303836	9	#include "refs.h"
1e2371ea	10	#include "argv-array.h"
30415d50 JS	11
	12	static const char bundle_signature[] = "# v2 git bundle\n";
	13
	14	static void add_to_ref_list(const unsigned char sha1, const char name,
	15	struct ref_list *list)
	16	{
5cbbe13a	17	ALLOC_GROW(list->list, list->nr + 1, list->alloc);
50546b15	18	hashcpy(list->list[list->nr].sha1, sha1);
30415d50 JS	19	list->list[list->nr].name = xstrdup(name);
	20	list->nr++;
	21	}
	22
2727b71f JH	23	static int parse_bundle_header(int fd, struct bundle_header *header,
2727b71f JH	24	const char *report_path)
f3fa1838	25	{
e9ee84cf	26	struct strbuf buf = STRBUF_INIT;
e9ee84cf	27	int status = 0;
30415d50	28
e9ee84cf	29	/* The bundle header begins with the signature */
5e8617f5	30	if (strbuf_getwholeline_fd(&buf, fd, '\n') \|\|
e9ee84cf	31	strcmp(buf.buf, bundle_signature)) {
2727b71f	32	if (report_path)
8a1e7eac	33	error(_("'%s' does not look like a v2 bundle file"),
2727b71f	34	report_path);
e9ee84cf JH	35	status = -1;
e9ee84cf JH	36	goto abort;
30415d50	37	}
e9ee84cf JH	38
e9ee84cf JH	39	/* The bundle header ends with an empty line */
5e8617f5	40	while (!strbuf_getwholeline_fd(&buf, fd, '\n') &&
e9ee84cf	41	buf.len && buf.buf[0] != '\n') {
30415d50	42	unsigned char sha1[20];
e9ee84cf JH	43	int is_prereq = 0;
	44
	45	if (*buf.buf == '-') {
	46	is_prereq = 1;
	47	strbuf_remove(&buf, 0, 1);
30415d50	48	}
e9ee84cf	49	strbuf_rtrim(&buf);
30415d50	50
e9ee84cf JH	51	/*
	52	* Tip lines have object name, SP, and refname.
	53	* Prerequisites have object name that is optionally
	54	* followed by SP and subject line.
	55	*/
	56	if (get_sha1_hex(buf.buf, sha1) \|\|
5446e33f	57	(buf.len > 40 && !isspace(buf.buf[40])) \|\|
e9ee84cf	58	(!is_prereq && buf.len <= 40)) {
2727b71f	59	if (report_path)
8a1e7eac	60	error(_("unrecognized header: %s%s (%d)"),
2727b71f	61	(is_prereq ? "-" : ""), buf.buf, (int)buf.len);
e9ee84cf JH	62	status = -1;
	63	break;
	64	} else {
	65	if (is_prereq)
	66	add_to_ref_list(sha1, "", &header->prerequisites);
	67	else
	68	add_to_ref_list(sha1, buf.buf + 41, &header->references);
30415d50	69	}
30415d50	70	}
e9ee84cf JH	71
	72	abort:
	73	if (status) {
	74	close(fd);
	75	fd = -1;
30415d50	76	}
e9ee84cf	77	strbuf_release(&buf);
30415d50 JS	78	return fd;
	79	}
	80
2727b71f JH	81	int read_bundle_header(const char path, struct bundle_header header)
	82	{
	83	int fd = open(path, O_RDONLY);
	84
30415d50	85	if (fd < 0)
8a1e7eac	86	return error(_("could not open '%s'"), path);
2727b71f JH	87	return parse_bundle_header(fd, header, path);
	88	}
	89
	90	int is_bundle(const char *path, int quiet)
	91	{
	92	struct bundle_header header;
	93	int fd = open(path, O_RDONLY);
	94
	95	if (fd < 0)
	96	return 0;
	97	memset(&header, 0, sizeof(header));
	98	fd = parse_bundle_header(fd, &header, quiet ? NULL : path);
	99	if (fd >= 0)
	100	close(fd);
	101	return (fd >= 0);
30415d50 JS	102	}
	103
	104	static int list_refs(struct ref_list r, int argc, const char *argv)
	105	{
	106	int i;
	107
	108	for (i = 0; i < r->nr; i++) {
	109	if (argc > 1) {
	110	int j;
	111	for (j = 1; j < argc; j++)
	112	if (!strcmp(r->list[i].name, argv[j]))
	113	break;
	114	if (j == argc)
	115	continue;
	116	}
	117	printf("%s %s\n", sha1_to_hex(r->list[i].sha1),
	118	r->list[i].name);
	119	}
	120	return 0;
	121	}
	122
208acbfb	123	/* Remember to update object flag allocation in object.h */
30415d50 JS	124	#define PREREQ_MARK (1u<<16)
	125
	126	int verify_bundle(struct bundle_header *header, int verbose)
	127	{
	128	/*
	129	* Do fast check, then if any prereqs are missing then go line by line
	130	* to be verbose about the errors
	131	*/
	132	struct ref_list *p = &header->prerequisites;
	133	struct rev_info revs;
a80aad7b	134	const char *argv[] = {NULL, "--all", NULL};
30415d50 JS	135	struct object_array refs;
	136	struct commit *commit;
	137	int i, ret = 0, req_nr;
8a1e7eac	138	const char *message = _("Repository lacks these prerequisite commits:");
30415d50 JS	139
	140	init_revisions(&revs, NULL);
	141	for (i = 0; i < p->nr; i++) {
	142	struct ref_list_entry *e = p->list + i;
	143	struct object *o = parse_object(e->sha1);
	144	if (o) {
	145	o->flags \|= PREREQ_MARK;
	146	add_pending_object(&revs, o, e->name);
	147	continue;
	148	}
	149	if (++ret == 1)
9db56f71	150	error("%s", message);
30415d50 JS	151	error("%s %s", sha1_to_hex(e->sha1), e->name);
	152	}
	153	if (revs.pending.nr != p->nr)
	154	return ret;
	155	req_nr = revs.pending.nr;
	156	setup_revisions(2, argv, &revs, NULL);
	157
5be78599 RS	158	refs = revs.pending;
5be78599 RS	159	revs.leak_pending = 1;
30415d50	160
3d51e1b5	161	if (prepare_revision_walk(&revs))
8a1e7eac	162	die(_("revision walk setup failed"));
30415d50 JS	163
	164	i = req_nr;
	165	while (i && (commit = get_revision(&revs)))
	166	if (commit->object.flags & PREREQ_MARK)
	167	i--;
	168
	169	for (i = 0; i < req_nr; i++)
	170	if (!(refs.objects[i].item->flags & SHOWN)) {
	171	if (++ret == 1)
9db56f71	172	error("%s", message);
30415d50 JS	173	error("%s %s", sha1_to_hex(refs.objects[i].item->sha1),
	174	refs.objects[i].name);
	175	}
	176
86a0a408	177	clear_commit_marks_for_object_array(&refs, ALL_REV_FLAGS);
5be78599	178	free(refs.objects);
30415d50 JS	179
	180	if (verbose) {
	181	struct ref_list *r;
	182
	183	r = &header->references;
a02ffe0e LF	184	printf_ln(Q_("The bundle contains this ref:",
a02ffe0e LF	185	"The bundle contains these %d refs:",
8a1e7eac NTND	186	r->nr),
8a1e7eac NTND	187	r->nr);
30415d50	188	list_refs(r, 0, NULL);
71ba6b10	189	r = &header->prerequisites;
8c3710fd JH	190	if (!r->nr) {
	191	printf_ln(_("The bundle records a complete history."));
	192	} else {
a02ffe0e LF	193	printf_ln(Q_("The bundle requires this ref:",
a02ffe0e LF	194	"The bundle requires these %d refs:",
8c3710fd JH	195	r->nr),
	196	r->nr);
	197	list_refs(r, 0, NULL);
	198	}
30415d50 JS	199	}
	200	return ret;
	201	}
	202
	203	int list_bundle_refs(struct bundle_header header, int argc, const char *argv)
	204	{
	205	return list_refs(&header->references, argc, argv);
	206	}
	207
c9a42c4a JS	208	static int is_tag_in_date_range(struct object tag, struct rev_info revs)
	209	{
	210	unsigned long size;
	211	enum object_type type;
	212	char buf, line, *lineend;
	213	unsigned long date;
	214
	215	if (revs->max_age == -1 && revs->min_age == -1)
	216	return 1;
	217
	218	buf = read_sha1_file(tag->sha1, &type, &size);
	219	if (!buf)
	220	return 1;
	221	line = memmem(buf, size, "\ntagger ", 8);
	222	if (!line++)
	223	return 1;
2c8544ab LF	224	lineend = memchr(line, '\n', buf + size - line);
2c8544ab LF	225	line = memchr(line, '>', lineend ? lineend - line : buf + size - line);
c9a42c4a JS	226	if (!line++)
	227	return 1;
	228	date = strtoul(line, NULL, 10);
	229	free(buf);
	230	return (revs->max_age == -1 \|\| revs->max_age < date) &&
	231	(revs->min_age == -1 \|\| revs->min_age > date);
	232	}
	233
30415d50	234	int create_bundle(struct bundle_header header, const char path,
1e2371ea	235	int argc, const char **argv)
30415d50 JS	236	{
	237	static struct lock_file lock;
	238	int bundle_fd = -1;
	239	int bundle_to_stdout;
30415d50	240	int i, ref_count = 0;
bc2fed49	241	struct strbuf buf = STRBUF_INIT;
30415d50	242	struct rev_info revs;
d3180279	243	struct child_process rls = CHILD_PROCESS_INIT;
30415d50 JS	244	FILE *rls_fout;
	245
	246	bundle_to_stdout = !strcmp(path, "-");
	247	if (bundle_to_stdout)
	248	bundle_fd = 1;
	249	else
acd3b9ec JH	250	bundle_fd = hold_lock_file_for_update(&lock, path,
acd3b9ec JH	251	LOCK_DIE_ON_ERROR);
30415d50 JS	252
	253	/* write signature */
	254	write_or_die(bundle_fd, bundle_signature, strlen(bundle_signature));
	255
	256	/* init revs to list objects for pack-objects later */
	257	save_commit_buffer = 0;
	258	init_revisions(&revs, NULL);
	259
	260	/* write prerequisites */
92859f3a	261	argv_array_pushl(&rls.args,
1e2371ea JH	262	"rev-list", "--boundary", "--pretty=oneline",
	263	NULL);
	264	for (i = 1; i < argc; i++)
92859f3a	265	argv_array_push(&rls.args, argv[i]);
30415d50 JS	266	rls.out = -1;
	267	rls.git_cmd = 1;
	268	if (start_command(&rls))
	269	return -1;
41698375	270	rls_fout = xfdopen(rls.out, "r");
bc2fed49	271	while (strbuf_getwholeline(&buf, rls_fout, '\n') != EOF) {
30415d50	272	unsigned char sha1[20];
bc2fed49 TR	273	if (buf.len > 0 && buf.buf[0] == '-') {
	274	write_or_die(bundle_fd, buf.buf, buf.len);
	275	if (!get_sha1_hex(buf.buf + 1, sha1)) {
75a95490	276	struct object *object = parse_object_or_die(sha1, buf.buf);
30415d50	277	object->flags \|= UNINTERESTING;
31faeb20	278	add_pending_object(&revs, object, buf.buf);
30415d50	279	}
bc2fed49	280	} else if (!get_sha1_hex(buf.buf, sha1)) {
75a95490	281	struct object *object = parse_object_or_die(sha1, buf.buf);
30415d50 JS	282	object->flags \|= SHOWN;
	283	}
	284	}
bc2fed49	285	strbuf_release(&buf);
30415d50 JS	286	fclose(rls_fout);
30415d50 JS	287	if (finish_command(&rls))
8a1e7eac	288	return error(_("rev-list died"));
30415d50 JS	289
	290	/* write references */
	291	argc = setup_revisions(argc, argv, &revs, NULL);
22568f0a	292
8b3dce56	293	if (argc > 1)
1be65eda	294	return error(_("unrecognized argument: %s"), argv[1]);
30415d50	295
b2a6d1c6 JH	296	object_array_remove_duplicates(&revs.pending);
b2a6d1c6 JH	297
30415d50 JS	298	for (i = 0; i < revs.pending.nr; i++) {
	299	struct object_array_entry *e = revs.pending.objects + i;
	300	unsigned char sha1[20];
	301	char *ref;
fa303836 JH	302	const char *display_ref;
fa303836 JH	303	int flag;
30415d50 JS	304
	305	if (e->item->flags & UNINTERESTING)
	306	continue;
	307	if (dwim_ref(e->name, strlen(e->name), sha1, &ref) != 1)
	308	continue;
c6893323	309	if (read_ref_full(e->name, sha1, 1, &flag))
fa303836 JH	310	flag = 0;
	311	display_ref = (flag & REF_ISSYMREF) ? e->name : ref;
	312
c9a42c4a JS	313	if (e->item->type == OBJ_TAG &&
	314	!is_tag_in_date_range(e->item, &revs)) {
	315	e->item->flags \|= UNINTERESTING;
	316	continue;
	317	}
	318
30415d50 JS	319	/*
	320	* Make sure the refs we wrote out is correct; --max-count and
	321	* other limiting options could have prevented all the tips
	322	* from getting output.
	323	*
	324	* Non commit objects such as tags and blobs do not have
	325	* this issue as they are not affected by those extra
	326	* constraints.
	327	*/
	328	if (!(e->item->flags & SHOWN) && e->item->type == OBJ_COMMIT) {
8a1e7eac	329	warning(_("ref '%s' is excluded by the rev-list options"),
30415d50 JS	330	e->name);
	331	free(ref);
	332	continue;
	333	}
	334	/*
	335	* If you run "git bundle create bndl v1.0..v2.0", the
	336	* name of the positive ref is "v2.0" but that is the
	337	* commit that is referenced by the tag, and not the tag
	338	* itself.
	339	*/
	340	if (hashcmp(sha1, e->item->sha1)) {
	341	/*
	342	* Is this the positive end of a range expressed
	343	* in terms of a tag (e.g. v2.0 from the range
	344	* "v1.0..v2.0")?
	345	*/
	346	struct commit *one = lookup_commit_reference(sha1);
	347	struct object *obj;
	348
	349	if (e->item == &(one->object)) {
	350	/*
	351	* Need to include e->name as an
	352	* independent ref to the pack-objects
	353	* input, so that the tag is included
	354	* in the output; otherwise we would
	355	* end up triggering "empty bundle"
	356	* error.
	357	*/
75a95490	358	obj = parse_object_or_die(sha1, e->name);
30415d50 JS	359	obj->flags \|= SHOWN;
	360	add_pending_object(&revs, obj, e->name);
	361	}
	362	free(ref);
	363	continue;
	364	}
	365
	366	ref_count++;
	367	write_or_die(bundle_fd, sha1_to_hex(e->item->sha1), 40);
	368	write_or_die(bundle_fd, " ", 1);
fa303836	369	write_or_die(bundle_fd, display_ref, strlen(display_ref));
30415d50 JS	370	write_or_die(bundle_fd, "\n", 1);
	371	free(ref);
	372	}
	373	if (!ref_count)
8a1e7eac	374	die(_("Refusing to create empty bundle."));
30415d50 JS	375
	376	/* end header */
	377	write_or_die(bundle_fd, "\n", 1);
	378
	379	/* write pack */
92859f3a RS	380	memset(&rls, 0, sizeof(rls));
92859f3a RS	381	argv_array_pushl(&rls.args,
1e2371ea JH	382	"pack-objects", "--all-progress-implied",
	383	"--stdout", "--thin", "--delta-base-offset",
	384	NULL);
30415d50 JS	385	rls.in = -1;
	386	rls.out = bundle_fd;
	387	rls.git_cmd = 1;
	388	if (start_command(&rls))
8a1e7eac	389	return error(_("Could not spawn pack-objects"));
4ed7cd3a BC	390
	391	/*
	392	* start_command closed bundle_fd if it was > 1
	393	* so set the lock fd to -1 so commit_lock_file()
	394	* won't fail trying to close it.
	395	*/
	396	lock.fd = -1;
	397
30415d50 JS	398	for (i = 0; i < revs.pending.nr; i++) {
	399	struct object *object = revs.pending.objects[i].item;
	400	if (object->flags & UNINTERESTING)
95693d45 JM	401	write_or_die(rls.in, "^", 1);
	402	write_or_die(rls.in, sha1_to_hex(object->sha1), 40);
	403	write_or_die(rls.in, "\n", 1);
30415d50	404	}
e72ae288	405	close(rls.in);
30415d50	406	if (finish_command(&rls))
8a1e7eac	407	return error(_("pack-objects died"));
0f5cdf65 CH	408	if (!bundle_to_stdout) {
0f5cdf65 CH	409	if (commit_lock_file(&lock))
8a1e7eac	410	die_errno(_("cannot create '%s'"), path);
0f5cdf65	411	}
c20181e3	412	return 0;
30415d50 JS	413	}
30415d50 JS	414
be042aff	415	int unbundle(struct bundle_header *header, int bundle_fd, int flags)
30415d50 JS	416	{
30415d50 JS	417	const char *argv_index_pack[] = {"index-pack",
be042aff	418	"--fix-thin", "--stdin", NULL, NULL};
d3180279	419	struct child_process ip = CHILD_PROCESS_INIT;
30415d50	420
be042aff JH	421	if (flags & BUNDLE_VERBOSE)
	422	argv_index_pack[3] = "-v";
	423
30415d50 JS	424	if (verify_bundle(header, 0))
30415d50 JS	425	return -1;
30415d50 JS	426	ip.argv = argv_index_pack;
	427	ip.in = bundle_fd;
	428	ip.no_stdout = 1;
	429	ip.git_cmd = 1;
	430	if (run_command(&ip))
8a1e7eac	431	return error(_("index-pack died"));
30415d50 JS	432	return 0;
30415d50 JS	433	}