builtin-log.c 19.1 KB
Newer Older
1 2 3 4 5 6 7 8 9 10 11
/*
 * Builtin "git log" and related commands (show, whatchanged)
 *
 * (C) Copyright 2006 Linus Torvalds
 *		 2006 Junio Hamano
 */
#include "cache.h"
#include "commit.h"
#include "diff.h"
#include "revision.h"
#include "log-tree.h"
12
#include "builtin.h"
13
#include "tag.h"
L
Linus Torvalds 已提交
14
#include "reflog-walk.h"
15
#include "patch-ids.h"
16
#include "refs.h"
17

18 19
static int default_show_root = 1;

20 21 22
/* this is in builtin-diff.c */
void add_head(struct rev_info *revs);

23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47
static void add_name_decoration(const char *prefix, const char *name, struct object *obj)
{
	int plen = strlen(prefix);
	int nlen = strlen(name);
	struct name_decoration *res = xmalloc(sizeof(struct name_decoration) + plen + nlen);
	memcpy(res->name, prefix, plen);
	memcpy(res->name + plen, name, nlen + 1);
	res->next = add_decoration(&name_decoration, obj, res);
}

static int add_ref_decoration(const char *refname, const unsigned char *sha1, int flags, void *cb_data)
{
	struct object *obj = parse_object(sha1);
	if (!obj)
		return 0;
	add_name_decoration("", refname, obj);
	while (obj->type == OBJ_TAG) {
		obj = ((struct tag *)obj)->tagged;
		if (!obj)
			break;
		add_name_decoration("tag: ", refname, obj);
	}
	return 0;
}

48
static void cmd_log_init(int argc, const char **argv, const char *prefix,
49 50
		      struct rev_info *rev)
{
J
Junio C Hamano 已提交
51
	int i;
52
	int decorate = 0;
J
Junio C Hamano 已提交
53

54 55 56
	rev->abbrev = DEFAULT_ABBREV;
	rev->commit_format = CMIT_FMT_DEFAULT;
	rev->verbose_header = 1;
57
	rev->show_root_diff = default_show_root;
58
	argc = setup_revisions(argc, argv, rev, "HEAD");
59 60
	if (rev->diffopt.pickaxe || rev->diffopt.filter)
		rev->always_show_header = 0;
J
Junio C Hamano 已提交
61 62
	for (i = 1; i < argc; i++) {
		const char *arg = argv[i];
63
		if (!prefixcmp(arg, "--encoding=")) {
J
Junio C Hamano 已提交
64 65
			arg += 11;
			if (strcmp(arg, "none"))
66
				git_log_output_encoding = xstrdup(arg);
J
Junio C Hamano 已提交
67
			else
68
				git_log_output_encoding = "";
69 70 71 72 73
		} else if (!strcmp(arg, "--decorate")) {
			if (!decorate)
				for_each_ref(add_ref_decoration, NULL);
			decorate = 1;
		} else
J
Junio C Hamano 已提交
74 75
			die("unrecognized argument: %s", arg);
	}
76 77 78 79 80
}

static int cmd_log_walk(struct rev_info *rev)
{
	struct commit *commit;
81 82 83 84

	prepare_revision_walk(rev);
	while ((commit = get_revision(rev)) != NULL) {
		log_tree_commit(rev, commit);
85 86 87 88 89
		if (!rev->reflog_info) {
			/* we allow cycles in reflog ancestry */
			free(commit->buffer);
			commit->buffer = NULL;
		}
L
Linus Torvalds 已提交
90 91
		free_commit_list(commit->parents);
		commit->parents = NULL;
92 93 94 95
	}
	return 0;
}

96 97 98 99 100 101 102 103 104
static int git_log_config(const char *var, const char *value)
{
	if (!strcmp(var, "log.showroot")) {
		default_show_root = git_config_bool(var, value);
		return 0;
	}
	return git_diff_ui_config(var, value);
}

105
int cmd_whatchanged(int argc, const char **argv, const char *prefix)
106 107 108
{
	struct rev_info rev;

109
	git_config(git_log_config);
110
	init_revisions(&rev, prefix);
111 112
	rev.diff = 1;
	rev.diffopt.recursive = 1;
L
Linus Torvalds 已提交
113
	rev.simplify_history = 0;
114
	cmd_log_init(argc, argv, prefix, &rev);
115 116 117
	if (!rev.diffopt.output_format)
		rev.diffopt.output_format = DIFF_FORMAT_RAW;
	return cmd_log_walk(&rev);
118 119
}

120 121 122
static int show_object(const unsigned char *sha1, int suppress_header)
{
	unsigned long size;
123 124
	enum object_type type;
	char *buf = read_sha1_file(sha1, &type, &size);
125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151
	int offset = 0;

	if (!buf)
		return error("Could not read object %s", sha1_to_hex(sha1));

	if (suppress_header)
		while (offset < size && buf[offset++] != '\n') {
			int new_offset = offset;
			while (new_offset < size && buf[new_offset++] != '\n')
				; /* do nothing */
			offset = new_offset;
		}

	if (offset < size)
		fwrite(buf + offset, size - offset, 1, stdout);
	free(buf);
	return 0;
}

static int show_tree_object(const unsigned char *sha1,
		const char *base, int baselen,
		const char *pathname, unsigned mode, int stage)
{
	printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
	return 0;
}

152
int cmd_show(int argc, const char **argv, const char *prefix)
153 154
{
	struct rev_info rev;
155 156
	struct object_array_entry *objects;
	int i, count, ret = 0;
157

158
	git_config(git_log_config);
159
	init_revisions(&rev, prefix);
160 161 162 163 164 165 166
	rev.diff = 1;
	rev.diffopt.recursive = 1;
	rev.combine_merges = 1;
	rev.dense_combined_merges = 1;
	rev.always_show_header = 1;
	rev.ignore_merges = 0;
	rev.no_walk = 1;
167
	cmd_log_init(argc, argv, prefix, &rev);
168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213

	count = rev.pending.nr;
	objects = rev.pending.objects;
	for (i = 0; i < count && !ret; i++) {
		struct object *o = objects[i].item;
		const char *name = objects[i].name;
		switch (o->type) {
		case OBJ_BLOB:
			ret = show_object(o->sha1, 0);
			break;
		case OBJ_TAG: {
			struct tag *t = (struct tag *)o;

			printf("%stag %s%s\n\n",
					diff_get_color(rev.diffopt.color_diff,
						DIFF_COMMIT),
					t->tag,
					diff_get_color(rev.diffopt.color_diff,
						DIFF_RESET));
			ret = show_object(o->sha1, 1);
			objects[i].item = (struct object *)t->tagged;
			i--;
			break;
		}
		case OBJ_TREE:
			printf("%stree %s%s\n\n",
					diff_get_color(rev.diffopt.color_diff,
						DIFF_COMMIT),
					name,
					diff_get_color(rev.diffopt.color_diff,
						DIFF_RESET));
			read_tree_recursive((struct tree *)o, "", 0, 0, NULL,
					show_tree_object);
			break;
		case OBJ_COMMIT:
			rev.pending.nr = rev.pending.alloc = 0;
			rev.pending.objects = NULL;
			add_object_array(o, name, &rev.pending);
			ret = cmd_log_walk(&rev);
			break;
		default:
			ret = error("Unknown type: %d", o->type);
		}
	}
	free(objects);
	return ret;
214 215
}

L
Linus Torvalds 已提交
216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246
/*
 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
 */
int cmd_log_reflog(int argc, const char **argv, const char *prefix)
{
	struct rev_info rev;

	git_config(git_log_config);
	init_revisions(&rev, prefix);
	init_reflog_walk(&rev.reflog_info);
	rev.abbrev_commit = 1;
	rev.verbose_header = 1;
	cmd_log_init(argc, argv, prefix, &rev);

	/*
	 * This means that we override whatever commit format the user gave
	 * on the cmd line.  Sad, but cmd_log_init() currently doesn't
	 * allow us to set a different default.
	 */
	rev.commit_format = CMIT_FMT_ONELINE;
	rev.always_show_header = 1;

	/*
	 * We get called through "git reflog", so unlike the other log
	 * routines, we need to set up our pager manually..
	 */
	setup_pager();

	return cmd_log_walk(&rev);
}

247
int cmd_log(int argc, const char **argv, const char *prefix)
248 249 250
{
	struct rev_info rev;

251
	git_config(git_log_config);
252
	init_revisions(&rev, prefix);
253
	rev.always_show_header = 1;
254
	cmd_log_init(argc, argv, prefix, &rev);
255
	return cmd_log_walk(&rev);
256
}
257

258 259 260
/* format-patch */
#define FORMAT_PATCH_NAME_MAX 64

261 262 263 264 265 266
static int istitlechar(char c)
{
	return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
		(c >= '0' && c <= '9') || c == '.' || c == '_';
}

267 268
static char *extra_headers = NULL;
static int extra_headers_size = 0;
269
static const char *fmt_patch_suffix = ".patch";
270 271 272 273

static int git_format_config(const char *var, const char *value)
{
	if (!strcmp(var, "format.headers")) {
274 275 276 277 278
		int len;

		if (!value)
			die("format.headers without value");
		len = strlen(value);
279
		extra_headers_size += len + 1;
J
Jonas Fonseca 已提交
280
		extra_headers = xrealloc(extra_headers, extra_headers_size);
281 282 283 284
		extra_headers[extra_headers_size - len - 1] = 0;
		strcat(extra_headers, value);
		return 0;
	}
285 286 287 288 289 290
	if (!strcmp(var, "format.suffix")) {
		if (!value)
			die("format.suffix without value");
		fmt_patch_suffix = xstrdup(value);
		return 0;
	}
291
	if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
292 293
		return 0;
	}
294
	return git_log_config(var, value);
295 296 297
}


298
static FILE *realstdout = NULL;
299
static const char *output_directory = NULL;
300

301 302
static int reopen_stdout(struct commit *commit, int nr, int keep_subject,
			 int numbered_files)
303
{
304
	char filename[PATH_MAX];
305
	char *sol;
306
	int len = 0;
307
	int suffix_len = strlen(fmt_patch_suffix) + 1;
308

309
	if (output_directory) {
310 311 312 313
		if (strlen(output_directory) >=
		    sizeof(filename) - FORMAT_PATCH_NAME_MAX - suffix_len)
			return error("name of output directory is too long");
		strlcpy(filename, output_directory, sizeof(filename) - suffix_len);
314 315 316 317
		len = strlen(filename);
		if (filename[len - 1] != '/')
			filename[len++] = '/';
	}
318

319 320 321
	if (numbered_files) {
		sprintf(filename + len, "%d", nr);
		len = strlen(filename);
322

323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338
	} else {
		sprintf(filename + len, "%04d", nr);
		len = strlen(filename);

		sol = strstr(commit->buffer, "\n\n");
		if (sol) {
			int j, space = 1;

			sol += 2;
			/* strip [PATCH] or [PATCH blabla] */
			if (!keep_subject && !prefixcmp(sol, "[PATCH")) {
				char *eos = strchr(sol + 6, ']');
				if (eos) {
					while (isspace(*eos))
						eos++;
					sol = eos;
339
				}
340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362
			}

			for (j = 0;
			     j < FORMAT_PATCH_NAME_MAX - suffix_len - 5 &&
				     len < sizeof(filename) - suffix_len &&
				     sol[j] && sol[j] != '\n';
			     j++) {
				if (istitlechar(sol[j])) {
					if (space) {
						filename[len++] = '-';
						space = 0;
					}
					filename[len++] = sol[j];
					if (sol[j] == '.')
						while (sol[j + 1] == '.')
							j++;
				} else
					space = 1;
			}
			while (filename[len - 1] == '.'
			       || filename[len - 1] == '-')
				len--;
			filename[len] = 0;
363
		}
364 365 366
		if (len + suffix_len >= sizeof(filename))
			return error("Patch pathname too long");
		strcpy(filename + len, fmt_patch_suffix);
367
	}
368

369
	fprintf(realstdout, "%s\n", filename);
370 371 372
	if (freopen(filename, "w", stdout) == NULL)
		return error("Cannot open patch file %s",filename);

373
	return 0;
374 375
}

376
static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const char *prefix)
377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393
{
	struct rev_info check_rev;
	struct commit *commit;
	struct object *o1, *o2;
	unsigned flags1, flags2;

	if (rev->pending.nr != 2)
		die("Need exactly one range.");

	o1 = rev->pending.objects[0].item;
	flags1 = o1->flags;
	o2 = rev->pending.objects[1].item;
	flags2 = o2->flags;

	if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
		die("Not a range.");

394
	init_patch_ids(ids);
395 396

	/* given a range a..b get all patch ids for b..a */
397
	init_revisions(&check_rev, prefix);
398 399 400 401 402 403 404 405 406 407 408
	o1->flags ^= UNINTERESTING;
	o2->flags ^= UNINTERESTING;
	add_pending_object(&check_rev, o1, "o1");
	add_pending_object(&check_rev, o2, "o2");
	prepare_revision_walk(&check_rev);

	while ((commit = get_revision(&check_rev)) != NULL) {
		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;

409
		add_commit_patch_id(commit, ids);
410 411 412
	}

	/* reset for next revision walk */
413 414 415 416
	clear_commit_marks((struct commit *)o1,
			SEEN | UNINTERESTING | SHOWN | ADDED);
	clear_commit_marks((struct commit *)o2,
			SEEN | UNINTERESTING | SHOWN | ADDED);
417 418 419 420
	o1->flags = flags1;
	o2->flags = flags2;
}

421 422
static void gen_message_id(char *dest, unsigned int length, char *base)
{
423
	const char *committer = git_committer_info(-1);
424 425 426 427
	const char *email_start = strrchr(committer, '<');
	const char *email_end = strrchr(committer, '>');
	if(!email_start || !email_end || email_start > email_end - 1)
		die("Could not extract email from committer identity.");
428 429 430
	snprintf(dest, length, "%s.%lu.git.%.*s", base,
		 (unsigned long) time(NULL),
		 (int)(email_end - email_start - 1), email_start + 1);
431 432
}

433
int cmd_format_patch(int argc, const char **argv, const char *prefix)
434 435 436 437
{
	struct commit *commit;
	struct commit **list = NULL;
	struct rev_info rev;
438
	int nr = 0, total, i, j;
439
	int use_stdout = 0;
440
	int numbered = 0;
441
	int start_number = -1;
442
	int keep_subject = 0;
443
	int numbered_files = 0;		/* _just_ numbers */
444
	int subject_prefix = 0;
445
	int ignore_if_in_upstream = 0;
446
	int thread = 0;
447
	const char *in_reply_to = NULL;
448
	struct patch_ids ids;
J
Junio C Hamano 已提交
449
	char *add_signoff = NULL;
450 451
	char message_id[1024];
	char ref_message_id[1024];
452

453
	git_config(git_format_config);
454
	init_revisions(&rev, prefix);
455 456 457 458 459
	rev.commit_format = CMIT_FMT_EMAIL;
	rev.verbose_header = 1;
	rev.diff = 1;
	rev.combine_merges = 0;
	rev.ignore_merges = 1;
460 461
	rev.diffopt.msg_sep = "";
	rev.diffopt.recursive = 1;
462

463 464
	rev.extra_headers = extra_headers;

465 466
	/*
	 * Parse the arguments before setup_revisions(), or something
467
	 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
468 469 470 471
	 * possibly a valid SHA1.
	 */
	for (i = 1, j = 1; i < argc; i++) {
		if (!strcmp(argv[i], "--stdout"))
472
			use_stdout = 1;
473 474 475
		else if (!strcmp(argv[i], "-n") ||
				!strcmp(argv[i], "--numbered"))
			numbered = 1;
476
		else if (!prefixcmp(argv[i], "--start-number="))
477
			start_number = strtol(argv[i] + 15, NULL, 10);
478 479
		else if (!strcmp(argv[i], "--numbered-files"))
			numbered_files = 1;
480 481 482 483 484
		else if (!strcmp(argv[i], "--start-number")) {
			i++;
			if (i == argc)
				die("Need a number for --start-number");
			start_number = strtol(argv[i], NULL, 10);
J
Junio C Hamano 已提交
485 486
		}
		else if (!strcmp(argv[i], "-k") ||
487 488 489
				!strcmp(argv[i], "--keep-subject")) {
			keep_subject = 1;
			rev.total = -1;
J
Junio C Hamano 已提交
490
		}
491 492
		else if (!strcmp(argv[i], "--output-directory") ||
			 !strcmp(argv[i], "-o")) {
493
			i++;
494 495 496 497 498
			if (argc <= i)
				die("Which directory?");
			if (output_directory)
				die("Two output directories?");
			output_directory = argv[i];
499
		}
J
Junio C Hamano 已提交
500 501
		else if (!strcmp(argv[i], "--signoff") ||
			 !strcmp(argv[i], "-s")) {
E
Eric W. Biederman 已提交
502 503 504 505
			const char *committer;
			const char *endpos;
			committer = git_committer_info(1);
			endpos = strchr(committer, '>');
J
Junio C Hamano 已提交
506 507 508 509 510 511
			if (!endpos)
				die("bogos committer info %s\n", committer);
			add_signoff = xmalloc(endpos - committer + 2);
			memcpy(add_signoff, committer, endpos - committer + 1);
			add_signoff[endpos - committer + 1] = 0;
		}
512
		else if (!strcmp(argv[i], "--attach")) {
513
			rev.mime_boundary = git_version_string;
514 515 516 517 518 519 520 521 522 523 524
			rev.no_inline = 1;
		}
		else if (!prefixcmp(argv[i], "--attach=")) {
			rev.mime_boundary = argv[i] + 9;
			rev.no_inline = 1;
		}
		else if (!strcmp(argv[i], "--inline")) {
			rev.mime_boundary = git_version_string;
			rev.no_inline = 0;
		}
		else if (!prefixcmp(argv[i], "--inline=")) {
525
			rev.mime_boundary = argv[i] + 9;
526 527
			rev.no_inline = 0;
		}
528 529
		else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
			ignore_if_in_upstream = 1;
530 531
		else if (!strcmp(argv[i], "--thread"))
			thread = 1;
532
		else if (!prefixcmp(argv[i], "--in-reply-to="))
533 534 535 536 537 538
			in_reply_to = argv[i] + 14;
		else if (!strcmp(argv[i], "--in-reply-to")) {
			i++;
			if (i == argc)
				die("Need a Message-Id for --in-reply-to");
			in_reply_to = argv[i];
539 540 541 542
		} else if (!prefixcmp(argv[i], "--subject-prefix=")) {
			subject_prefix = 1;
			rev.subject_prefix = argv[i] + 17;
		} else if (!prefixcmp(argv[i], "--suffix="))
543
			fmt_patch_suffix = argv[i] + 9;
544
		else
545
			argv[j++] = argv[i];
546
	}
547 548
	argc = j;

549
	if (start_number < 0)
550
		start_number = 1;
551
	if (numbered && keep_subject)
552
		die ("-n and -k are mutually exclusive.");
553 554
	if (keep_subject && subject_prefix)
		die ("--subject-prefix and -k are mutually exclusive.");
555 556
	if (numbered_files && use_stdout)
		die ("--numbered-files and --stdout are mutually exclusive.");
557

558 559 560
	argc = setup_revisions(argc, argv, &rev, "HEAD");
	if (argc > 1)
		die ("unrecognized argument: %s", argv[1]);
561

562
	if (!rev.diffopt.output_format)
563
		rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_PATCH;
564

565 566 567
	if (!rev.diffopt.text)
		rev.diffopt.binary = 1;

568
	if (!output_directory && !use_stdout)
569 570
		output_directory = prefix;

571 572 573 574 575 576 577 578
	if (output_directory) {
		if (use_stdout)
			die("standard output, or directory, which one?");
		if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
			die("Could not create directory %s",
			    output_directory);
	}

579
	if (rev.pending.nr == 1) {
J
Junio C Hamano 已提交
580 581 582 583 584 585 586
		if (rev.max_count < 0) {
			rev.pending.objects[0].item->flags |= UNINTERESTING;
			add_head(&rev);
		}
		/* Otherwise, it is "format-patch -22 HEAD", and
		 * get_revision() would return only the specified count.
		 */
587 588
	}

589
	if (ignore_if_in_upstream)
590
		get_patch_ids(&rev, &ids, prefix);
591

592 593 594
	if (!use_stdout)
		realstdout = fdopen(dup(1), "w");

595 596
	prepare_revision_walk(&rev);
	while ((commit = get_revision(&rev)) != NULL) {
597 598 599
		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;
600 601

		if (ignore_if_in_upstream &&
602
				has_commit_patch_id(commit, &ids))
603 604
			continue;

605
		nr++;
J
Jonas Fonseca 已提交
606
		list = xrealloc(list, nr * sizeof(list[0]));
607 608
		list[nr - 1] = commit;
	}
609
	total = nr;
610
	if (numbered)
611
		rev.total = total + start_number - 1;
J
Junio C Hamano 已提交
612
	rev.add_signoff = add_signoff;
613
	rev.ref_message_id = in_reply_to;
614 615 616
	while (0 <= --nr) {
		int shown;
		commit = list[nr];
617
		rev.nr = total - nr + (start_number - 1);
618
		/* Make the second and subsequent mails replies to the first */
619 620 621 622 623 624 625 626 627 628
		if (thread) {
			if (nr == (total - 2)) {
				strncpy(ref_message_id, message_id,
					sizeof(ref_message_id));
				ref_message_id[sizeof(ref_message_id)-1]='\0';
				rev.ref_message_id = ref_message_id;
			}
			gen_message_id(message_id, sizeof(message_id),
				       sha1_to_hex(commit->object.sha1));
			rev.message_id = message_id;
629
		}
630
		if (!use_stdout)
631 632
			if (reopen_stdout(commit, rev.nr, keep_subject,
					  numbered_files))
633
				die("Failed to create output files");
634 635 636
		shown = log_tree_commit(&rev, commit);
		free(commit->buffer);
		commit->buffer = NULL;
637 638 639 640 641 642 643 644 645

		/* We put one extra blank line between formatted
		 * patches and this flag is used by log-tree code
		 * to see if it needs to emit a LF before showing
		 * the log; when using one file per patch, we do
		 * not want the extra blank line.
		 */
		if (!use_stdout)
			rev.shown_one = 0;
646 647 648 649 650 651 652 653
		if (shown) {
			if (rev.mime_boundary)
				printf("\n--%s%s--\n\n\n",
				       mime_boundary_leader,
				       rev.mime_boundary);
			else
				printf("-- \n%s\n\n", git_version_string);
		}
654 655
		if (!use_stdout)
			fclose(stdout);
656 657
	}
	free(list);
658 659
	if (ignore_if_in_upstream)
		free_patch_ids(&ids);
660 661 662
	return 0;
}

R
Rene Scharfe 已提交
663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681
static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
{
	unsigned char sha1[20];
	if (get_sha1(arg, sha1) == 0) {
		struct commit *commit = lookup_commit_reference(sha1);
		if (commit) {
			commit->object.flags |= flags;
			add_pending_object(revs, &commit->object, arg);
			return 0;
		}
	}
	return -1;
}

static const char cherry_usage[] =
"git-cherry [-v] <upstream> [<head>] [<limit>]";
int cmd_cherry(int argc, const char **argv, const char *prefix)
{
	struct rev_info revs;
682
	struct patch_ids ids;
R
Rene Scharfe 已提交
683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727
	struct commit *commit;
	struct commit_list *list = NULL;
	const char *upstream;
	const char *head = "HEAD";
	const char *limit = NULL;
	int verbose = 0;

	if (argc > 1 && !strcmp(argv[1], "-v")) {
		verbose = 1;
		argc--;
		argv++;
	}

	switch (argc) {
	case 4:
		limit = argv[3];
		/* FALLTHROUGH */
	case 3:
		head = argv[2];
		/* FALLTHROUGH */
	case 2:
		upstream = argv[1];
		break;
	default:
		usage(cherry_usage);
	}

	init_revisions(&revs, prefix);
	revs.diff = 1;
	revs.combine_merges = 0;
	revs.ignore_merges = 1;
	revs.diffopt.recursive = 1;

	if (add_pending_commit(head, &revs, 0))
		die("Unknown commit %s", head);
	if (add_pending_commit(upstream, &revs, UNINTERESTING))
		die("Unknown commit %s", upstream);

	/* Don't say anything if head and upstream are the same. */
	if (revs.pending.nr == 2) {
		struct object_array_entry *o = revs.pending.objects;
		if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
			return 0;
	}

728
	get_patch_ids(&revs, &ids, prefix);
R
Rene Scharfe 已提交
729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746

	if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
		die("Unknown commit %s", limit);

	/* reverse the list of commits */
	prepare_revision_walk(&revs);
	while ((commit = get_revision(&revs)) != NULL) {
		/* ignore merges */
		if (commit->parents && commit->parents->next)
			continue;

		commit_list_insert(commit, &list);
	}

	while (list) {
		char sign = '+';

		commit = list->item;
747
		if (has_commit_patch_id(commit, &ids))
R
Rene Scharfe 已提交
748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764
			sign = '-';

		if (verbose) {
			static char buf[16384];
			pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
			                    buf, sizeof(buf), 0, NULL, NULL, 0);
			printf("%c %s %s\n", sign,
			       sha1_to_hex(commit->object.sha1), buf);
		}
		else {
			printf("%c %s\n", sign,
			       sha1_to_hex(commit->object.sha1));
		}

		list = list->next;
	}

765
	free_patch_ids(&ids);
R
Rene Scharfe 已提交
766 767
	return 0;
}