ident: don't write fallback username into git_default_name
[git/mjg.git] / builtin / log.c
blob656bddfb03877a71e767d2a478b2a9e40ab2a8c7
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"
25 /* Set a default date-time format for git log ("log.date" config variable) */
26 static const char *default_date_mode = NULL;
28 static int default_abbrev_commit;
29 static int default_show_root = 1;
30 static int decoration_style;
31 static int decoration_given;
32 static const char *fmt_patch_subject_prefix = "PATCH";
33 static const char *fmt_pretty;
35 static const char * const builtin_log_usage[] = {
36 "git log [<options>] [<since>..<until>] [[--] <path>...]\n"
37 " or: git show [options] <object>...",
38 NULL
41 static int parse_decoration_style(const char *var, const char *value)
43 switch (git_config_maybe_bool(var, value)) {
44 case 1:
45 return DECORATE_SHORT_REFS;
46 case 0:
47 return 0;
48 default:
49 break;
51 if (!strcmp(value, "full"))
52 return DECORATE_FULL_REFS;
53 else if (!strcmp(value, "short"))
54 return DECORATE_SHORT_REFS;
55 return -1;
58 static int decorate_callback(const struct option *opt, const char *arg, int unset)
60 if (unset)
61 decoration_style = 0;
62 else if (arg)
63 decoration_style = parse_decoration_style("command line", arg);
64 else
65 decoration_style = DECORATE_SHORT_REFS;
67 if (decoration_style < 0)
68 die("invalid --decorate option: %s", arg);
70 decoration_given = 1;
72 return 0;
75 static void cmd_log_init_defaults(struct rev_info *rev)
77 if (fmt_pretty)
78 get_commit_format(fmt_pretty, rev);
79 rev->verbose_header = 1;
80 DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
81 rev->diffopt.stat_width = -1; /* use full terminal width */
82 rev->diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
83 rev->abbrev_commit = default_abbrev_commit;
84 rev->show_root_diff = default_show_root;
85 rev->subject_prefix = fmt_patch_subject_prefix;
86 DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
88 if (default_date_mode)
89 rev->date_mode = parse_date_format(default_date_mode);
92 static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
93 struct rev_info *rev, struct setup_revision_opt *opt)
95 struct userformat_want w;
96 int quiet = 0, source = 0;
98 const struct option builtin_log_options[] = {
99 OPT_BOOLEAN(0, "quiet", &quiet, "suppress diff output"),
100 OPT_BOOLEAN(0, "source", &source, "show source"),
101 { OPTION_CALLBACK, 0, "decorate", NULL, NULL, "decorate options",
102 PARSE_OPT_OPTARG, decorate_callback},
103 OPT_END()
106 argc = parse_options(argc, argv, prefix,
107 builtin_log_options, builtin_log_usage,
108 PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
109 PARSE_OPT_KEEP_DASHDASH);
111 argc = setup_revisions(argc, argv, rev, opt);
112 if (quiet)
113 rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
115 /* Any arguments at this point are not recognized */
116 if (argc > 1)
117 die("unrecognized argument: %s", argv[1]);
119 memset(&w, 0, sizeof(w));
120 userformat_find_requirements(NULL, &w);
122 if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
123 rev->show_notes = 1;
124 if (rev->show_notes)
125 init_display_notes(&rev->notes_opt);
127 if (rev->diffopt.pickaxe || rev->diffopt.filter)
128 rev->always_show_header = 0;
129 if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
130 rev->always_show_header = 0;
131 if (rev->diffopt.pathspec.nr != 1)
132 usage("git logs can only follow renames on one pathname at a time");
135 if (source)
136 rev->show_source = 1;
138 if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
140 * "log --pretty=raw" is special; ignore UI oriented
141 * configuration variables such as decoration.
143 if (!decoration_given)
144 decoration_style = 0;
145 if (!rev->abbrev_commit_given)
146 rev->abbrev_commit = 0;
149 if (decoration_style) {
150 rev->show_decorations = 1;
151 load_ref_decorations(decoration_style);
153 setup_pager();
156 static void cmd_log_init(int argc, const char **argv, const char *prefix,
157 struct rev_info *rev, struct setup_revision_opt *opt)
159 cmd_log_init_defaults(rev);
160 cmd_log_init_finish(argc, argv, prefix, rev, opt);
164 * This gives a rough estimate for how many commits we
165 * will print out in the list.
167 static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
169 int n = 0;
171 while (list) {
172 struct commit *commit = list->item;
173 unsigned int flags = commit->object.flags;
174 list = list->next;
175 if (!(flags & (TREESAME | UNINTERESTING)))
176 n++;
178 return n;
181 static void show_early_header(struct rev_info *rev, const char *stage, int nr)
183 if (rev->shown_one) {
184 rev->shown_one = 0;
185 if (rev->commit_format != CMIT_FMT_ONELINE)
186 putchar(rev->diffopt.line_termination);
188 printf(_("Final output: %d %s\n"), nr, stage);
191 static struct itimerval early_output_timer;
193 static void log_show_early(struct rev_info *revs, struct commit_list *list)
195 int i = revs->early_output;
196 int show_header = 1;
198 sort_in_topological_order(&list, revs->lifo);
199 while (list && i) {
200 struct commit *commit = list->item;
201 switch (simplify_commit(revs, commit)) {
202 case commit_show:
203 if (show_header) {
204 int n = estimate_commit_count(revs, list);
205 show_early_header(revs, "incomplete", n);
206 show_header = 0;
208 log_tree_commit(revs, commit);
209 i--;
210 break;
211 case commit_ignore:
212 break;
213 case commit_error:
214 return;
216 list = list->next;
219 /* Did we already get enough commits for the early output? */
220 if (!i)
221 return;
224 * ..if no, then repeat it twice a second until we
225 * do.
227 * NOTE! We don't use "it_interval", because if the
228 * reader isn't listening, we want our output to be
229 * throttled by the writing, and not have the timer
230 * trigger every second even if we're blocked on a
231 * reader!
233 early_output_timer.it_value.tv_sec = 0;
234 early_output_timer.it_value.tv_usec = 500000;
235 setitimer(ITIMER_REAL, &early_output_timer, NULL);
238 static void early_output(int signal)
240 show_early_output = log_show_early;
243 static void setup_early_output(struct rev_info *rev)
245 struct sigaction sa;
248 * Set up the signal handler, minimally intrusively:
249 * we only set a single volatile integer word (not
250 * using sigatomic_t - trying to avoid unnecessary
251 * system dependencies and headers), and using
252 * SA_RESTART.
254 memset(&sa, 0, sizeof(sa));
255 sa.sa_handler = early_output;
256 sigemptyset(&sa.sa_mask);
257 sa.sa_flags = SA_RESTART;
258 sigaction(SIGALRM, &sa, NULL);
261 * If we can get the whole output in less than a
262 * tenth of a second, don't even bother doing the
263 * early-output thing..
265 * This is a one-time-only trigger.
267 early_output_timer.it_value.tv_sec = 0;
268 early_output_timer.it_value.tv_usec = 100000;
269 setitimer(ITIMER_REAL, &early_output_timer, NULL);
272 static void finish_early_output(struct rev_info *rev)
274 int n = estimate_commit_count(rev, rev->commits);
275 signal(SIGALRM, SIG_IGN);
276 show_early_header(rev, "done", n);
279 static int cmd_log_walk(struct rev_info *rev)
281 struct commit *commit;
282 int saved_nrl = 0;
283 int saved_dcctc = 0;
285 if (rev->early_output)
286 setup_early_output(rev);
288 if (prepare_revision_walk(rev))
289 die(_("revision walk setup failed"));
291 if (rev->early_output)
292 finish_early_output(rev);
295 * For --check and --exit-code, the exit code is based on CHECK_FAILED
296 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
297 * retain that state information if replacing rev->diffopt in this loop
299 while ((commit = get_revision(rev)) != NULL) {
300 if (!log_tree_commit(rev, commit) &&
301 rev->max_count >= 0)
303 * We decremented max_count in get_revision,
304 * but we didn't actually show the commit.
306 rev->max_count++;
307 if (!rev->reflog_info) {
308 /* we allow cycles in reflog ancestry */
309 free(commit->buffer);
310 commit->buffer = NULL;
312 free_commit_list(commit->parents);
313 commit->parents = NULL;
314 if (saved_nrl < rev->diffopt.needed_rename_limit)
315 saved_nrl = rev->diffopt.needed_rename_limit;
316 if (rev->diffopt.degraded_cc_to_c)
317 saved_dcctc = 1;
319 rev->diffopt.degraded_cc_to_c = saved_dcctc;
320 rev->diffopt.needed_rename_limit = saved_nrl;
322 if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
323 DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
324 return 02;
326 return diff_result_code(&rev->diffopt, 0);
329 static int git_log_config(const char *var, const char *value, void *cb)
331 if (!strcmp(var, "format.pretty"))
332 return git_config_string(&fmt_pretty, var, value);
333 if (!strcmp(var, "format.subjectprefix"))
334 return git_config_string(&fmt_patch_subject_prefix, var, value);
335 if (!strcmp(var, "log.abbrevcommit")) {
336 default_abbrev_commit = git_config_bool(var, value);
337 return 0;
339 if (!strcmp(var, "log.date"))
340 return git_config_string(&default_date_mode, var, value);
341 if (!strcmp(var, "log.decorate")) {
342 decoration_style = parse_decoration_style(var, value);
343 if (decoration_style < 0)
344 decoration_style = 0; /* maybe warn? */
345 return 0;
347 if (!strcmp(var, "log.showroot")) {
348 default_show_root = git_config_bool(var, value);
349 return 0;
351 if (!prefixcmp(var, "color.decorate."))
352 return parse_decorate_color_config(var, 15, value);
354 return git_diff_ui_config(var, value, cb);
357 int cmd_whatchanged(int argc, const char **argv, const char *prefix)
359 struct rev_info rev;
360 struct setup_revision_opt opt;
362 git_config(git_log_config, NULL);
364 init_revisions(&rev, prefix);
365 rev.diff = 1;
366 rev.simplify_history = 0;
367 memset(&opt, 0, sizeof(opt));
368 opt.def = "HEAD";
369 cmd_log_init(argc, argv, prefix, &rev, &opt);
370 if (!rev.diffopt.output_format)
371 rev.diffopt.output_format = DIFF_FORMAT_RAW;
372 return cmd_log_walk(&rev);
375 static void show_tagger(char *buf, int len, struct rev_info *rev)
377 struct strbuf out = STRBUF_INIT;
378 struct pretty_print_context pp = {0};
380 pp.fmt = rev->commit_format;
381 pp.date_mode = rev->date_mode;
382 pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding());
383 printf("%s", out.buf);
384 strbuf_release(&out);
387 static int show_blob_object(const unsigned char *sha1, struct rev_info *rev)
389 fflush(stdout);
390 return stream_blob_to_fd(1, sha1, NULL, 0);
393 static int show_tag_object(const unsigned char *sha1, struct rev_info *rev)
395 unsigned long size;
396 enum object_type type;
397 char *buf = read_sha1_file(sha1, &type, &size);
398 int offset = 0;
400 if (!buf)
401 return error(_("Could not read object %s"), sha1_to_hex(sha1));
403 assert(type == OBJ_TAG);
404 while (offset < size && buf[offset] != '\n') {
405 int new_offset = offset + 1;
406 while (new_offset < size && buf[new_offset++] != '\n')
407 ; /* do nothing */
408 if (!prefixcmp(buf + offset, "tagger "))
409 show_tagger(buf + offset + 7,
410 new_offset - offset - 7, rev);
411 offset = new_offset;
414 if (offset < size)
415 fwrite(buf + offset, size - offset, 1, stdout);
416 free(buf);
417 return 0;
420 static int show_tree_object(const unsigned char *sha1,
421 const char *base, int baselen,
422 const char *pathname, unsigned mode, int stage, void *context)
424 printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
425 return 0;
428 static void show_rev_tweak_rev(struct rev_info *rev, struct setup_revision_opt *opt)
430 if (rev->ignore_merges) {
431 /* There was no "-m" on the command line */
432 rev->ignore_merges = 0;
433 if (!rev->first_parent_only && !rev->combine_merges) {
434 /* No "--first-parent", "-c", nor "--cc" */
435 rev->combine_merges = 1;
436 rev->dense_combined_merges = 1;
439 if (!rev->diffopt.output_format)
440 rev->diffopt.output_format = DIFF_FORMAT_PATCH;
443 int cmd_show(int argc, const char **argv, const char *prefix)
445 struct rev_info rev;
446 struct object_array_entry *objects;
447 struct setup_revision_opt opt;
448 struct pathspec match_all;
449 int i, count, ret = 0;
451 git_config(git_log_config, NULL);
453 init_pathspec(&match_all, NULL);
454 init_revisions(&rev, prefix);
455 rev.diff = 1;
456 rev.always_show_header = 1;
457 rev.no_walk = 1;
458 rev.diffopt.stat_width = -1; /* Scale to real terminal size */
460 memset(&opt, 0, sizeof(opt));
461 opt.def = "HEAD";
462 opt.tweak = show_rev_tweak_rev;
463 cmd_log_init(argc, argv, prefix, &rev, &opt);
465 count = rev.pending.nr;
466 objects = rev.pending.objects;
467 for (i = 0; i < count && !ret; i++) {
468 struct object *o = objects[i].item;
469 const char *name = objects[i].name;
470 switch (o->type) {
471 case OBJ_BLOB:
472 ret = show_blob_object(o->sha1, NULL);
473 break;
474 case OBJ_TAG: {
475 struct tag *t = (struct tag *)o;
477 if (rev.shown_one)
478 putchar('\n');
479 printf("%stag %s%s\n",
480 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
481 t->tag,
482 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
483 ret = show_tag_object(o->sha1, &rev);
484 rev.shown_one = 1;
485 if (ret)
486 break;
487 o = parse_object(t->tagged->sha1);
488 if (!o)
489 ret = error(_("Could not read object %s"),
490 sha1_to_hex(t->tagged->sha1));
491 objects[i].item = o;
492 i--;
493 break;
495 case OBJ_TREE:
496 if (rev.shown_one)
497 putchar('\n');
498 printf("%stree %s%s\n\n",
499 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
500 name,
501 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
502 read_tree_recursive((struct tree *)o, "", 0, 0, &match_all,
503 show_tree_object, NULL);
504 rev.shown_one = 1;
505 break;
506 case OBJ_COMMIT:
507 rev.pending.nr = rev.pending.alloc = 0;
508 rev.pending.objects = NULL;
509 add_object_array(o, name, &rev.pending);
510 ret = cmd_log_walk(&rev);
511 break;
512 default:
513 ret = error(_("Unknown type: %d"), o->type);
516 free(objects);
517 return ret;
521 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
523 int cmd_log_reflog(int argc, const char **argv, const char *prefix)
525 struct rev_info rev;
526 struct setup_revision_opt opt;
528 git_config(git_log_config, NULL);
530 init_revisions(&rev, prefix);
531 init_reflog_walk(&rev.reflog_info);
532 rev.verbose_header = 1;
533 memset(&opt, 0, sizeof(opt));
534 opt.def = "HEAD";
535 cmd_log_init_defaults(&rev);
536 rev.abbrev_commit = 1;
537 rev.commit_format = CMIT_FMT_ONELINE;
538 rev.use_terminator = 1;
539 rev.always_show_header = 1;
540 cmd_log_init_finish(argc, argv, prefix, &rev, &opt);
542 return cmd_log_walk(&rev);
545 int cmd_log(int argc, const char **argv, const char *prefix)
547 struct rev_info rev;
548 struct setup_revision_opt opt;
550 git_config(git_log_config, NULL);
552 init_revisions(&rev, prefix);
553 rev.always_show_header = 1;
554 memset(&opt, 0, sizeof(opt));
555 opt.def = "HEAD";
556 cmd_log_init(argc, argv, prefix, &rev, &opt);
557 return cmd_log_walk(&rev);
560 /* format-patch */
562 static const char *fmt_patch_suffix = ".patch";
563 static int numbered = 0;
564 static int auto_number = 1;
566 static char *default_attach = NULL;
568 static struct string_list extra_hdr;
569 static struct string_list extra_to;
570 static struct string_list extra_cc;
572 static void add_header(const char *value)
574 struct string_list_item *item;
575 int len = strlen(value);
576 while (len && value[len - 1] == '\n')
577 len--;
579 if (!strncasecmp(value, "to: ", 4)) {
580 item = string_list_append(&extra_to, value + 4);
581 len -= 4;
582 } else if (!strncasecmp(value, "cc: ", 4)) {
583 item = string_list_append(&extra_cc, value + 4);
584 len -= 4;
585 } else {
586 item = string_list_append(&extra_hdr, value);
589 item->string[len] = '\0';
592 #define THREAD_SHALLOW 1
593 #define THREAD_DEEP 2
594 static int thread;
595 static int do_signoff;
596 static const char *signature = git_version_string;
598 static int git_format_config(const char *var, const char *value, void *cb)
600 if (!strcmp(var, "format.headers")) {
601 if (!value)
602 die(_("format.headers without value"));
603 add_header(value);
604 return 0;
606 if (!strcmp(var, "format.suffix"))
607 return git_config_string(&fmt_patch_suffix, var, value);
608 if (!strcmp(var, "format.to")) {
609 if (!value)
610 return config_error_nonbool(var);
611 string_list_append(&extra_to, value);
612 return 0;
614 if (!strcmp(var, "format.cc")) {
615 if (!value)
616 return config_error_nonbool(var);
617 string_list_append(&extra_cc, value);
618 return 0;
620 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
621 !strcmp(var, "color.ui")) {
622 return 0;
624 if (!strcmp(var, "format.numbered")) {
625 if (value && !strcasecmp(value, "auto")) {
626 auto_number = 1;
627 return 0;
629 numbered = git_config_bool(var, value);
630 auto_number = auto_number && numbered;
631 return 0;
633 if (!strcmp(var, "format.attach")) {
634 if (value && *value)
635 default_attach = xstrdup(value);
636 else
637 default_attach = xstrdup(git_version_string);
638 return 0;
640 if (!strcmp(var, "format.thread")) {
641 if (value && !strcasecmp(value, "deep")) {
642 thread = THREAD_DEEP;
643 return 0;
645 if (value && !strcasecmp(value, "shallow")) {
646 thread = THREAD_SHALLOW;
647 return 0;
649 thread = git_config_bool(var, value) && THREAD_SHALLOW;
650 return 0;
652 if (!strcmp(var, "format.signoff")) {
653 do_signoff = git_config_bool(var, value);
654 return 0;
656 if (!strcmp(var, "format.signature"))
657 return git_config_string(&signature, var, value);
659 return git_log_config(var, value, cb);
662 static FILE *realstdout = NULL;
663 static const char *output_directory = NULL;
664 static int outdir_offset;
666 static int reopen_stdout(struct commit *commit, struct rev_info *rev, int quiet)
668 struct strbuf filename = STRBUF_INIT;
669 int suffix_len = strlen(fmt_patch_suffix) + 1;
671 if (output_directory) {
672 strbuf_addstr(&filename, output_directory);
673 if (filename.len >=
674 PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len)
675 return error(_("name of output directory is too long"));
676 if (filename.buf[filename.len - 1] != '/')
677 strbuf_addch(&filename, '/');
680 get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename);
682 if (!quiet)
683 fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
685 if (freopen(filename.buf, "w", stdout) == NULL)
686 return error(_("Cannot open patch file %s"), filename.buf);
688 strbuf_release(&filename);
689 return 0;
692 static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const char *prefix)
694 struct rev_info check_rev;
695 struct commit *commit;
696 struct object *o1, *o2;
697 unsigned flags1, flags2;
699 if (rev->pending.nr != 2)
700 die(_("Need exactly one range."));
702 o1 = rev->pending.objects[0].item;
703 flags1 = o1->flags;
704 o2 = rev->pending.objects[1].item;
705 flags2 = o2->flags;
707 if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
708 die(_("Not a range."));
710 init_patch_ids(ids);
712 /* given a range a..b get all patch ids for b..a */
713 init_revisions(&check_rev, prefix);
714 o1->flags ^= UNINTERESTING;
715 o2->flags ^= UNINTERESTING;
716 add_pending_object(&check_rev, o1, "o1");
717 add_pending_object(&check_rev, o2, "o2");
718 if (prepare_revision_walk(&check_rev))
719 die(_("revision walk setup failed"));
721 while ((commit = get_revision(&check_rev)) != NULL) {
722 /* ignore merges */
723 if (commit->parents && commit->parents->next)
724 continue;
726 add_commit_patch_id(commit, ids);
729 /* reset for next revision walk */
730 clear_commit_marks((struct commit *)o1,
731 SEEN | UNINTERESTING | SHOWN | ADDED);
732 clear_commit_marks((struct commit *)o2,
733 SEEN | UNINTERESTING | SHOWN | ADDED);
734 o1->flags = flags1;
735 o2->flags = flags2;
738 static void gen_message_id(struct rev_info *info, char *base)
740 struct strbuf buf = STRBUF_INIT;
741 strbuf_addf(&buf, "%s.%lu.git.%s", base,
742 (unsigned long) time(NULL), ident_default_email());
743 info->message_id = strbuf_detach(&buf, NULL);
746 static void print_signature(void)
748 if (signature && *signature)
749 printf("-- \n%s\n\n", signature);
752 static void add_branch_description(struct strbuf *buf, const char *branch_name)
754 struct strbuf desc = STRBUF_INIT;
755 if (!branch_name || !*branch_name)
756 return;
757 read_branch_desc(&desc, branch_name);
758 if (desc.len) {
759 strbuf_addch(buf, '\n');
760 strbuf_add(buf, desc.buf, desc.len);
761 strbuf_addch(buf, '\n');
765 static void make_cover_letter(struct rev_info *rev, int use_stdout,
766 int numbered, int numbered_files,
767 struct commit *origin,
768 int nr, struct commit **list, struct commit *head,
769 const char *branch_name,
770 int quiet)
772 const char *committer;
773 const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
774 const char *msg;
775 struct shortlog log;
776 struct strbuf sb = STRBUF_INIT;
777 int i;
778 const char *encoding = "UTF-8";
779 struct diff_options opts;
780 int need_8bit_cte = 0;
781 struct commit *commit = NULL;
782 struct pretty_print_context pp = {0};
784 if (rev->commit_format != CMIT_FMT_EMAIL)
785 die(_("Cover letter needs email format"));
787 committer = git_committer_info(0);
789 if (!numbered_files) {
791 * We fake a commit for the cover letter so we get the filename
792 * desired.
794 commit = xcalloc(1, sizeof(*commit));
795 commit->buffer = xmalloc(400);
796 snprintf(commit->buffer, 400,
797 "tree 0000000000000000000000000000000000000000\n"
798 "parent %s\n"
799 "author %s\n"
800 "committer %s\n\n"
801 "cover letter\n",
802 sha1_to_hex(head->object.sha1), committer, committer);
805 if (!use_stdout && reopen_stdout(commit, rev, quiet))
806 return;
808 if (commit) {
810 free(commit->buffer);
811 free(commit);
814 log_write_email_headers(rev, head, &pp.subject, &pp.after_subject,
815 &need_8bit_cte);
817 for (i = 0; !need_8bit_cte && i < nr; i++)
818 if (has_non_ascii(list[i]->buffer))
819 need_8bit_cte = 1;
821 msg = body;
822 pp.fmt = CMIT_FMT_EMAIL;
823 pp.date_mode = DATE_RFC2822;
824 pp_user_info(&pp, NULL, &sb, committer, encoding);
825 pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
826 pp_remainder(&pp, &msg, &sb, 0);
827 add_branch_description(&sb, branch_name);
828 printf("%s\n", sb.buf);
830 strbuf_release(&sb);
832 shortlog_init(&log);
833 log.wrap_lines = 1;
834 log.wrap = 72;
835 log.in1 = 2;
836 log.in2 = 4;
837 for (i = 0; i < nr; i++)
838 shortlog_add_commit(&log, list[i]);
840 shortlog_output(&log);
843 * We can only do diffstat with a unique reference point
845 if (!origin)
846 return;
848 memcpy(&opts, &rev->diffopt, sizeof(opts));
849 opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
851 diff_setup_done(&opts);
853 diff_tree_sha1(origin->tree->object.sha1,
854 head->tree->object.sha1,
855 "", &opts);
856 diffcore_std(&opts);
857 diff_flush(&opts);
859 printf("\n");
860 print_signature();
863 static const char *clean_message_id(const char *msg_id)
865 char ch;
866 const char *a, *z, *m;
868 m = msg_id;
869 while ((ch = *m) && (isspace(ch) || (ch == '<')))
870 m++;
871 a = m;
872 z = NULL;
873 while ((ch = *m)) {
874 if (!isspace(ch) && (ch != '>'))
875 z = m;
876 m++;
878 if (!z)
879 die(_("insane in-reply-to: %s"), msg_id);
880 if (++z == m)
881 return a;
882 return xmemdupz(a, z - a);
885 static const char *set_outdir(const char *prefix, const char *output_directory)
887 if (output_directory && is_absolute_path(output_directory))
888 return output_directory;
890 if (!prefix || !*prefix) {
891 if (output_directory)
892 return output_directory;
893 /* The user did not explicitly ask for "./" */
894 outdir_offset = 2;
895 return "./";
898 outdir_offset = strlen(prefix);
899 if (!output_directory)
900 return prefix;
902 return xstrdup(prefix_filename(prefix, outdir_offset,
903 output_directory));
906 static const char * const builtin_format_patch_usage[] = {
907 "git format-patch [options] [<since> | <revision range>]",
908 NULL
911 static int keep_subject = 0;
913 static int keep_callback(const struct option *opt, const char *arg, int unset)
915 ((struct rev_info *)opt->value)->total = -1;
916 keep_subject = 1;
917 return 0;
920 static int subject_prefix = 0;
922 static int subject_prefix_callback(const struct option *opt, const char *arg,
923 int unset)
925 subject_prefix = 1;
926 ((struct rev_info *)opt->value)->subject_prefix = arg;
927 return 0;
930 static int numbered_cmdline_opt = 0;
932 static int numbered_callback(const struct option *opt, const char *arg,
933 int unset)
935 *(int *)opt->value = numbered_cmdline_opt = unset ? 0 : 1;
936 if (unset)
937 auto_number = 0;
938 return 0;
941 static int no_numbered_callback(const struct option *opt, const char *arg,
942 int unset)
944 return numbered_callback(opt, arg, 1);
947 static int output_directory_callback(const struct option *opt, const char *arg,
948 int unset)
950 const char **dir = (const char **)opt->value;
951 if (*dir)
952 die(_("Two output directories?"));
953 *dir = arg;
954 return 0;
957 static int thread_callback(const struct option *opt, const char *arg, int unset)
959 int *thread = (int *)opt->value;
960 if (unset)
961 *thread = 0;
962 else if (!arg || !strcmp(arg, "shallow"))
963 *thread = THREAD_SHALLOW;
964 else if (!strcmp(arg, "deep"))
965 *thread = THREAD_DEEP;
966 else
967 return 1;
968 return 0;
971 static int attach_callback(const struct option *opt, const char *arg, int unset)
973 struct rev_info *rev = (struct rev_info *)opt->value;
974 if (unset)
975 rev->mime_boundary = NULL;
976 else if (arg)
977 rev->mime_boundary = arg;
978 else
979 rev->mime_boundary = git_version_string;
980 rev->no_inline = unset ? 0 : 1;
981 return 0;
984 static int inline_callback(const struct option *opt, const char *arg, int unset)
986 struct rev_info *rev = (struct rev_info *)opt->value;
987 if (unset)
988 rev->mime_boundary = NULL;
989 else if (arg)
990 rev->mime_boundary = arg;
991 else
992 rev->mime_boundary = git_version_string;
993 rev->no_inline = 0;
994 return 0;
997 static int header_callback(const struct option *opt, const char *arg, int unset)
999 if (unset) {
1000 string_list_clear(&extra_hdr, 0);
1001 string_list_clear(&extra_to, 0);
1002 string_list_clear(&extra_cc, 0);
1003 } else {
1004 add_header(arg);
1006 return 0;
1009 static int to_callback(const struct option *opt, const char *arg, int unset)
1011 if (unset)
1012 string_list_clear(&extra_to, 0);
1013 else
1014 string_list_append(&extra_to, arg);
1015 return 0;
1018 static int cc_callback(const struct option *opt, const char *arg, int unset)
1020 if (unset)
1021 string_list_clear(&extra_cc, 0);
1022 else
1023 string_list_append(&extra_cc, arg);
1024 return 0;
1027 static char *find_branch_name(struct rev_info *rev)
1029 int i, positive = -1;
1030 unsigned char branch_sha1[20];
1031 struct strbuf buf = STRBUF_INIT;
1032 const char *branch;
1034 for (i = 0; i < rev->cmdline.nr; i++) {
1035 if (rev->cmdline.rev[i].flags & UNINTERESTING)
1036 continue;
1037 if (positive < 0)
1038 positive = i;
1039 else
1040 return NULL;
1042 if (positive < 0)
1043 return NULL;
1044 strbuf_addf(&buf, "refs/heads/%s", rev->cmdline.rev[positive].name);
1045 branch = resolve_ref_unsafe(buf.buf, branch_sha1, 1, NULL);
1046 if (!branch ||
1047 prefixcmp(branch, "refs/heads/") ||
1048 hashcmp(rev->cmdline.rev[positive].item->sha1, branch_sha1))
1049 branch = NULL;
1050 strbuf_release(&buf);
1051 if (branch)
1052 return xstrdup(rev->cmdline.rev[positive].name);
1053 return NULL;
1056 int cmd_format_patch(int argc, const char **argv, const char *prefix)
1058 struct commit *commit;
1059 struct commit **list = NULL;
1060 struct rev_info rev;
1061 struct setup_revision_opt s_r_opt;
1062 int nr = 0, total, i;
1063 int use_stdout = 0;
1064 int start_number = -1;
1065 int numbered_files = 0; /* _just_ numbers */
1066 int ignore_if_in_upstream = 0;
1067 int cover_letter = 0;
1068 int boundary_count = 0;
1069 int no_binary_diff = 0;
1070 struct commit *origin = NULL, *head = NULL;
1071 const char *in_reply_to = NULL;
1072 struct patch_ids ids;
1073 char *add_signoff = NULL;
1074 struct strbuf buf = STRBUF_INIT;
1075 int use_patch_format = 0;
1076 int quiet = 0;
1077 char *branch_name = NULL;
1078 const struct option builtin_format_patch_options[] = {
1079 { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
1080 "use [PATCH n/m] even with a single patch",
1081 PARSE_OPT_NOARG, numbered_callback },
1082 { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
1083 "use [PATCH] even with multiple patches",
1084 PARSE_OPT_NOARG, no_numbered_callback },
1085 OPT_BOOLEAN('s', "signoff", &do_signoff, "add Signed-off-by:"),
1086 OPT_BOOLEAN(0, "stdout", &use_stdout,
1087 "print patches to standard out"),
1088 OPT_BOOLEAN(0, "cover-letter", &cover_letter,
1089 "generate a cover letter"),
1090 OPT_BOOLEAN(0, "numbered-files", &numbered_files,
1091 "use simple number sequence for output file names"),
1092 OPT_STRING(0, "suffix", &fmt_patch_suffix, "sfx",
1093 "use <sfx> instead of '.patch'"),
1094 OPT_INTEGER(0, "start-number", &start_number,
1095 "start numbering patches at <n> instead of 1"),
1096 { OPTION_CALLBACK, 0, "subject-prefix", &rev, "prefix",
1097 "Use [<prefix>] instead of [PATCH]",
1098 PARSE_OPT_NONEG, subject_prefix_callback },
1099 { OPTION_CALLBACK, 'o', "output-directory", &output_directory,
1100 "dir", "store resulting files in <dir>",
1101 PARSE_OPT_NONEG, output_directory_callback },
1102 { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
1103 "don't strip/add [PATCH]",
1104 PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
1105 OPT_BOOLEAN(0, "no-binary", &no_binary_diff,
1106 "don't output binary diffs"),
1107 OPT_BOOLEAN(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
1108 "don't include a patch matching a commit upstream"),
1109 { OPTION_BOOLEAN, 'p', "no-stat", &use_patch_format, NULL,
1110 "show patch format instead of default (patch + stat)",
1111 PARSE_OPT_NONEG | PARSE_OPT_NOARG },
1112 OPT_GROUP("Messaging"),
1113 { OPTION_CALLBACK, 0, "add-header", NULL, "header",
1114 "add email header", 0, header_callback },
1115 { OPTION_CALLBACK, 0, "to", NULL, "email", "add To: header",
1116 0, to_callback },
1117 { OPTION_CALLBACK, 0, "cc", NULL, "email", "add Cc: header",
1118 0, cc_callback },
1119 OPT_STRING(0, "in-reply-to", &in_reply_to, "message-id",
1120 "make first mail a reply to <message-id>"),
1121 { OPTION_CALLBACK, 0, "attach", &rev, "boundary",
1122 "attach the patch", PARSE_OPT_OPTARG,
1123 attach_callback },
1124 { OPTION_CALLBACK, 0, "inline", &rev, "boundary",
1125 "inline the patch",
1126 PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
1127 inline_callback },
1128 { OPTION_CALLBACK, 0, "thread", &thread, "style",
1129 "enable message threading, styles: shallow, deep",
1130 PARSE_OPT_OPTARG, thread_callback },
1131 OPT_STRING(0, "signature", &signature, "signature",
1132 "add a signature"),
1133 OPT_BOOLEAN(0, "quiet", &quiet,
1134 "don't print the patch filenames"),
1135 OPT_END()
1138 extra_hdr.strdup_strings = 1;
1139 extra_to.strdup_strings = 1;
1140 extra_cc.strdup_strings = 1;
1141 git_config(git_format_config, NULL);
1142 init_revisions(&rev, prefix);
1143 rev.commit_format = CMIT_FMT_EMAIL;
1144 rev.verbose_header = 1;
1145 rev.diff = 1;
1146 rev.max_parents = 1;
1147 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
1148 rev.subject_prefix = fmt_patch_subject_prefix;
1149 memset(&s_r_opt, 0, sizeof(s_r_opt));
1150 s_r_opt.def = "HEAD";
1152 if (default_attach) {
1153 rev.mime_boundary = default_attach;
1154 rev.no_inline = 1;
1158 * Parse the arguments before setup_revisions(), or something
1159 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1160 * possibly a valid SHA1.
1162 argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
1163 builtin_format_patch_usage,
1164 PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
1165 PARSE_OPT_KEEP_DASHDASH);
1167 if (do_signoff) {
1168 const char *committer;
1169 const char *endpos;
1170 committer = git_committer_info(IDENT_ERROR_ON_NO_NAME);
1171 endpos = strchr(committer, '>');
1172 if (!endpos)
1173 die(_("bogus committer info %s"), committer);
1174 add_signoff = xmemdupz(committer, endpos - committer + 1);
1177 for (i = 0; i < extra_hdr.nr; i++) {
1178 strbuf_addstr(&buf, extra_hdr.items[i].string);
1179 strbuf_addch(&buf, '\n');
1182 if (extra_to.nr)
1183 strbuf_addstr(&buf, "To: ");
1184 for (i = 0; i < extra_to.nr; i++) {
1185 if (i)
1186 strbuf_addstr(&buf, " ");
1187 strbuf_addstr(&buf, extra_to.items[i].string);
1188 if (i + 1 < extra_to.nr)
1189 strbuf_addch(&buf, ',');
1190 strbuf_addch(&buf, '\n');
1193 if (extra_cc.nr)
1194 strbuf_addstr(&buf, "Cc: ");
1195 for (i = 0; i < extra_cc.nr; i++) {
1196 if (i)
1197 strbuf_addstr(&buf, " ");
1198 strbuf_addstr(&buf, extra_cc.items[i].string);
1199 if (i + 1 < extra_cc.nr)
1200 strbuf_addch(&buf, ',');
1201 strbuf_addch(&buf, '\n');
1204 rev.extra_headers = strbuf_detach(&buf, NULL);
1206 if (start_number < 0)
1207 start_number = 1;
1210 * If numbered is set solely due to format.numbered in config,
1211 * and it would conflict with --keep-subject (-k) from the
1212 * command line, reset "numbered".
1214 if (numbered && keep_subject && !numbered_cmdline_opt)
1215 numbered = 0;
1217 if (numbered && keep_subject)
1218 die (_("-n and -k are mutually exclusive."));
1219 if (keep_subject && subject_prefix)
1220 die (_("--subject-prefix and -k are mutually exclusive."));
1221 rev.preserve_subject = keep_subject;
1223 argc = setup_revisions(argc, argv, &rev, &s_r_opt);
1224 if (argc > 1)
1225 die (_("unrecognized argument: %s"), argv[1]);
1227 if (rev.diffopt.output_format & DIFF_FORMAT_NAME)
1228 die(_("--name-only does not make sense"));
1229 if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)
1230 die(_("--name-status does not make sense"));
1231 if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
1232 die(_("--check does not make sense"));
1234 if (!use_patch_format &&
1235 (!rev.diffopt.output_format ||
1236 rev.diffopt.output_format == DIFF_FORMAT_PATCH))
1237 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY;
1239 /* Always generate a patch */
1240 rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1242 if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
1243 DIFF_OPT_SET(&rev.diffopt, BINARY);
1245 if (rev.show_notes)
1246 init_display_notes(&rev.notes_opt);
1248 if (!use_stdout)
1249 output_directory = set_outdir(prefix, output_directory);
1250 else
1251 setup_pager();
1253 if (output_directory) {
1254 if (use_stdout)
1255 die(_("standard output, or directory, which one?"));
1256 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
1257 die_errno(_("Could not create directory '%s'"),
1258 output_directory);
1261 if (rev.pending.nr == 1) {
1262 if (rev.max_count < 0 && !rev.show_root_diff) {
1264 * This is traditional behaviour of "git format-patch
1265 * origin" that prepares what the origin side still
1266 * does not have.
1268 unsigned char sha1[20];
1269 const char *ref;
1271 rev.pending.objects[0].item->flags |= UNINTERESTING;
1272 add_head_to_pending(&rev);
1273 ref = resolve_ref_unsafe("HEAD", sha1, 1, NULL);
1274 if (ref && !prefixcmp(ref, "refs/heads/"))
1275 branch_name = xstrdup(ref + strlen("refs/heads/"));
1276 else
1277 branch_name = xstrdup(""); /* no branch */
1280 * Otherwise, it is "format-patch -22 HEAD", and/or
1281 * "format-patch --root HEAD". The user wants
1282 * get_revision() to do the usual traversal.
1287 * We cannot move this anywhere earlier because we do want to
1288 * know if --root was given explicitly from the command line.
1290 rev.show_root_diff = 1;
1292 if (cover_letter) {
1294 * NEEDSWORK:randomly pick one positive commit to show
1295 * diffstat; this is often the tip and the command
1296 * happens to do the right thing in most cases, but a
1297 * complex command like "--cover-letter a b c ^bottom"
1298 * picks "c" and shows diffstat between bottom..c
1299 * which may not match what the series represents at
1300 * all and totally broken.
1302 int i;
1303 for (i = 0; i < rev.pending.nr; i++) {
1304 struct object *o = rev.pending.objects[i].item;
1305 if (!(o->flags & UNINTERESTING))
1306 head = (struct commit *)o;
1308 /* There is nothing to show; it is not an error, though. */
1309 if (!head)
1310 return 0;
1311 if (!branch_name)
1312 branch_name = find_branch_name(&rev);
1315 if (ignore_if_in_upstream) {
1316 /* Don't say anything if head and upstream are the same. */
1317 if (rev.pending.nr == 2) {
1318 struct object_array_entry *o = rev.pending.objects;
1319 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1320 return 0;
1322 get_patch_ids(&rev, &ids, prefix);
1325 if (!use_stdout)
1326 realstdout = xfdopen(xdup(1), "w");
1328 if (prepare_revision_walk(&rev))
1329 die(_("revision walk setup failed"));
1330 rev.boundary = 1;
1331 while ((commit = get_revision(&rev)) != NULL) {
1332 if (commit->object.flags & BOUNDARY) {
1333 boundary_count++;
1334 origin = (boundary_count == 1) ? commit : NULL;
1335 continue;
1338 if (ignore_if_in_upstream &&
1339 has_commit_patch_id(commit, &ids))
1340 continue;
1342 nr++;
1343 list = xrealloc(list, nr * sizeof(list[0]));
1344 list[nr - 1] = commit;
1346 total = nr;
1347 if (!keep_subject && auto_number && total > 1)
1348 numbered = 1;
1349 if (numbered)
1350 rev.total = total + start_number - 1;
1351 if (in_reply_to || thread || cover_letter)
1352 rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
1353 if (in_reply_to) {
1354 const char *msgid = clean_message_id(in_reply_to);
1355 string_list_append(rev.ref_message_ids, msgid);
1357 rev.numbered_files = numbered_files;
1358 rev.patch_suffix = fmt_patch_suffix;
1359 if (cover_letter) {
1360 if (thread)
1361 gen_message_id(&rev, "cover");
1362 make_cover_letter(&rev, use_stdout, numbered, numbered_files,
1363 origin, nr, list, head, branch_name, quiet);
1364 total++;
1365 start_number--;
1367 rev.add_signoff = add_signoff;
1368 while (0 <= --nr) {
1369 int shown;
1370 commit = list[nr];
1371 rev.nr = total - nr + (start_number - 1);
1372 /* Make the second and subsequent mails replies to the first */
1373 if (thread) {
1374 /* Have we already had a message ID? */
1375 if (rev.message_id) {
1377 * For deep threading: make every mail
1378 * a reply to the previous one, no
1379 * matter what other options are set.
1381 * For shallow threading:
1383 * Without --cover-letter and
1384 * --in-reply-to, make every mail a
1385 * reply to the one before.
1387 * With --in-reply-to but no
1388 * --cover-letter, make every mail a
1389 * reply to the <reply-to>.
1391 * With --cover-letter, make every
1392 * mail but the cover letter a reply
1393 * to the cover letter. The cover
1394 * letter is a reply to the
1395 * --in-reply-to, if specified.
1397 if (thread == THREAD_SHALLOW
1398 && rev.ref_message_ids->nr > 0
1399 && (!cover_letter || rev.nr > 1))
1400 free(rev.message_id);
1401 else
1402 string_list_append(rev.ref_message_ids,
1403 rev.message_id);
1405 gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
1408 if (!use_stdout && reopen_stdout(numbered_files ? NULL : commit,
1409 &rev, quiet))
1410 die(_("Failed to create output files"));
1411 shown = log_tree_commit(&rev, commit);
1412 free(commit->buffer);
1413 commit->buffer = NULL;
1415 /* We put one extra blank line between formatted
1416 * patches and this flag is used by log-tree code
1417 * to see if it needs to emit a LF before showing
1418 * the log; when using one file per patch, we do
1419 * not want the extra blank line.
1421 if (!use_stdout)
1422 rev.shown_one = 0;
1423 if (shown) {
1424 if (rev.mime_boundary)
1425 printf("\n--%s%s--\n\n\n",
1426 mime_boundary_leader,
1427 rev.mime_boundary);
1428 else
1429 print_signature();
1431 if (!use_stdout)
1432 fclose(stdout);
1434 free(list);
1435 free(branch_name);
1436 string_list_clear(&extra_to, 0);
1437 string_list_clear(&extra_cc, 0);
1438 string_list_clear(&extra_hdr, 0);
1439 if (ignore_if_in_upstream)
1440 free_patch_ids(&ids);
1441 return 0;
1444 static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
1446 unsigned char sha1[20];
1447 if (get_sha1(arg, sha1) == 0) {
1448 struct commit *commit = lookup_commit_reference(sha1);
1449 if (commit) {
1450 commit->object.flags |= flags;
1451 add_pending_object(revs, &commit->object, arg);
1452 return 0;
1455 return -1;
1458 static const char * const cherry_usage[] = {
1459 "git cherry [-v] [<upstream> [<head> [<limit>]]]",
1460 NULL
1463 static void print_commit(char sign, struct commit *commit, int verbose,
1464 int abbrev)
1466 if (!verbose) {
1467 printf("%c %s\n", sign,
1468 find_unique_abbrev(commit->object.sha1, abbrev));
1469 } else {
1470 struct strbuf buf = STRBUF_INIT;
1471 pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
1472 printf("%c %s %s\n", sign,
1473 find_unique_abbrev(commit->object.sha1, abbrev),
1474 buf.buf);
1475 strbuf_release(&buf);
1479 int cmd_cherry(int argc, const char **argv, const char *prefix)
1481 struct rev_info revs;
1482 struct patch_ids ids;
1483 struct commit *commit;
1484 struct commit_list *list = NULL;
1485 struct branch *current_branch;
1486 const char *upstream;
1487 const char *head = "HEAD";
1488 const char *limit = NULL;
1489 int verbose = 0, abbrev = 0;
1491 struct option options[] = {
1492 OPT__ABBREV(&abbrev),
1493 OPT__VERBOSE(&verbose, "be verbose"),
1494 OPT_END()
1497 argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
1499 switch (argc) {
1500 case 3:
1501 limit = argv[2];
1502 /* FALLTHROUGH */
1503 case 2:
1504 head = argv[1];
1505 /* FALLTHROUGH */
1506 case 1:
1507 upstream = argv[0];
1508 break;
1509 default:
1510 current_branch = branch_get(NULL);
1511 if (!current_branch || !current_branch->merge
1512 || !current_branch->merge[0]
1513 || !current_branch->merge[0]->dst) {
1514 fprintf(stderr, _("Could not find a tracked"
1515 " remote branch, please"
1516 " specify <upstream> manually.\n"));
1517 usage_with_options(cherry_usage, options);
1520 upstream = current_branch->merge[0]->dst;
1523 init_revisions(&revs, prefix);
1524 revs.diff = 1;
1525 revs.combine_merges = 0;
1526 revs.ignore_merges = 1;
1527 DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
1529 if (add_pending_commit(head, &revs, 0))
1530 die(_("Unknown commit %s"), head);
1531 if (add_pending_commit(upstream, &revs, UNINTERESTING))
1532 die(_("Unknown commit %s"), upstream);
1534 /* Don't say anything if head and upstream are the same. */
1535 if (revs.pending.nr == 2) {
1536 struct object_array_entry *o = revs.pending.objects;
1537 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1538 return 0;
1541 get_patch_ids(&revs, &ids, prefix);
1543 if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
1544 die(_("Unknown commit %s"), limit);
1546 /* reverse the list of commits */
1547 if (prepare_revision_walk(&revs))
1548 die(_("revision walk setup failed"));
1549 while ((commit = get_revision(&revs)) != NULL) {
1550 /* ignore merges */
1551 if (commit->parents && commit->parents->next)
1552 continue;
1554 commit_list_insert(commit, &list);
1557 while (list) {
1558 char sign = '+';
1560 commit = list->item;
1561 if (has_commit_patch_id(commit, &ids))
1562 sign = '-';
1563 print_commit(sign, commit, verbose, abbrev);
1564 list = list->next;
1567 free_patch_ids(&ids);
1568 return 0;