French translation: copy -> copie.
[git/dscho.git] / builtin / log.c
blob09cf43e6d40efc13f6b7bda2094fca5bdc1bbc87
1 /*
2 * Builtin "git log" and related commands (show, whatchanged)
4 * (C) Copyright 2006 Linus Torvalds
5 * 2006 Junio Hamano
6 */
7 #include "cache.h"
8 #include "color.h"
9 #include "commit.h"
10 #include "diff.h"
11 #include "revision.h"
12 #include "log-tree.h"
13 #include "builtin.h"
14 #include "tag.h"
15 #include "reflog-walk.h"
16 #include "patch-ids.h"
17 #include "run-command.h"
18 #include "shortlog.h"
19 #include "remote.h"
20 #include "string-list.h"
21 #include "parse-options.h"
22 #include "branch.h"
23 #include "streaming.h"
24 #include "version.h"
26 /* Set a default date-time format for git log ("log.date" config variable) */
27 static const char *default_date_mode = NULL;
29 static int default_abbrev_commit;
30 static int default_show_root = 1;
31 static int decoration_style;
32 static int decoration_given;
33 static const char *fmt_patch_subject_prefix = "PATCH";
34 static const char *fmt_pretty;
36 static const char * const builtin_log_usage[] = {
37 N_("git log [<options>] [<since>..<until>] [[--] <path>...]\n")
38 N_(" or: git show [options] <object>..."),
39 NULL
42 static int parse_decoration_style(const char *var, const char *value)
44 switch (git_config_maybe_bool(var, value)) {
45 case 1:
46 return DECORATE_SHORT_REFS;
47 case 0:
48 return 0;
49 default:
50 break;
52 if (!strcmp(value, "full"))
53 return DECORATE_FULL_REFS;
54 else if (!strcmp(value, "short"))
55 return DECORATE_SHORT_REFS;
56 return -1;
59 static int decorate_callback(const struct option *opt, const char *arg, int unset)
61 if (unset)
62 decoration_style = 0;
63 else if (arg)
64 decoration_style = parse_decoration_style("command line", arg);
65 else
66 decoration_style = DECORATE_SHORT_REFS;
68 if (decoration_style < 0)
69 die("invalid --decorate option: %s", arg);
71 decoration_given = 1;
73 return 0;
76 static void cmd_log_init_defaults(struct rev_info *rev)
78 if (fmt_pretty)
79 get_commit_format(fmt_pretty, rev);
80 rev->verbose_header = 1;
81 DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
82 rev->diffopt.stat_width = -1; /* use full terminal width */
83 rev->diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
84 rev->abbrev_commit = default_abbrev_commit;
85 rev->show_root_diff = default_show_root;
86 rev->subject_prefix = fmt_patch_subject_prefix;
87 DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
89 if (default_date_mode)
90 rev->date_mode = parse_date_format(default_date_mode);
93 static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
94 struct rev_info *rev, struct setup_revision_opt *opt)
96 struct userformat_want w;
97 int quiet = 0, source = 0;
99 const struct option builtin_log_options[] = {
100 OPT_BOOLEAN(0, "quiet", &quiet, N_("suppress diff output")),
101 OPT_BOOLEAN(0, "source", &source, N_("show source")),
102 { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"),
103 PARSE_OPT_OPTARG, decorate_callback},
104 OPT_END()
107 argc = parse_options(argc, argv, prefix,
108 builtin_log_options, builtin_log_usage,
109 PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
110 PARSE_OPT_KEEP_DASHDASH);
112 if (quiet)
113 rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
114 argc = setup_revisions(argc, argv, rev, opt);
116 /* Any arguments at this point are not recognized */
117 if (argc > 1)
118 die("unrecognized argument: %s", argv[1]);
120 memset(&w, 0, sizeof(w));
121 userformat_find_requirements(NULL, &w);
123 if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
124 rev->show_notes = 1;
125 if (rev->show_notes)
126 init_display_notes(&rev->notes_opt);
128 if (rev->diffopt.pickaxe || rev->diffopt.filter)
129 rev->always_show_header = 0;
130 if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
131 rev->always_show_header = 0;
132 if (rev->diffopt.pathspec.nr != 1)
133 usage("git logs can only follow renames on one pathname at a time");
136 if (source)
137 rev->show_source = 1;
139 if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
141 * "log --pretty=raw" is special; ignore UI oriented
142 * configuration variables such as decoration.
144 if (!decoration_given)
145 decoration_style = 0;
146 if (!rev->abbrev_commit_given)
147 rev->abbrev_commit = 0;
150 if (decoration_style) {
151 rev->show_decorations = 1;
152 load_ref_decorations(decoration_style);
154 setup_pager();
157 static void cmd_log_init(int argc, const char **argv, const char *prefix,
158 struct rev_info *rev, struct setup_revision_opt *opt)
160 cmd_log_init_defaults(rev);
161 cmd_log_init_finish(argc, argv, prefix, rev, opt);
165 * This gives a rough estimate for how many commits we
166 * will print out in the list.
168 static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
170 int n = 0;
172 while (list) {
173 struct commit *commit = list->item;
174 unsigned int flags = commit->object.flags;
175 list = list->next;
176 if (!(flags & (TREESAME | UNINTERESTING)))
177 n++;
179 return n;
182 static void show_early_header(struct rev_info *rev, const char *stage, int nr)
184 if (rev->shown_one) {
185 rev->shown_one = 0;
186 if (rev->commit_format != CMIT_FMT_ONELINE)
187 putchar(rev->diffopt.line_termination);
189 printf(_("Final output: %d %s\n"), nr, stage);
192 static struct itimerval early_output_timer;
194 static void log_show_early(struct rev_info *revs, struct commit_list *list)
196 int i = revs->early_output;
197 int show_header = 1;
199 sort_in_topological_order(&list, revs->lifo);
200 while (list && i) {
201 struct commit *commit = list->item;
202 switch (simplify_commit(revs, commit)) {
203 case commit_show:
204 if (show_header) {
205 int n = estimate_commit_count(revs, list);
206 show_early_header(revs, "incomplete", n);
207 show_header = 0;
209 log_tree_commit(revs, commit);
210 i--;
211 break;
212 case commit_ignore:
213 break;
214 case commit_error:
215 return;
217 list = list->next;
220 /* Did we already get enough commits for the early output? */
221 if (!i)
222 return;
225 * ..if no, then repeat it twice a second until we
226 * do.
228 * NOTE! We don't use "it_interval", because if the
229 * reader isn't listening, we want our output to be
230 * throttled by the writing, and not have the timer
231 * trigger every second even if we're blocked on a
232 * reader!
234 early_output_timer.it_value.tv_sec = 0;
235 early_output_timer.it_value.tv_usec = 500000;
236 setitimer(ITIMER_REAL, &early_output_timer, NULL);
239 static void early_output(int signal)
241 show_early_output = log_show_early;
244 static void setup_early_output(struct rev_info *rev)
246 struct sigaction sa;
249 * Set up the signal handler, minimally intrusively:
250 * we only set a single volatile integer word (not
251 * using sigatomic_t - trying to avoid unnecessary
252 * system dependencies and headers), and using
253 * SA_RESTART.
255 memset(&sa, 0, sizeof(sa));
256 sa.sa_handler = early_output;
257 sigemptyset(&sa.sa_mask);
258 sa.sa_flags = SA_RESTART;
259 sigaction(SIGALRM, &sa, NULL);
262 * If we can get the whole output in less than a
263 * tenth of a second, don't even bother doing the
264 * early-output thing..
266 * This is a one-time-only trigger.
268 early_output_timer.it_value.tv_sec = 0;
269 early_output_timer.it_value.tv_usec = 100000;
270 setitimer(ITIMER_REAL, &early_output_timer, NULL);
273 static void finish_early_output(struct rev_info *rev)
275 int n = estimate_commit_count(rev, rev->commits);
276 signal(SIGALRM, SIG_IGN);
277 show_early_header(rev, "done", n);
280 static int cmd_log_walk(struct rev_info *rev)
282 struct commit *commit;
283 int saved_nrl = 0;
284 int saved_dcctc = 0;
286 if (rev->early_output)
287 setup_early_output(rev);
289 if (prepare_revision_walk(rev))
290 die(_("revision walk setup failed"));
292 if (rev->early_output)
293 finish_early_output(rev);
296 * For --check and --exit-code, the exit code is based on CHECK_FAILED
297 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
298 * retain that state information if replacing rev->diffopt in this loop
300 while ((commit = get_revision(rev)) != NULL) {
301 if (!log_tree_commit(rev, commit) &&
302 rev->max_count >= 0)
304 * We decremented max_count in get_revision,
305 * but we didn't actually show the commit.
307 rev->max_count++;
308 if (!rev->reflog_info) {
309 /* we allow cycles in reflog ancestry */
310 free(commit->buffer);
311 commit->buffer = NULL;
313 free_commit_list(commit->parents);
314 commit->parents = NULL;
315 if (saved_nrl < rev->diffopt.needed_rename_limit)
316 saved_nrl = rev->diffopt.needed_rename_limit;
317 if (rev->diffopt.degraded_cc_to_c)
318 saved_dcctc = 1;
320 rev->diffopt.degraded_cc_to_c = saved_dcctc;
321 rev->diffopt.needed_rename_limit = saved_nrl;
323 if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
324 DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
325 return 02;
327 return diff_result_code(&rev->diffopt, 0);
330 static int git_log_config(const char *var, const char *value, void *cb)
332 if (!strcmp(var, "format.pretty"))
333 return git_config_string(&fmt_pretty, var, value);
334 if (!strcmp(var, "format.subjectprefix"))
335 return git_config_string(&fmt_patch_subject_prefix, var, value);
336 if (!strcmp(var, "log.abbrevcommit")) {
337 default_abbrev_commit = git_config_bool(var, value);
338 return 0;
340 if (!strcmp(var, "log.date"))
341 return git_config_string(&default_date_mode, var, value);
342 if (!strcmp(var, "log.decorate")) {
343 decoration_style = parse_decoration_style(var, value);
344 if (decoration_style < 0)
345 decoration_style = 0; /* maybe warn? */
346 return 0;
348 if (!strcmp(var, "log.showroot")) {
349 default_show_root = git_config_bool(var, value);
350 return 0;
352 if (!prefixcmp(var, "color.decorate."))
353 return parse_decorate_color_config(var, 15, value);
355 return git_diff_ui_config(var, value, cb);
358 int cmd_whatchanged(int argc, const char **argv, const char *prefix)
360 struct rev_info rev;
361 struct setup_revision_opt opt;
363 git_config(git_log_config, NULL);
365 init_revisions(&rev, prefix);
366 rev.diff = 1;
367 rev.simplify_history = 0;
368 memset(&opt, 0, sizeof(opt));
369 opt.def = "HEAD";
370 opt.revarg_opt = REVARG_COMMITTISH;
371 cmd_log_init(argc, argv, prefix, &rev, &opt);
372 if (!rev.diffopt.output_format)
373 rev.diffopt.output_format = DIFF_FORMAT_RAW;
374 return cmd_log_walk(&rev);
377 static void show_tagger(char *buf, int len, struct rev_info *rev)
379 struct strbuf out = STRBUF_INIT;
380 struct pretty_print_context pp = {0};
382 pp.fmt = rev->commit_format;
383 pp.date_mode = rev->date_mode;
384 pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding());
385 printf("%s", out.buf);
386 strbuf_release(&out);
389 static int show_blob_object(const unsigned char *sha1, struct rev_info *rev)
391 fflush(stdout);
392 return stream_blob_to_fd(1, sha1, NULL, 0);
395 static int show_tag_object(const unsigned char *sha1, struct rev_info *rev)
397 unsigned long size;
398 enum object_type type;
399 char *buf = read_sha1_file(sha1, &type, &size);
400 int offset = 0;
402 if (!buf)
403 return error(_("Could not read object %s"), sha1_to_hex(sha1));
405 assert(type == OBJ_TAG);
406 while (offset < size && buf[offset] != '\n') {
407 int new_offset = offset + 1;
408 while (new_offset < size && buf[new_offset++] != '\n')
409 ; /* do nothing */
410 if (!prefixcmp(buf + offset, "tagger "))
411 show_tagger(buf + offset + 7,
412 new_offset - offset - 7, rev);
413 offset = new_offset;
416 if (offset < size)
417 fwrite(buf + offset, size - offset, 1, stdout);
418 free(buf);
419 return 0;
422 static int show_tree_object(const unsigned char *sha1,
423 const char *base, int baselen,
424 const char *pathname, unsigned mode, int stage, void *context)
426 printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
427 return 0;
430 static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)
432 if (rev->ignore_merges) {
433 /* There was no "-m" on the command line */
434 rev->ignore_merges = 0;
435 if (!rev->first_parent_only && !rev->combine_merges) {
436 /* No "--first-parent", "-c", nor "--cc" */
437 rev->combine_merges = 1;
438 rev->dense_combined_merges = 1;
441 if (!rev->diffopt.output_format)
442 rev->diffopt.output_format = DIFF_FORMAT_PATCH;
445 int cmd_show(int argc, const char **argv, const char *prefix)
447 struct rev_info rev;
448 struct object_array_entry *objects;
449 struct setup_revision_opt opt;
450 struct pathspec match_all;
451 int i, count, ret = 0;
453 git_config(git_log_config, NULL);
455 init_pathspec(&match_all, NULL);
456 init_revisions(&rev, prefix);
457 rev.diff = 1;
458 rev.always_show_header = 1;
459 rev.no_walk = REVISION_WALK_NO_WALK_SORTED;
460 rev.diffopt.stat_width = -1; /* Scale to real terminal size */
462 memset(&opt, 0, sizeof(opt));
463 opt.def = "HEAD";
464 opt.tweak = show_rev_tweak_rev;
465 cmd_log_init(argc, argv, prefix, &rev, &opt);
467 if (!rev.no_walk)
468 return cmd_log_walk(&rev);
470 count = rev.pending.nr;
471 objects = rev.pending.objects;
472 for (i = 0; i < count && !ret; i++) {
473 struct object *o = objects[i].item;
474 const char *name = objects[i].name;
475 switch (o->type) {
476 case OBJ_BLOB:
477 ret = show_blob_object(o->sha1, NULL);
478 break;
479 case OBJ_TAG: {
480 struct tag *t = (struct tag *)o;
482 if (rev.shown_one)
483 putchar('\n');
484 printf("%stag %s%s\n",
485 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
486 t->tag,
487 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
488 ret = show_tag_object(o->sha1, &rev);
489 rev.shown_one = 1;
490 if (ret)
491 break;
492 o = parse_object(t->tagged->sha1);
493 if (!o)
494 ret = error(_("Could not read object %s"),
495 sha1_to_hex(t->tagged->sha1));
496 objects[i].item = o;
497 i--;
498 break;
500 case OBJ_TREE:
501 if (rev.shown_one)
502 putchar('\n');
503 printf("%stree %s%s\n\n",
504 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
505 name,
506 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
507 read_tree_recursive((struct tree *)o, "", 0, 0, &match_all,
508 show_tree_object, NULL);
509 rev.shown_one = 1;
510 break;
511 case OBJ_COMMIT:
512 rev.pending.nr = rev.pending.alloc = 0;
513 rev.pending.objects = NULL;
514 add_object_array(o, name, &rev.pending);
515 ret = cmd_log_walk(&rev);
516 break;
517 default:
518 ret = error(_("Unknown type: %d"), o->type);
521 free(objects);
522 return ret;
526 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
528 int cmd_log_reflog(int argc, const char **argv, const char *prefix)
530 struct rev_info rev;
531 struct setup_revision_opt opt;
533 git_config(git_log_config, NULL);
535 init_revisions(&rev, prefix);
536 init_reflog_walk(&rev.reflog_info);
537 rev.verbose_header = 1;
538 memset(&opt, 0, sizeof(opt));
539 opt.def = "HEAD";
540 cmd_log_init_defaults(&rev);
541 rev.abbrev_commit = 1;
542 rev.commit_format = CMIT_FMT_ONELINE;
543 rev.use_terminator = 1;
544 rev.always_show_header = 1;
545 cmd_log_init_finish(argc, argv, prefix, &rev, &opt);
547 return cmd_log_walk(&rev);
550 int cmd_log(int argc, const char **argv, const char *prefix)
552 struct rev_info rev;
553 struct setup_revision_opt opt;
555 git_config(git_log_config, NULL);
557 init_revisions(&rev, prefix);
558 rev.always_show_header = 1;
559 memset(&opt, 0, sizeof(opt));
560 opt.def = "HEAD";
561 opt.revarg_opt = REVARG_COMMITTISH;
562 cmd_log_init(argc, argv, prefix, &rev, &opt);
563 return cmd_log_walk(&rev);
566 /* format-patch */
568 static const char *fmt_patch_suffix = ".patch";
569 static int numbered = 0;
570 static int auto_number = 1;
572 static char *default_attach = NULL;
574 static struct string_list extra_hdr;
575 static struct string_list extra_to;
576 static struct string_list extra_cc;
578 static void add_header(const char *value)
580 struct string_list_item *item;
581 int len = strlen(value);
582 while (len && value[len - 1] == '\n')
583 len--;
585 if (!strncasecmp(value, "to: ", 4)) {
586 item = string_list_append(&extra_to, value + 4);
587 len -= 4;
588 } else if (!strncasecmp(value, "cc: ", 4)) {
589 item = string_list_append(&extra_cc, value + 4);
590 len -= 4;
591 } else {
592 item = string_list_append(&extra_hdr, value);
595 item->string[len] = '\0';
598 #define THREAD_SHALLOW 1
599 #define THREAD_DEEP 2
600 static int thread;
601 static int do_signoff;
602 static const char *signature = git_version_string;
604 static int git_format_config(const char *var, const char *value, void *cb)
606 if (!strcmp(var, "format.headers")) {
607 if (!value)
608 die(_("format.headers without value"));
609 add_header(value);
610 return 0;
612 if (!strcmp(var, "format.suffix"))
613 return git_config_string(&fmt_patch_suffix, var, value);
614 if (!strcmp(var, "format.to")) {
615 if (!value)
616 return config_error_nonbool(var);
617 string_list_append(&extra_to, value);
618 return 0;
620 if (!strcmp(var, "format.cc")) {
621 if (!value)
622 return config_error_nonbool(var);
623 string_list_append(&extra_cc, value);
624 return 0;
626 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
627 !strcmp(var, "color.ui")) {
628 return 0;
630 if (!strcmp(var, "format.numbered")) {
631 if (value && !strcasecmp(value, "auto")) {
632 auto_number = 1;
633 return 0;
635 numbered = git_config_bool(var, value);
636 auto_number = auto_number && numbered;
637 return 0;
639 if (!strcmp(var, "format.attach")) {
640 if (value && *value)
641 default_attach = xstrdup(value);
642 else
643 default_attach = xstrdup(git_version_string);
644 return 0;
646 if (!strcmp(var, "format.thread")) {
647 if (value && !strcasecmp(value, "deep")) {
648 thread = THREAD_DEEP;
649 return 0;
651 if (value && !strcasecmp(value, "shallow")) {
652 thread = THREAD_SHALLOW;
653 return 0;
655 thread = git_config_bool(var, value) && THREAD_SHALLOW;
656 return 0;
658 if (!strcmp(var, "format.signoff")) {
659 do_signoff = git_config_bool(var, value);
660 return 0;
662 if (!strcmp(var, "format.signature"))
663 return git_config_string(&signature, var, value);
665 return git_log_config(var, value, cb);
668 static FILE *realstdout = NULL;
669 static const char *output_directory = NULL;
670 static int outdir_offset;
672 static int reopen_stdout(struct commit *commit, const char *subject,
673 struct rev_info *rev, int quiet)
675 struct strbuf filename = STRBUF_INIT;
676 int suffix_len = strlen(fmt_patch_suffix) + 1;
678 if (output_directory) {
679 strbuf_addstr(&filename, output_directory);
680 if (filename.len >=
681 PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len)
682 return error(_("name of output directory is too long"));
683 if (filename.buf[filename.len - 1] != '/')
684 strbuf_addch(&filename, '/');
687 get_patch_filename(commit, subject, rev->nr, fmt_patch_suffix, &filename);
689 if (!quiet)
690 fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
692 if (freopen(filename.buf, "w", stdout) == NULL)
693 return error(_("Cannot open patch file %s"), filename.buf);
695 strbuf_release(&filename);
696 return 0;
699 static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids)
701 struct rev_info check_rev;
702 struct commit *commit;
703 struct object *o1, *o2;
704 unsigned flags1, flags2;
706 if (rev->pending.nr != 2)
707 die(_("Need exactly one range."));
709 o1 = rev->pending.objects[0].item;
710 flags1 = o1->flags;
711 o2 = rev->pending.objects[1].item;
712 flags2 = o2->flags;
714 if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
715 die(_("Not a range."));
717 init_patch_ids(ids);
719 /* given a range a..b get all patch ids for b..a */
720 init_revisions(&check_rev, rev->prefix);
721 check_rev.max_parents = 1;
722 o1->flags ^= UNINTERESTING;
723 o2->flags ^= UNINTERESTING;
724 add_pending_object(&check_rev, o1, "o1");
725 add_pending_object(&check_rev, o2, "o2");
726 if (prepare_revision_walk(&check_rev))
727 die(_("revision walk setup failed"));
729 while ((commit = get_revision(&check_rev)) != NULL) {
730 add_commit_patch_id(commit, ids);
733 /* reset for next revision walk */
734 clear_commit_marks((struct commit *)o1,
735 SEEN | UNINTERESTING | SHOWN | ADDED);
736 clear_commit_marks((struct commit *)o2,
737 SEEN | UNINTERESTING | SHOWN | ADDED);
738 o1->flags = flags1;
739 o2->flags = flags2;
742 static void gen_message_id(struct rev_info *info, char *base)
744 struct strbuf buf = STRBUF_INIT;
745 strbuf_addf(&buf, "%s.%lu.git.%s", base,
746 (unsigned long) time(NULL),
747 git_committer_info(IDENT_NO_NAME|IDENT_NO_DATE|IDENT_STRICT));
748 info->message_id = strbuf_detach(&buf, NULL);
751 static void print_signature(void)
753 if (signature && *signature)
754 printf("-- \n%s\n\n", signature);
757 static void add_branch_description(struct strbuf *buf, const char *branch_name)
759 struct strbuf desc = STRBUF_INIT;
760 if (!branch_name || !*branch_name)
761 return;
762 read_branch_desc(&desc, branch_name);
763 if (desc.len) {
764 strbuf_addch(buf, '\n');
765 strbuf_add(buf, desc.buf, desc.len);
766 strbuf_addch(buf, '\n');
770 static void make_cover_letter(struct rev_info *rev, int use_stdout,
771 int numbered, int numbered_files,
772 struct commit *origin,
773 int nr, struct commit **list, struct commit *head,
774 const char *branch_name,
775 int quiet)
777 const char *committer;
778 const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
779 const char *msg;
780 struct shortlog log;
781 struct strbuf sb = STRBUF_INIT;
782 int i;
783 const char *encoding = "UTF-8";
784 struct diff_options opts;
785 int need_8bit_cte = 0;
786 struct pretty_print_context pp = {0};
788 if (rev->commit_format != CMIT_FMT_EMAIL)
789 die(_("Cover letter needs email format"));
791 committer = git_committer_info(0);
793 if (!use_stdout &&
794 reopen_stdout(NULL, numbered_files ? NULL : "cover-letter", rev, quiet))
795 return;
797 log_write_email_headers(rev, head, &pp.subject, &pp.after_subject,
798 &need_8bit_cte);
800 for (i = 0; !need_8bit_cte && i < nr; i++)
801 if (has_non_ascii(list[i]->buffer))
802 need_8bit_cte = 1;
804 msg = body;
805 pp.fmt = CMIT_FMT_EMAIL;
806 pp.date_mode = DATE_RFC2822;
807 pp_user_info(&pp, NULL, &sb, committer, encoding);
808 pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
809 pp_remainder(&pp, &msg, &sb, 0);
810 add_branch_description(&sb, branch_name);
811 printf("%s\n", sb.buf);
813 strbuf_release(&sb);
815 shortlog_init(&log);
816 log.wrap_lines = 1;
817 log.wrap = 72;
818 log.in1 = 2;
819 log.in2 = 4;
820 for (i = 0; i < nr; i++)
821 shortlog_add_commit(&log, list[i]);
823 shortlog_output(&log);
826 * We can only do diffstat with a unique reference point
828 if (!origin)
829 return;
831 memcpy(&opts, &rev->diffopt, sizeof(opts));
832 opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
834 diff_setup_done(&opts);
836 diff_tree_sha1(origin->tree->object.sha1,
837 head->tree->object.sha1,
838 "", &opts);
839 diffcore_std(&opts);
840 diff_flush(&opts);
842 printf("\n");
843 print_signature();
846 static const char *clean_message_id(const char *msg_id)
848 char ch;
849 const char *a, *z, *m;
851 m = msg_id;
852 while ((ch = *m) && (isspace(ch) || (ch == '<')))
853 m++;
854 a = m;
855 z = NULL;
856 while ((ch = *m)) {
857 if (!isspace(ch) && (ch != '>'))
858 z = m;
859 m++;
861 if (!z)
862 die(_("insane in-reply-to: %s"), msg_id);
863 if (++z == m)
864 return a;
865 return xmemdupz(a, z - a);
868 static const char *set_outdir(const char *prefix, const char *output_directory)
870 if (output_directory && is_absolute_path(output_directory))
871 return output_directory;
873 if (!prefix || !*prefix) {
874 if (output_directory)
875 return output_directory;
876 /* The user did not explicitly ask for "./" */
877 outdir_offset = 2;
878 return "./";
881 outdir_offset = strlen(prefix);
882 if (!output_directory)
883 return prefix;
885 return xstrdup(prefix_filename(prefix, outdir_offset,
886 output_directory));
889 static const char * const builtin_format_patch_usage[] = {
890 N_("git format-patch [options] [<since> | <revision range>]"),
891 NULL
894 static int keep_subject = 0;
896 static int keep_callback(const struct option *opt, const char *arg, int unset)
898 ((struct rev_info *)opt->value)->total = -1;
899 keep_subject = 1;
900 return 0;
903 static int subject_prefix = 0;
905 static int subject_prefix_callback(const struct option *opt, const char *arg,
906 int unset)
908 subject_prefix = 1;
909 ((struct rev_info *)opt->value)->subject_prefix = arg;
910 return 0;
913 static int numbered_cmdline_opt = 0;
915 static int numbered_callback(const struct option *opt, const char *arg,
916 int unset)
918 *(int *)opt->value = numbered_cmdline_opt = unset ? 0 : 1;
919 if (unset)
920 auto_number = 0;
921 return 0;
924 static int no_numbered_callback(const struct option *opt, const char *arg,
925 int unset)
927 return numbered_callback(opt, arg, 1);
930 static int output_directory_callback(const struct option *opt, const char *arg,
931 int unset)
933 const char **dir = (const char **)opt->value;
934 if (*dir)
935 die(_("Two output directories?"));
936 *dir = arg;
937 return 0;
940 static int thread_callback(const struct option *opt, const char *arg, int unset)
942 int *thread = (int *)opt->value;
943 if (unset)
944 *thread = 0;
945 else if (!arg || !strcmp(arg, "shallow"))
946 *thread = THREAD_SHALLOW;
947 else if (!strcmp(arg, "deep"))
948 *thread = THREAD_DEEP;
949 else
950 return 1;
951 return 0;
954 static int attach_callback(const struct option *opt, const char *arg, int unset)
956 struct rev_info *rev = (struct rev_info *)opt->value;
957 if (unset)
958 rev->mime_boundary = NULL;
959 else if (arg)
960 rev->mime_boundary = arg;
961 else
962 rev->mime_boundary = git_version_string;
963 rev->no_inline = unset ? 0 : 1;
964 return 0;
967 static int inline_callback(const struct option *opt, const char *arg, int unset)
969 struct rev_info *rev = (struct rev_info *)opt->value;
970 if (unset)
971 rev->mime_boundary = NULL;
972 else if (arg)
973 rev->mime_boundary = arg;
974 else
975 rev->mime_boundary = git_version_string;
976 rev->no_inline = 0;
977 return 0;
980 static int header_callback(const struct option *opt, const char *arg, int unset)
982 if (unset) {
983 string_list_clear(&extra_hdr, 0);
984 string_list_clear(&extra_to, 0);
985 string_list_clear(&extra_cc, 0);
986 } else {
987 add_header(arg);
989 return 0;
992 static int to_callback(const struct option *opt, const char *arg, int unset)
994 if (unset)
995 string_list_clear(&extra_to, 0);
996 else
997 string_list_append(&extra_to, arg);
998 return 0;
1001 static int cc_callback(const struct option *opt, const char *arg, int unset)
1003 if (unset)
1004 string_list_clear(&extra_cc, 0);
1005 else
1006 string_list_append(&extra_cc, arg);
1007 return 0;
1010 static char *find_branch_name(struct rev_info *rev)
1012 int i, positive = -1;
1013 unsigned char branch_sha1[20];
1014 struct strbuf buf = STRBUF_INIT;
1015 const char *branch;
1017 for (i = 0; i < rev->cmdline.nr; i++) {
1018 if (rev->cmdline.rev[i].flags & UNINTERESTING)
1019 continue;
1020 if (positive < 0)
1021 positive = i;
1022 else
1023 return NULL;
1025 if (positive < 0)
1026 return NULL;
1027 strbuf_addf(&buf, "refs/heads/%s", rev->cmdline.rev[positive].name);
1028 branch = resolve_ref_unsafe(buf.buf, branch_sha1, 1, NULL);
1029 if (!branch ||
1030 prefixcmp(branch, "refs/heads/") ||
1031 hashcmp(rev->cmdline.rev[positive].item->sha1, branch_sha1))
1032 branch = NULL;
1033 strbuf_release(&buf);
1034 if (branch)
1035 return xstrdup(rev->cmdline.rev[positive].name);
1036 return NULL;
1039 int cmd_format_patch(int argc, const char **argv, const char *prefix)
1041 struct commit *commit;
1042 struct commit **list = NULL;
1043 struct rev_info rev;
1044 struct setup_revision_opt s_r_opt;
1045 int nr = 0, total, i;
1046 int use_stdout = 0;
1047 int start_number = -1;
1048 int numbered_files = 0; /* _just_ numbers */
1049 int ignore_if_in_upstream = 0;
1050 int cover_letter = 0;
1051 int boundary_count = 0;
1052 int no_binary_diff = 0;
1053 struct commit *origin = NULL, *head = NULL;
1054 const char *in_reply_to = NULL;
1055 struct patch_ids ids;
1056 char *add_signoff = NULL;
1057 struct strbuf buf = STRBUF_INIT;
1058 int use_patch_format = 0;
1059 int quiet = 0;
1060 char *branch_name = NULL;
1061 const struct option builtin_format_patch_options[] = {
1062 { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
1063 N_("use [PATCH n/m] even with a single patch"),
1064 PARSE_OPT_NOARG, numbered_callback },
1065 { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
1066 N_("use [PATCH] even with multiple patches"),
1067 PARSE_OPT_NOARG, no_numbered_callback },
1068 OPT_BOOLEAN('s', "signoff", &do_signoff, N_("add Signed-off-by:")),
1069 OPT_BOOLEAN(0, "stdout", &use_stdout,
1070 N_("print patches to standard out")),
1071 OPT_BOOLEAN(0, "cover-letter", &cover_letter,
1072 N_("generate a cover letter")),
1073 OPT_BOOLEAN(0, "numbered-files", &numbered_files,
1074 N_("use simple number sequence for output file names")),
1075 OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"),
1076 N_("use <sfx> instead of '.patch'")),
1077 OPT_INTEGER(0, "start-number", &start_number,
1078 N_("start numbering patches at <n> instead of 1")),
1079 { OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
1080 N_("Use [<prefix>] instead of [PATCH]"),
1081 PARSE_OPT_NONEG, subject_prefix_callback },
1082 { OPTION_CALLBACK, 'o', "output-directory", &output_directory,
1083 N_("dir"), N_("store resulting files in <dir>"),
1084 PARSE_OPT_NONEG, output_directory_callback },
1085 { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
1086 N_("don't strip/add [PATCH]"),
1087 PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
1088 OPT_BOOLEAN(0, "no-binary", &no_binary_diff,
1089 N_("don't output binary diffs")),
1090 OPT_BOOLEAN(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
1091 N_("don't include a patch matching a commit upstream")),
1092 { OPTION_BOOLEAN, 'p', "no-stat", &use_patch_format, NULL,
1093 N_("show patch format instead of default (patch + stat)"),
1094 PARSE_OPT_NONEG | PARSE_OPT_NOARG },
1095 OPT_GROUP(N_("Messaging")),
1096 { OPTION_CALLBACK, 0, "add-header", NULL, N_("header"),
1097 N_("add email header"), 0, header_callback },
1098 { OPTION_CALLBACK, 0, "to", NULL, N_("email"), N_("add To: header"),
1099 0, to_callback },
1100 { OPTION_CALLBACK, 0, "cc", NULL, N_("email"), N_("add Cc: header"),
1101 0, cc_callback },
1102 OPT_STRING(0, "in-reply-to", &in_reply_to, N_("message-id"),
1103 N_("make first mail a reply to <message-id>")),
1104 { OPTION_CALLBACK, 0, "attach", &rev, N_("boundary"),
1105 N_("attach the patch"), PARSE_OPT_OPTARG,
1106 attach_callback },
1107 { OPTION_CALLBACK, 0, "inline", &rev, N_("boundary"),
1108 N_("inline the patch"),
1109 PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
1110 inline_callback },
1111 { OPTION_CALLBACK, 0, "thread", &thread, N_("style"),
1112 N_("enable message threading, styles: shallow, deep"),
1113 PARSE_OPT_OPTARG, thread_callback },
1114 OPT_STRING(0, "signature", &signature, N_("signature"),
1115 N_("add a signature")),
1116 OPT_BOOLEAN(0, "quiet", &quiet,
1117 N_("don't print the patch filenames")),
1118 OPT_END()
1121 extra_hdr.strdup_strings = 1;
1122 extra_to.strdup_strings = 1;
1123 extra_cc.strdup_strings = 1;
1124 git_config(git_format_config, NULL);
1125 init_revisions(&rev, prefix);
1126 rev.commit_format = CMIT_FMT_EMAIL;
1127 rev.verbose_header = 1;
1128 rev.diff = 1;
1129 rev.max_parents = 1;
1130 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
1131 rev.subject_prefix = fmt_patch_subject_prefix;
1132 memset(&s_r_opt, 0, sizeof(s_r_opt));
1133 s_r_opt.def = "HEAD";
1134 s_r_opt.revarg_opt = REVARG_COMMITTISH;
1136 if (default_attach) {
1137 rev.mime_boundary = default_attach;
1138 rev.no_inline = 1;
1142 * Parse the arguments before setup_revisions(), or something
1143 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1144 * possibly a valid SHA1.
1146 argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
1147 builtin_format_patch_usage,
1148 PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
1149 PARSE_OPT_KEEP_DASHDASH);
1151 if (do_signoff) {
1152 const char *committer;
1153 const char *endpos;
1154 committer = git_committer_info(IDENT_STRICT);
1155 endpos = strchr(committer, '>');
1156 if (!endpos)
1157 die(_("bogus committer info %s"), committer);
1158 add_signoff = xmemdupz(committer, endpos - committer + 1);
1161 for (i = 0; i < extra_hdr.nr; i++) {
1162 strbuf_addstr(&buf, extra_hdr.items[i].string);
1163 strbuf_addch(&buf, '\n');
1166 if (extra_to.nr)
1167 strbuf_addstr(&buf, "To: ");
1168 for (i = 0; i < extra_to.nr; i++) {
1169 if (i)
1170 strbuf_addstr(&buf, " ");
1171 strbuf_addstr(&buf, extra_to.items[i].string);
1172 if (i + 1 < extra_to.nr)
1173 strbuf_addch(&buf, ',');
1174 strbuf_addch(&buf, '\n');
1177 if (extra_cc.nr)
1178 strbuf_addstr(&buf, "Cc: ");
1179 for (i = 0; i < extra_cc.nr; i++) {
1180 if (i)
1181 strbuf_addstr(&buf, " ");
1182 strbuf_addstr(&buf, extra_cc.items[i].string);
1183 if (i + 1 < extra_cc.nr)
1184 strbuf_addch(&buf, ',');
1185 strbuf_addch(&buf, '\n');
1188 rev.extra_headers = strbuf_detach(&buf, NULL);
1190 if (start_number < 0)
1191 start_number = 1;
1194 * If numbered is set solely due to format.numbered in config,
1195 * and it would conflict with --keep-subject (-k) from the
1196 * command line, reset "numbered".
1198 if (numbered && keep_subject && !numbered_cmdline_opt)
1199 numbered = 0;
1201 if (numbered && keep_subject)
1202 die (_("-n and -k are mutually exclusive."));
1203 if (keep_subject && subject_prefix)
1204 die (_("--subject-prefix and -k are mutually exclusive."));
1205 rev.preserve_subject = keep_subject;
1207 argc = setup_revisions(argc, argv, &rev, &s_r_opt);
1208 if (argc > 1)
1209 die (_("unrecognized argument: %s"), argv[1]);
1211 if (rev.diffopt.output_format & DIFF_FORMAT_NAME)
1212 die(_("--name-only does not make sense"));
1213 if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)
1214 die(_("--name-status does not make sense"));
1215 if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
1216 die(_("--check does not make sense"));
1218 if (!use_patch_format &&
1219 (!rev.diffopt.output_format ||
1220 rev.diffopt.output_format == DIFF_FORMAT_PATCH))
1221 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY;
1223 /* Always generate a patch */
1224 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1226 if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
1227 DIFF_OPT_SET(&rev.diffopt, BINARY);
1229 if (rev.show_notes)
1230 init_display_notes(&rev.notes_opt);
1232 if (!use_stdout)
1233 output_directory = set_outdir(prefix, output_directory);
1234 else
1235 setup_pager();
1237 if (output_directory) {
1238 if (use_stdout)
1239 die(_("standard output, or directory, which one?"));
1240 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
1241 die_errno(_("Could not create directory '%s'"),
1242 output_directory);
1245 if (rev.pending.nr == 1) {
1246 if (rev.max_count < 0 && !rev.show_root_diff) {
1248 * This is traditional behaviour of "git format-patch
1249 * origin" that prepares what the origin side still
1250 * does not have.
1252 unsigned char sha1[20];
1253 const char *ref;
1255 rev.pending.objects[0].item->flags |= UNINTERESTING;
1256 add_head_to_pending(&rev);
1257 ref = resolve_ref_unsafe("HEAD", sha1, 1, NULL);
1258 if (ref && !prefixcmp(ref, "refs/heads/"))
1259 branch_name = xstrdup(ref + strlen("refs/heads/"));
1260 else
1261 branch_name = xstrdup(""); /* no branch */
1264 * Otherwise, it is "format-patch -22 HEAD", and/or
1265 * "format-patch --root HEAD". The user wants
1266 * get_revision() to do the usual traversal.
1271 * We cannot move this anywhere earlier because we do want to
1272 * know if --root was given explicitly from the command line.
1274 rev.show_root_diff = 1;
1276 if (cover_letter) {
1278 * NEEDSWORK:randomly pick one positive commit to show
1279 * diffstat; this is often the tip and the command
1280 * happens to do the right thing in most cases, but a
1281 * complex command like "--cover-letter a b c ^bottom"
1282 * picks "c" and shows diffstat between bottom..c
1283 * which may not match what the series represents at
1284 * all and totally broken.
1286 int i;
1287 for (i = 0; i < rev.pending.nr; i++) {
1288 struct object *o = rev.pending.objects[i].item;
1289 if (!(o->flags & UNINTERESTING))
1290 head = (struct commit *)o;
1292 /* There is nothing to show; it is not an error, though. */
1293 if (!head)
1294 return 0;
1295 if (!branch_name)
1296 branch_name = find_branch_name(&rev);
1299 if (ignore_if_in_upstream) {
1300 /* Don't say anything if head and upstream are the same. */
1301 if (rev.pending.nr == 2) {
1302 struct object_array_entry *o = rev.pending.objects;
1303 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1304 return 0;
1306 get_patch_ids(&rev, &ids);
1309 if (!use_stdout)
1310 realstdout = xfdopen(xdup(1), "w");
1312 if (prepare_revision_walk(&rev))
1313 die(_("revision walk setup failed"));
1314 rev.boundary = 1;
1315 while ((commit = get_revision(&rev)) != NULL) {
1316 if (commit->object.flags & BOUNDARY) {
1317 boundary_count++;
1318 origin = (boundary_count == 1) ? commit : NULL;
1319 continue;
1322 if (ignore_if_in_upstream &&
1323 has_commit_patch_id(commit, &ids))
1324 continue;
1326 nr++;
1327 list = xrealloc(list, nr * sizeof(list[0]));
1328 list[nr - 1] = commit;
1330 total = nr;
1331 if (!keep_subject && auto_number && total > 1)
1332 numbered = 1;
1333 if (numbered)
1334 rev.total = total + start_number - 1;
1335 if (in_reply_to || thread || cover_letter)
1336 rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
1337 if (in_reply_to) {
1338 const char *msgid = clean_message_id(in_reply_to);
1339 string_list_append(rev.ref_message_ids, msgid);
1341 rev.numbered_files = numbered_files;
1342 rev.patch_suffix = fmt_patch_suffix;
1343 if (cover_letter) {
1344 if (thread)
1345 gen_message_id(&rev, "cover");
1346 make_cover_letter(&rev, use_stdout, numbered, numbered_files,
1347 origin, nr, list, head, branch_name, quiet);
1348 total++;
1349 start_number--;
1351 rev.add_signoff = add_signoff;
1352 while (0 <= --nr) {
1353 int shown;
1354 commit = list[nr];
1355 rev.nr = total - nr + (start_number - 1);
1356 /* Make the second and subsequent mails replies to the first */
1357 if (thread) {
1358 /* Have we already had a message ID? */
1359 if (rev.message_id) {
1361 * For deep threading: make every mail
1362 * a reply to the previous one, no
1363 * matter what other options are set.
1365 * For shallow threading:
1367 * Without --cover-letter and
1368 * --in-reply-to, make every mail a
1369 * reply to the one before.
1371 * With --in-reply-to but no
1372 * --cover-letter, make every mail a
1373 * reply to the <reply-to>.
1375 * With --cover-letter, make every
1376 * mail but the cover letter a reply
1377 * to the cover letter. The cover
1378 * letter is a reply to the
1379 * --in-reply-to, if specified.
1381 if (thread == THREAD_SHALLOW
1382 && rev.ref_message_ids->nr > 0
1383 && (!cover_letter || rev.nr > 1))
1384 free(rev.message_id);
1385 else
1386 string_list_append(rev.ref_message_ids,
1387 rev.message_id);
1389 gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
1392 if (!use_stdout &&
1393 reopen_stdout(numbered_files ? NULL : commit, NULL, &rev, quiet))
1394 die(_("Failed to create output files"));
1395 shown = log_tree_commit(&rev, commit);
1396 free(commit->buffer);
1397 commit->buffer = NULL;
1399 /* We put one extra blank line between formatted
1400 * patches and this flag is used by log-tree code
1401 * to see if it needs to emit a LF before showing
1402 * the log; when using one file per patch, we do
1403 * not want the extra blank line.
1405 if (!use_stdout)
1406 rev.shown_one = 0;
1407 if (shown) {
1408 if (rev.mime_boundary)
1409 printf("\n--%s%s--\n\n\n",
1410 mime_boundary_leader,
1411 rev.mime_boundary);
1412 else
1413 print_signature();
1415 if (!use_stdout)
1416 fclose(stdout);
1418 free(list);
1419 free(branch_name);
1420 string_list_clear(&extra_to, 0);
1421 string_list_clear(&extra_cc, 0);
1422 string_list_clear(&extra_hdr, 0);
1423 if (ignore_if_in_upstream)
1424 free_patch_ids(&ids);
1425 return 0;
1428 static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
1430 unsigned char sha1[20];
1431 if (get_sha1(arg, sha1) == 0) {
1432 struct commit *commit = lookup_commit_reference(sha1);
1433 if (commit) {
1434 commit->object.flags |= flags;
1435 add_pending_object(revs, &commit->object, arg);
1436 return 0;
1439 return -1;
1442 static const char * const cherry_usage[] = {
1443 N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"),
1444 NULL
1447 static void print_commit(char sign, struct commit *commit, int verbose,
1448 int abbrev)
1450 if (!verbose) {
1451 printf("%c %s\n", sign,
1452 find_unique_abbrev(commit->object.sha1, abbrev));
1453 } else {
1454 struct strbuf buf = STRBUF_INIT;
1455 pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
1456 printf("%c %s %s\n", sign,
1457 find_unique_abbrev(commit->object.sha1, abbrev),
1458 buf.buf);
1459 strbuf_release(&buf);
1463 int cmd_cherry(int argc, const char **argv, const char *prefix)
1465 struct rev_info revs;
1466 struct patch_ids ids;
1467 struct commit *commit;
1468 struct commit_list *list = NULL;
1469 struct branch *current_branch;
1470 const char *upstream;
1471 const char *head = "HEAD";
1472 const char *limit = NULL;
1473 int verbose = 0, abbrev = 0;
1475 struct option options[] = {
1476 OPT__ABBREV(&abbrev),
1477 OPT__VERBOSE(&verbose, N_("be verbose")),
1478 OPT_END()
1481 argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
1483 switch (argc) {
1484 case 3:
1485 limit = argv[2];
1486 /* FALLTHROUGH */
1487 case 2:
1488 head = argv[1];
1489 /* FALLTHROUGH */
1490 case 1:
1491 upstream = argv[0];
1492 break;
1493 default:
1494 current_branch = branch_get(NULL);
1495 if (!current_branch || !current_branch->merge
1496 || !current_branch->merge[0]
1497 || !current_branch->merge[0]->dst) {
1498 fprintf(stderr, _("Could not find a tracked"
1499 " remote branch, please"
1500 " specify <upstream> manually.\n"));
1501 usage_with_options(cherry_usage, options);
1504 upstream = current_branch->merge[0]->dst;
1507 init_revisions(&revs, prefix);
1508 revs.max_parents = 1;
1510 if (add_pending_commit(head, &revs, 0))
1511 die(_("Unknown commit %s"), head);
1512 if (add_pending_commit(upstream, &revs, UNINTERESTING))
1513 die(_("Unknown commit %s"), upstream);
1515 /* Don't say anything if head and upstream are the same. */
1516 if (revs.pending.nr == 2) {
1517 struct object_array_entry *o = revs.pending.objects;
1518 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1519 return 0;
1522 get_patch_ids(&revs, &ids);
1524 if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
1525 die(_("Unknown commit %s"), limit);
1527 /* reverse the list of commits */
1528 if (prepare_revision_walk(&revs))
1529 die(_("revision walk setup failed"));
1530 while ((commit = get_revision(&revs)) != NULL) {
1531 commit_list_insert(commit, &list);
1534 while (list) {
1535 char sign = '+';
1537 commit = list->item;
1538 if (has_commit_patch_id(commit, &ids))
1539 sign = '-';
1540 print_commit(sign, commit, verbose, abbrev);
1541 list = list->next;
1544 free_patch_ids(&ids);
1545 return 0;