builtin/log.c

   1 /*
   2  * Builtin "git log" and related commands (show, whatchanged)
   3  *
   4  * (C) Copyright 2006 Linus Torvalds
   5  *               2006 Junio Hamano
   6  */
   7 #define USE_THE_INDEX_COMPATIBILITY_MACROS
   8 #include "cache.h"
   9 #include "config.h"
  10 #include "refs.h"
  11 #include "object-store.h"
  12 #include "color.h"
  13 #include "commit.h"
  14 #include "diff.h"
  15 #include "revision.h"
  16 #include "log-tree.h"
  17 #include "builtin.h"
  18 #include "tag.h"
  19 #include "reflog-walk.h"
  20 #include "patch-ids.h"
  21 #include "run-command.h"
  22 #include "shortlog.h"
  23 #include "remote.h"
  24 #include "string-list.h"
  25 #include "parse-options.h"
  26 #include "line-log.h"
  27 #include "branch.h"
  28 #include "streaming.h"
  29 #include "version.h"
  30 #include "mailmap.h"
  31 #include "gpg-interface.h"
  32 #include "progress.h"
  33 #include "commit-slab.h"
  34 #include "repository.h"
  35 #include "commit-reach.h"
  36 #include "interdiff.h"
  37 #include "range-diff.h"
  38
  39 #define MAIL_DEFAULT_WRAP 72
  40
  41 /* Set a default date-time format for git log ("log.date" config variable) */
  42 static const char *default_date_mode = NULL;
  43
  44 static int default_abbrev_commit;
  45 static int default_show_root = 1;
  46 static int default_follow;
  47 static int default_show_signature;
  48 static int decoration_style;
  49 static int decoration_given;
  50 static int use_mailmap_config = 1;
  51 static const char *fmt_patch_subject_prefix = "PATCH";
  52 static const char *fmt_pretty;
  53
  54 static const char * const builtin_log_usage[] = {
  55         N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
  56         N_("git show [<options>] <object>..."),
  57         NULL
  58 };
  59
  60 struct line_opt_callback_data {
  61         struct rev_info *rev;
  62         const char *prefix;
  63         struct string_list args;
  64 };
  65
  66 static int session_is_interactive(void)
  67 {
  68         return isatty(1) || pager_in_use();
  69 }
  70
  71 static int auto_decoration_style(void)
  72 {
  73         return session_is_interactive() ? DECORATE_SHORT_REFS : 0;
  74 }
  75
  76 static int parse_decoration_style(const char *value)
  77 {
  78         switch (git_parse_maybe_bool(value)) {
  79         case 1:
  80                 return DECORATE_SHORT_REFS;
  81         case 0:
  82                 return 0;
  83         default:
  84                 break;
  85         }
  86         if (!strcmp(value, "full"))
  87                 return DECORATE_FULL_REFS;
  88         else if (!strcmp(value, "short"))
  89                 return DECORATE_SHORT_REFS;
  90         else if (!strcmp(value, "auto"))
  91                 return auto_decoration_style();
  92         /*
  93          * Please update _git_log() in git-completion.bash when you
  94          * add new decoration styles.
  95          */
  96         return -1;
  97 }
  98
  99 static int decorate_callback(const struct option *opt, const char *arg, int unset)
 100 {
 101         if (unset)
 102                 decoration_style = 0;
 103         else if (arg)
 104                 decoration_style = parse_decoration_style(arg);
 105         else
 106                 decoration_style = DECORATE_SHORT_REFS;
 107
 108         if (decoration_style < 0)
 109                 die(_("invalid --decorate option: %s"), arg);
 110
 111         decoration_given = 1;
 112
 113         return 0;
 114 }
 115
 116 static int log_line_range_callback(const struct option *option, const char *arg, int unset)
 117 {
 118         struct line_opt_callback_data *data = option->value;
 119
 120         BUG_ON_OPT_NEG(unset);
 121
 122         if (!arg)
 123                 return -1;
 124
 125         data->rev->line_level_traverse = 1;
 126         string_list_append(&data->args, arg);
 127
 128         return 0;
 129 }
 130
 131 static void init_log_defaults(void)
 132 {
 133         init_grep_defaults(the_repository);
 134         init_diff_ui_defaults();
 135
 136         decoration_style = auto_decoration_style();
 137 }
 138
 139 static void cmd_log_init_defaults(struct rev_info *rev)
 140 {
 141         if (fmt_pretty)
 142                 get_commit_format(fmt_pretty, rev);
 143         if (default_follow)
 144                 rev->diffopt.flags.default_follow_renames = 1;
 145         rev->verbose_header = 1;
 146         rev->diffopt.flags.recursive = 1;
 147         rev->diffopt.stat_width = -1; /* use full terminal width */
 148         rev->diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
 149         rev->abbrev_commit = default_abbrev_commit;
 150         rev->show_root_diff = default_show_root;
 151         rev->subject_prefix = fmt_patch_subject_prefix;
 152         rev->show_signature = default_show_signature;
 153         rev->diffopt.flags.allow_textconv = 1;
 154
 155         if (default_date_mode)
 156                 parse_date_format(default_date_mode, &rev->date_mode);
 157 }
 158
 159 static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 160                          struct rev_info *rev, struct setup_revision_opt *opt)
 161 {
 162         struct userformat_want w;
 163         int quiet = 0, source = 0, mailmap;
 164         static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
 165         static struct string_list decorate_refs_exclude = STRING_LIST_INIT_NODUP;
 166         static struct string_list decorate_refs_include = STRING_LIST_INIT_NODUP;
 167         struct decoration_filter decoration_filter = {&decorate_refs_include,
 168                                                       &decorate_refs_exclude};
 169         static struct revision_sources revision_sources;
 170
 171         const struct option builtin_log_options[] = {
 172                 OPT__QUIET(&quiet, N_("suppress diff output")),
 173                 OPT_BOOL(0, "source", &source, N_("show source")),
 174                 OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
 175                 OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include,
 176                                 N_("pattern"), N_("only decorate refs that match <pattern>")),
 177                 OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude,
 178                                 N_("pattern"), N_("do not decorate refs that match <pattern>")),
 179                 { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"),
 180                   PARSE_OPT_OPTARG, decorate_callback},
 181                 OPT_CALLBACK('L', NULL, &line_cb, "n,m:file",
 182                              N_("Process line range n,m in file, counting from 1"),
 183                              log_line_range_callback),
 184                 OPT_END()
 185         };
 186
 187         line_cb.rev = rev;
 188         line_cb.prefix = prefix;
 189
 190         mailmap = use_mailmap_config;
 191         argc = parse_options(argc, argv, prefix,
 192                              builtin_log_options, builtin_log_usage,
 193                              PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
 194                              PARSE_OPT_KEEP_DASHDASH);
 195
 196         if (quiet)
 197                 rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
 198         argc = setup_revisions(argc, argv, rev, opt);
 199
 200         /* Any arguments at this point are not recognized */
 201         if (argc > 1)
 202                 die(_("unrecognized argument: %s"), argv[1]);
 203
 204         memset(&w, 0, sizeof(w));
 205         userformat_find_requirements(NULL, &w);
 206
 207         if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 208                 rev->show_notes = 1;
 209         if (rev->show_notes)
 210                 init_display_notes(&rev->notes_opt);
 211
 212         if ((rev->diffopt.pickaxe_opts & DIFF_PICKAXE_KINDS_MASK) ||
 213             rev->diffopt.filter || rev->diffopt.flags.follow_renames)
 214                 rev->always_show_header = 0;
 215
 216         if (source || w.source) {
 217                 init_revision_sources(&revision_sources);
 218                 rev->sources = &revision_sources;
 219         }
 220
 221         if (mailmap) {
 222                 rev->mailmap = xcalloc(1, sizeof(struct string_list));
 223                 read_mailmap(rev->mailmap, NULL);
 224         }
 225
 226         if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
 227                 /*
 228                  * "log --pretty=raw" is special; ignore UI oriented
 229                  * configuration variables such as decoration.
 230                  */
 231                 if (!decoration_given)
 232                         decoration_style = 0;
 233                 if (!rev->abbrev_commit_given)
 234                         rev->abbrev_commit = 0;
 235         }
 236
 237         if (decoration_style) {
 238                 rev->show_decorations = 1;
 239                 load_ref_decorations(&decoration_filter, decoration_style);
 240         }
 241
 242         if (rev->line_level_traverse)
 243                 line_log_init(rev, line_cb.prefix, &line_cb.args);
 244
 245         setup_pager();
 246 }
 247
 248 static void cmd_log_init(int argc, const char **argv, const char *prefix,
 249                          struct rev_info *rev, struct setup_revision_opt *opt)
 250 {
 251         cmd_log_init_defaults(rev);
 252         cmd_log_init_finish(argc, argv, prefix, rev, opt);
 253 }
 254
 255 /*
 256  * This gives a rough estimate for how many commits we
 257  * will print out in the list.
 258  */
 259 static int estimate_commit_count(struct commit_list *list)
 260 {
 261         int n = 0;
 262
 263         while (list) {
 264                 struct commit *commit = list->item;
 265                 unsigned int flags = commit->object.flags;
 266                 list = list->next;
 267                 if (!(flags & (TREESAME | UNINTERESTING)))
 268                         n++;
 269         }
 270         return n;
 271 }
 272
 273 static void show_early_header(struct rev_info *rev, const char *stage, int nr)
 274 {
 275         if (rev->shown_one) {
 276                 rev->shown_one = 0;
 277                 if (rev->commit_format != CMIT_FMT_ONELINE)
 278                         putchar(rev->diffopt.line_termination);
 279         }
 280         fprintf(rev->diffopt.file, _("Final output: %d %s\n"), nr, stage);
 281 }
 282
 283 static struct itimerval early_output_timer;
 284
 285 static void log_show_early(struct rev_info *revs, struct commit_list *list)
 286 {
 287         int i = revs->early_output, close_file = revs->diffopt.close_file;
 288         int show_header = 1;
 289
 290         revs->diffopt.close_file = 0;
 291         sort_in_topological_order(&list, revs->sort_order);
 292         while (list && i) {
 293                 struct commit *commit = list->item;
 294                 switch (simplify_commit(revs, commit)) {
 295                 case commit_show:
 296                         if (show_header) {
 297                                 int n = estimate_commit_count(list);
 298                                 show_early_header(revs, "incomplete", n);
 299                                 show_header = 0;
 300                         }
 301                         log_tree_commit(revs, commit);
 302                         i--;
 303                         break;
 304                 case commit_ignore:
 305                         break;
 306                 case commit_error:
 307                         if (close_file)
 308                                 fclose(revs->diffopt.file);
 309                         return;
 310                 }
 311                 list = list->next;
 312         }
 313
 314         /* Did we already get enough commits for the early output? */
 315         if (!i) {
 316                 if (close_file)
 317                         fclose(revs->diffopt.file);
 318                 return;
 319         }
 320
 321         /*
 322          * ..if no, then repeat it twice a second until we
 323          * do.
 324          *
 325          * NOTE! We don't use "it_interval", because if the
 326          * reader isn't listening, we want our output to be
 327          * throttled by the writing, and not have the timer
 328          * trigger every second even if we're blocked on a
 329          * reader!
 330          */
 331         early_output_timer.it_value.tv_sec = 0;
 332         early_output_timer.it_value.tv_usec = 500000;
 333         setitimer(ITIMER_REAL, &early_output_timer, NULL);
 334 }
 335
 336 static void early_output(int signal)
 337 {
 338         show_early_output = log_show_early;
 339 }
 340
 341 static void setup_early_output(void)
 342 {
 343         struct sigaction sa;
 344
 345         /*
 346          * Set up the signal handler, minimally intrusively:
 347          * we only set a single volatile integer word (not
 348          * using sigatomic_t - trying to avoid unnecessary
 349          * system dependencies and headers), and using
 350          * SA_RESTART.
 351          */
 352         memset(&sa, 0, sizeof(sa));
 353         sa.sa_handler = early_output;
 354         sigemptyset(&sa.sa_mask);
 355         sa.sa_flags = SA_RESTART;
 356         sigaction(SIGALRM, &sa, NULL);
 357
 358         /*
 359          * If we can get the whole output in less than a
 360          * tenth of a second, don't even bother doing the
 361          * early-output thing..
 362          *
 363          * This is a one-time-only trigger.
 364          */
 365         early_output_timer.it_value.tv_sec = 0;
 366         early_output_timer.it_value.tv_usec = 100000;
 367         setitimer(ITIMER_REAL, &early_output_timer, NULL);
 368 }
 369
 370 static void finish_early_output(struct rev_info *rev)
 371 {
 372         int n = estimate_commit_count(rev->commits);
 373         signal(SIGALRM, SIG_IGN);
 374         show_early_header(rev, "done", n);
 375 }
 376
 377 static int cmd_log_walk(struct rev_info *rev)
 378 {
 379         struct commit *commit;
 380         int saved_nrl = 0;
 381         int saved_dcctc = 0, close_file = rev->diffopt.close_file;
 382
 383         if (rev->early_output)
 384                 setup_early_output();
 385
 386         if (prepare_revision_walk(rev))
 387                 die(_("revision walk setup failed"));
 388
 389         if (rev->early_output)
 390                 finish_early_output(rev);
 391
 392         /*
 393          * For --check and --exit-code, the exit code is based on CHECK_FAILED
 394          * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
 395          * retain that state information if replacing rev->diffopt in this loop
 396          */
 397         rev->diffopt.close_file = 0;
 398         while ((commit = get_revision(rev)) != NULL) {
 399                 if (!log_tree_commit(rev, commit) && rev->max_count >= 0)
 400                         /*
 401                          * We decremented max_count in get_revision,
 402                          * but we didn't actually show the commit.
 403                          */
 404                         rev->max_count++;
 405                 if (!rev->reflog_info) {
 406                         /*
 407                          * We may show a given commit multiple times when
 408                          * walking the reflogs.
 409                          */
 410                         free_commit_buffer(the_repository->parsed_objects,
 411                                            commit);
 412                         free_commit_list(commit->parents);
 413                         commit->parents = NULL;
 414                 }
 415                 if (saved_nrl < rev->diffopt.needed_rename_limit)
 416                         saved_nrl = rev->diffopt.needed_rename_limit;
 417                 if (rev->diffopt.degraded_cc_to_c)
 418                         saved_dcctc = 1;
 419         }
 420         rev->diffopt.degraded_cc_to_c = saved_dcctc;
 421         rev->diffopt.needed_rename_limit = saved_nrl;
 422         if (close_file)
 423                 fclose(rev->diffopt.file);
 424
 425         if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
 426             rev->diffopt.flags.check_failed) {
 427                 return 02;
 428         }
 429         return diff_result_code(&rev->diffopt, 0);
 430 }
 431
 432 static int git_log_config(const char *var, const char *value, void *cb)
 433 {
 434         const char *slot_name;
 435
 436         if (!strcmp(var, "format.pretty"))
 437                 return git_config_string(&fmt_pretty, var, value);
 438         if (!strcmp(var, "format.subjectprefix"))
 439                 return git_config_string(&fmt_patch_subject_prefix, var, value);
 440         if (!strcmp(var, "log.abbrevcommit")) {
 441                 default_abbrev_commit = git_config_bool(var, value);
 442                 return 0;
 443         }
 444         if (!strcmp(var, "log.date"))
 445                 return git_config_string(&default_date_mode, var, value);
 446         if (!strcmp(var, "log.decorate")) {
 447                 decoration_style = parse_decoration_style(value);
 448                 if (decoration_style < 0)
 449                         decoration_style = 0; /* maybe warn? */
 450                 return 0;
 451         }
 452         if (!strcmp(var, "log.showroot")) {
 453                 default_show_root = git_config_bool(var, value);
 454                 return 0;
 455         }
 456         if (!strcmp(var, "log.follow")) {
 457                 default_follow = git_config_bool(var, value);
 458                 return 0;
 459         }
 460         if (skip_prefix(var, "color.decorate.", &slot_name))
 461                 return parse_decorate_color_config(var, slot_name, value);
 462         if (!strcmp(var, "log.mailmap")) {
 463                 use_mailmap_config = git_config_bool(var, value);
 464                 return 0;
 465         }
 466         if (!strcmp(var, "log.showsignature")) {
 467                 default_show_signature = git_config_bool(var, value);
 468                 return 0;
 469         }
 470
 471         if (grep_config(var, value, cb) < 0)
 472                 return -1;
 473         if (git_gpg_config(var, value, cb) < 0)
 474                 return -1;
 475         return git_diff_ui_config(var, value, cb);
 476 }
 477
 478 int cmd_whatchanged(int argc, const char **argv, const char *prefix)
 479 {
 480         struct rev_info rev;
 481         struct setup_revision_opt opt;
 482
 483         init_log_defaults();
 484         git_config(git_log_config, NULL);
 485
 486         repo_init_revisions(the_repository, &rev, prefix);
 487         rev.diff = 1;
 488         rev.simplify_history = 0;
 489         memset(&opt, 0, sizeof(opt));
 490         opt.def = "HEAD";
 491         opt.revarg_opt = REVARG_COMMITTISH;
 492         cmd_log_init(argc, argv, prefix, &rev, &opt);
 493         if (!rev.diffopt.output_format)
 494                 rev.diffopt.output_format = DIFF_FORMAT_RAW;
 495         return cmd_log_walk(&rev);
 496 }
 497
 498 static void show_tagger(const char *buf, struct rev_info *rev)
 499 {
 500         struct strbuf out = STRBUF_INIT;
 501         struct pretty_print_context pp = {0};
 502
 503         pp.fmt = rev->commit_format;
 504         pp.date_mode = rev->date_mode;
 505         pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding());
 506         fprintf(rev->diffopt.file, "%s", out.buf);
 507         strbuf_release(&out);
 508 }
 509
 510 static int show_blob_object(const struct object_id *oid, struct rev_info *rev, const char *obj_name)
 511 {
 512         struct object_id oidc;
 513         struct object_context obj_context;
 514         char *buf;
 515         unsigned long size;
 516
 517         fflush(rev->diffopt.file);
 518         if (!rev->diffopt.flags.textconv_set_via_cmdline ||
 519             !rev->diffopt.flags.allow_textconv)
 520                 return stream_blob_to_fd(1, oid, NULL, 0);
 521
 522         if (get_oid_with_context(the_repository, obj_name,
 523                                  GET_OID_RECORD_PATH,
 524                                  &oidc, &obj_context))
 525                 die(_("not a valid object name %s"), obj_name);
 526         if (!obj_context.path ||
 527             !textconv_object(the_repository, obj_context.path,
 528                              obj_context.mode, &oidc, 1, &buf, &size)) {
 529                 free(obj_context.path);
 530                 return stream_blob_to_fd(1, oid, NULL, 0);
 531         }
 532
 533         if (!buf)
 534                 die(_("git show %s: bad file"), obj_name);
 535
 536         write_or_die(1, buf, size);
 537         free(obj_context.path);
 538         return 0;
 539 }
 540
 541 static int show_tag_object(const struct object_id *oid, struct rev_info *rev)
 542 {
 543         unsigned long size;
 544         enum object_type type;
 545         char *buf = read_object_file(oid, &type, &size);
 546         int offset = 0;
 547
 548         if (!buf)
 549                 return error(_("could not read object %s"), oid_to_hex(oid));
 550
 551         assert(type == OBJ_TAG);
 552         while (offset < size && buf[offset] != '\n') {
 553                 int new_offset = offset + 1;
 554                 const char *ident;
 555                 while (new_offset < size && buf[new_offset++] != '\n')
 556                         ; /* do nothing */
 557                 if (skip_prefix(buf + offset, "tagger ", &ident))
 558                         show_tagger(ident, rev);
 559                 offset = new_offset;
 560         }
 561
 562         if (offset < size)
 563                 fwrite(buf + offset, size - offset, 1, rev->diffopt.file);
 564         free(buf);
 565         return 0;
 566 }
 567
 568 static int show_tree_object(const struct object_id *oid,
 569                 struct strbuf *base,
 570                 const char *pathname, unsigned mode, int stage, void *context)
 571 {
 572         FILE *file = context;
 573         fprintf(file, "%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
 574         return 0;
 575 }
 576
 577 static void show_setup_revisions_tweak(struct rev_info *rev,
 578                                        struct setup_revision_opt *opt)
 579 {
 580         if (rev->ignore_merges) {
 581                 /* There was no "-m" on the command line */
 582                 rev->ignore_merges = 0;
 583                 if (!rev->first_parent_only && !rev->combine_merges) {
 584                         /* No "--first-parent", "-c", or "--cc" */
 585                         rev->combine_merges = 1;
 586                         rev->dense_combined_merges = 1;
 587                 }
 588         }
 589         if (!rev->diffopt.output_format)
 590                 rev->diffopt.output_format = DIFF_FORMAT_PATCH;
 591 }
 592
 593 int cmd_show(int argc, const char **argv, const char *prefix)
 594 {
 595         struct rev_info rev;
 596         struct object_array_entry *objects;
 597         struct setup_revision_opt opt;
 598         struct pathspec match_all;
 599         int i, count, ret = 0;
 600
 601         init_log_defaults();
 602         git_config(git_log_config, NULL);
 603
 604         memset(&match_all, 0, sizeof(match_all));
 605         repo_init_revisions(the_repository, &rev, prefix);
 606         rev.diff = 1;
 607         rev.always_show_header = 1;
 608         rev.no_walk = REVISION_WALK_NO_WALK_SORTED;
 609         rev.diffopt.stat_width = -1;    /* Scale to real terminal size */
 610
 611         memset(&opt, 0, sizeof(opt));
 612         opt.def = "HEAD";
 613         opt.tweak = show_setup_revisions_tweak;
 614         cmd_log_init(argc, argv, prefix, &rev, &opt);
 615
 616         if (!rev.no_walk)
 617                 return cmd_log_walk(&rev);
 618
 619         count = rev.pending.nr;
 620         objects = rev.pending.objects;
 621         for (i = 0; i < count && !ret; i++) {
 622                 struct object *o = objects[i].item;
 623                 const char *name = objects[i].name;
 624                 switch (o->type) {
 625                 case OBJ_BLOB:
 626                         ret = show_blob_object(&o->oid, &rev, name);
 627                         break;
 628                 case OBJ_TAG: {
 629                         struct tag *t = (struct tag *)o;
 630
 631                         if (rev.shown_one)
 632                                 putchar('\n');
 633                         fprintf(rev.diffopt.file, "%stag %s%s\n",
 634                                         diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
 635                                         t->tag,
 636                                         diff_get_color_opt(&rev.diffopt, DIFF_RESET));
 637                         ret = show_tag_object(&o->oid, &rev);
 638                         rev.shown_one = 1;
 639                         if (ret)
 640                                 break;
 641                         o = parse_object(the_repository, &t->tagged->oid);
 642                         if (!o)
 643                                 ret = error(_("could not read object %s"),
 644                                             oid_to_hex(&t->tagged->oid));
 645                         objects[i].item = o;
 646                         i--;
 647                         break;
 648                 }
 649                 case OBJ_TREE:
 650                         if (rev.shown_one)
 651                                 putchar('\n');
 652                         fprintf(rev.diffopt.file, "%stree %s%s\n\n",
 653                                         diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
 654                                         name,
 655                                         diff_get_color_opt(&rev.diffopt, DIFF_RESET));
 656                         read_tree_recursive(the_repository, (struct tree *)o, "",
 657                                             0, 0, &match_all, show_tree_object,
 658                                             rev.diffopt.file);
 659                         rev.shown_one = 1;
 660                         break;
 661                 case OBJ_COMMIT:
 662                         rev.pending.nr = rev.pending.alloc = 0;
 663                         rev.pending.objects = NULL;
 664                         add_object_array(o, name, &rev.pending);
 665                         ret = cmd_log_walk(&rev);
 666                         break;
 667                 default:
 668                         ret = error(_("unknown type: %d"), o->type);
 669                 }
 670         }
 671         free(objects);
 672         return ret;
 673 }
 674
 675 /*
 676  * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
 677  */
 678 int cmd_log_reflog(int argc, const char **argv, const char *prefix)
 679 {
 680         struct rev_info rev;
 681         struct setup_revision_opt opt;
 682
 683         init_log_defaults();
 684         git_config(git_log_config, NULL);
 685
 686         repo_init_revisions(the_repository, &rev, prefix);
 687         init_reflog_walk(&rev.reflog_info);
 688         rev.verbose_header = 1;
 689         memset(&opt, 0, sizeof(opt));
 690         opt.def = "HEAD";
 691         cmd_log_init_defaults(&rev);
 692         rev.abbrev_commit = 1;
 693         rev.commit_format = CMIT_FMT_ONELINE;
 694         rev.use_terminator = 1;
 695         rev.always_show_header = 1;
 696         cmd_log_init_finish(argc, argv, prefix, &rev, &opt);
 697
 698         return cmd_log_walk(&rev);
 699 }
 700
 701 static void log_setup_revisions_tweak(struct rev_info *rev,
 702                                       struct setup_revision_opt *opt)
 703 {
 704         if (rev->diffopt.flags.default_follow_renames &&
 705             rev->prune_data.nr == 1)
 706                 rev->diffopt.flags.follow_renames = 1;
 707
 708         /* Turn --cc/-c into -p --cc/-c when -p was not given */
 709         if (!rev->diffopt.output_format && rev->combine_merges)
 710                 rev->diffopt.output_format = DIFF_FORMAT_PATCH;
 711
 712         /* Turn -m on when --cc/-c was given */
 713         if (rev->combine_merges)
 714                 rev->ignore_merges = 0;
 715 }
 716
 717 int cmd_log(int argc, const char **argv, const char *prefix)
 718 {
 719         struct rev_info rev;
 720         struct setup_revision_opt opt;
 721
 722         init_log_defaults();
 723         git_config(git_log_config, NULL);
 724
 725         repo_init_revisions(the_repository, &rev, prefix);
 726         rev.always_show_header = 1;
 727         memset(&opt, 0, sizeof(opt));
 728         opt.def = "HEAD";
 729         opt.revarg_opt = REVARG_COMMITTISH;
 730         opt.tweak = log_setup_revisions_tweak;
 731         cmd_log_init(argc, argv, prefix, &rev, &opt);
 732         return cmd_log_walk(&rev);
 733 }
 734
 735 /* format-patch */
 736
 737 static const char *fmt_patch_suffix = ".patch";
 738 static int numbered = 0;
 739 static int auto_number = 1;
 740
 741 static char *default_attach = NULL;
 742
 743 static struct string_list extra_hdr = STRING_LIST_INIT_NODUP;
 744 static struct string_list extra_to = STRING_LIST_INIT_NODUP;
 745 static struct string_list extra_cc = STRING_LIST_INIT_NODUP;
 746
 747 static void add_header(const char *value)
 748 {
 749         struct string_list_item *item;
 750         int len = strlen(value);
 751         while (len && value[len - 1] == '\n')
 752                 len--;
 753
 754         if (!strncasecmp(value, "to: ", 4)) {
 755                 item = string_list_append(&extra_to, value + 4);
 756                 len -= 4;
 757         } else if (!strncasecmp(value, "cc: ", 4)) {
 758                 item = string_list_append(&extra_cc, value + 4);
 759                 len -= 4;
 760         } else {
 761                 item = string_list_append(&extra_hdr, value);
 762         }
 763
 764         item->string[len] = '\0';
 765 }
 766
 767 enum cover_setting {
 768         COVER_UNSET,
 769         COVER_OFF,
 770         COVER_ON,
 771         COVER_AUTO
 772 };
 773
 774 enum thread_level {
 775         THREAD_UNSET,
 776         THREAD_SHALLOW,
 777         THREAD_DEEP
 778 };
 779
 780 static enum thread_level thread;
 781 static int do_signoff;
 782 static int base_auto;
 783 static char *from;
 784 static const char *signature = git_version_string;
 785 static const char *signature_file;
 786 static enum cover_setting config_cover_letter;
 787 static const char *config_output_directory;
 788
 789 static int git_format_config(const char *var, const char *value, void *cb)
 790 {
 791         struct rev_info *rev = cb;
 792
 793         if (!strcmp(var, "format.headers")) {
 794                 if (!value)
 795                         die(_("format.headers without value"));
 796                 add_header(value);
 797                 return 0;
 798         }
 799         if (!strcmp(var, "format.suffix"))
 800                 return git_config_string(&fmt_patch_suffix, var, value);
 801         if (!strcmp(var, "format.to")) {
 802                 if (!value)
 803                         return config_error_nonbool(var);
 804                 string_list_append(&extra_to, value);
 805                 return 0;
 806         }
 807         if (!strcmp(var, "format.cc")) {
 808                 if (!value)
 809                         return config_error_nonbool(var);
 810                 string_list_append(&extra_cc, value);
 811                 return 0;
 812         }
 813         if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
 814             !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) {
 815                 return 0;
 816         }
 817         if (!strcmp(var, "format.numbered")) {
 818                 if (value && !strcasecmp(value, "auto")) {
 819                         auto_number = 1;
 820                         return 0;
 821                 }
 822                 numbered = git_config_bool(var, value);
 823                 auto_number = auto_number && numbered;
 824                 return 0;
 825         }
 826         if (!strcmp(var, "format.attach")) {
 827                 if (value && *value)
 828                         default_attach = xstrdup(value);
 829                 else
 830                         default_attach = xstrdup(git_version_string);
 831                 return 0;
 832         }
 833         if (!strcmp(var, "format.thread")) {
 834                 if (value && !strcasecmp(value, "deep")) {
 835                         thread = THREAD_DEEP;
 836                         return 0;
 837                 }
 838                 if (value && !strcasecmp(value, "shallow")) {
 839                         thread = THREAD_SHALLOW;
 840                         return 0;
 841                 }
 842                 thread = git_config_bool(var, value) ? THREAD_SHALLOW : THREAD_UNSET;
 843                 return 0;
 844         }
 845         if (!strcmp(var, "format.signoff")) {
 846                 do_signoff = git_config_bool(var, value);
 847                 return 0;
 848         }
 849         if (!strcmp(var, "format.signature"))
 850                 return git_config_string(&signature, var, value);
 851         if (!strcmp(var, "format.signaturefile"))
 852                 return git_config_pathname(&signature_file, var, value);
 853         if (!strcmp(var, "format.coverletter")) {
 854                 if (value && !strcasecmp(value, "auto")) {
 855                         config_cover_letter = COVER_AUTO;
 856                         return 0;
 857                 }
 858                 config_cover_letter = git_config_bool(var, value) ? COVER_ON : COVER_OFF;
 859                 return 0;
 860         }
 861         if (!strcmp(var, "format.outputdirectory"))
 862                 return git_config_string(&config_output_directory, var, value);
 863         if (!strcmp(var, "format.useautobase")) {
 864                 base_auto = git_config_bool(var, value);
 865                 return 0;
 866         }
 867         if (!strcmp(var, "format.from")) {
 868                 int b = git_parse_maybe_bool(value);
 869                 free(from);
 870                 if (b < 0)
 871                         from = xstrdup(value);
 872                 else if (b)
 873                         from = xstrdup(git_committer_info(IDENT_NO_DATE));
 874                 else
 875                         from = NULL;
 876                 return 0;
 877         }
 878         if (!strcmp(var, "format.notes")) {
 879                 struct strbuf buf = STRBUF_INIT;
 880                 int b = git_parse_maybe_bool(value);
 881                 if (!b)
 882                         return 0;
 883                 rev->show_notes = 1;
 884                 if (b < 0) {
 885                         strbuf_addstr(&buf, value);
 886                         expand_notes_ref(&buf);
 887                         string_list_append(&rev->notes_opt.extra_notes_refs,
 888                                         strbuf_detach(&buf, NULL));
 889                 } else {
 890                         rev->notes_opt.use_default_notes = 1;
 891                 }
 892                 return 0;
 893         }
 894
 895         return git_log_config(var, value, cb);
 896 }
 897
 898 static const char *output_directory = NULL;
 899 static int outdir_offset;
 900
 901 static int open_next_file(struct commit *commit, const char *subject,
 902                          struct rev_info *rev, int quiet)
 903 {
 904         struct strbuf filename = STRBUF_INIT;
 905         int suffix_len = strlen(rev->patch_suffix) + 1;
 906
 907         if (output_directory) {
 908                 strbuf_addstr(&filename, output_directory);
 909                 if (filename.len >=
 910                     PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len) {
 911                         strbuf_release(&filename);
 912                         return error(_("name of output directory is too long"));
 913                 }
 914                 strbuf_complete(&filename, '/');
 915         }
 916
 917         if (rev->numbered_files)
 918                 strbuf_addf(&filename, "%d", rev->nr);
 919         else if (commit)
 920                 fmt_output_commit(&filename, commit, rev);
 921         else
 922                 fmt_output_subject(&filename, subject, rev);
 923
 924         if (!quiet)
 925                 printf("%s\n", filename.buf + outdir_offset);
 926
 927         if ((rev->diffopt.file = fopen(filename.buf, "w")) == NULL) {
 928                 error_errno(_("cannot open patch file %s"), filename.buf);
 929                 strbuf_release(&filename);
 930                 return -1;
 931         }
 932
 933         strbuf_release(&filename);
 934         return 0;
 935 }
 936
 937 static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids)
 938 {
 939         struct rev_info check_rev;
 940         struct commit *commit, *c1, *c2;
 941         struct object *o1, *o2;
 942         unsigned flags1, flags2;
 943
 944         if (rev->pending.nr != 2)
 945                 die(_("need exactly one range"));
 946
 947         o1 = rev->pending.objects[0].item;
 948         o2 = rev->pending.objects[1].item;
 949         flags1 = o1->flags;
 950         flags2 = o2->flags;
 951         c1 = lookup_commit_reference(the_repository, &o1->oid);
 952         c2 = lookup_commit_reference(the_repository, &o2->oid);
 953
 954         if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
 955                 die(_("not a range"));
 956
 957         init_patch_ids(the_repository, ids);
 958
 959         /* given a range a..b get all patch ids for b..a */
 960         repo_init_revisions(the_repository, &check_rev, rev->prefix);
 961         check_rev.max_parents = 1;
 962         o1->flags ^= UNINTERESTING;
 963         o2->flags ^= UNINTERESTING;
 964         add_pending_object(&check_rev, o1, "o1");
 965         add_pending_object(&check_rev, o2, "o2");
 966         if (prepare_revision_walk(&check_rev))
 967                 die(_("revision walk setup failed"));
 968
 969         while ((commit = get_revision(&check_rev)) != NULL) {
 970                 add_commit_patch_id(commit, ids);
 971         }
 972
 973         /* reset for next revision walk */
 974         clear_commit_marks(c1, SEEN | UNINTERESTING | SHOWN | ADDED);
 975         clear_commit_marks(c2, SEEN | UNINTERESTING | SHOWN | ADDED);
 976         o1->flags = flags1;
 977         o2->flags = flags2;
 978 }
 979
 980 static void gen_message_id(struct rev_info *info, char *base)
 981 {
 982         struct strbuf buf = STRBUF_INIT;
 983         strbuf_addf(&buf, "%s.%"PRItime".git.%s", base,
 984                     (timestamp_t) time(NULL),
 985                     git_committer_info(IDENT_NO_NAME|IDENT_NO_DATE|IDENT_STRICT));
 986         info->message_id = strbuf_detach(&buf, NULL);
 987 }
 988
 989 static void print_signature(FILE *file)
 990 {
 991         if (!signature || !*signature)
 992                 return;
 993
 994         fprintf(file, "-- \n%s", signature);
 995         if (signature[strlen(signature)-1] != '\n')
 996                 putc('\n', file);
 997         putc('\n', file);
 998 }
 999
1000 static void add_branch_description(struct strbuf *buf, const char *branch_name)
1001 {
1002         struct strbuf desc = STRBUF_INIT;
1003         if (!branch_name || !*branch_name)
1004                 return;
1005         read_branch_desc(&desc, branch_name);
1006         if (desc.len) {
1007                 strbuf_addch(buf, '\n');
1008                 strbuf_addbuf(buf, &desc);
1009                 strbuf_addch(buf, '\n');
1010         }
1011         strbuf_release(&desc);
1012 }
1013
1014 static char *find_branch_name(struct rev_info *rev)
1015 {
1016         int i, positive = -1;
1017         struct object_id branch_oid;
1018         const struct object_id *tip_oid;
1019         const char *ref, *v;
1020         char *full_ref, *branch = NULL;
1021
1022         for (i = 0; i < rev->cmdline.nr; i++) {
1023                 if (rev->cmdline.rev[i].flags & UNINTERESTING)
1024                         continue;
1025                 if (positive < 0)
1026                         positive = i;
1027                 else
1028                         return NULL;
1029         }
1030         if (positive < 0)
1031                 return NULL;
1032         ref = rev->cmdline.rev[positive].name;
1033         tip_oid = &rev->cmdline.rev[positive].item->oid;
1034         if (dwim_ref(ref, strlen(ref), &branch_oid, &full_ref) &&
1035             skip_prefix(full_ref, "refs/heads/", &v) &&
1036             oideq(tip_oid, &branch_oid))
1037                 branch = xstrdup(v);
1038         free(full_ref);
1039         return branch;
1040 }
1041
1042 static void show_diffstat(struct rev_info *rev,
1043                           struct commit *origin, struct commit *head)
1044 {
1045         struct diff_options opts;
1046
1047         memcpy(&opts, &rev->diffopt, sizeof(opts));
1048         opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
1049         diff_setup_done(&opts);
1050
1051         diff_tree_oid(get_commit_tree_oid(origin),
1052                       get_commit_tree_oid(head),
1053                       "", &opts);
1054         diffcore_std(&opts);
1055         diff_flush(&opts);
1056
1057         fprintf(rev->diffopt.file, "\n");
1058 }
1059
1060 static void make_cover_letter(struct rev_info *rev, int use_stdout,
1061                               struct commit *origin,
1062                               int nr, struct commit **list,
1063                               const char *branch_name,
1064                               int quiet)
1065 {
1066         const char *committer;
1067         const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
1068         const char *msg;
1069         struct shortlog log;
1070         struct strbuf sb = STRBUF_INIT;
1071         int i;
1072         const char *encoding = "UTF-8";
1073         int need_8bit_cte = 0;
1074         struct pretty_print_context pp = {0};
1075         struct commit *head = list[0];
1076
1077         if (!cmit_fmt_is_mail(rev->commit_format))
1078                 die(_("cover letter needs email format"));
1079
1080         committer = git_committer_info(0);
1081
1082         if (!use_stdout &&
1083             open_next_file(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
1084                 die(_("failed to create cover-letter file"));
1085
1086         log_write_email_headers(rev, head, &pp.after_subject, &need_8bit_cte, 0);
1087
1088         for (i = 0; !need_8bit_cte && i < nr; i++) {
1089                 const char *buf = get_commit_buffer(list[i], NULL);
1090                 if (has_non_ascii(buf))
1091                         need_8bit_cte = 1;
1092                 unuse_commit_buffer(list[i], buf);
1093         }
1094
1095         if (!branch_name)
1096                 branch_name = find_branch_name(rev);
1097
1098         msg = body;
1099         pp.fmt = CMIT_FMT_EMAIL;
1100         pp.date_mode.type = DATE_RFC2822;
1101         pp.rev = rev;
1102         pp.print_email_subject = 1;
1103         pp_user_info(&pp, NULL, &sb, committer, encoding);
1104         pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
1105         pp_remainder(&pp, &msg, &sb, 0);
1106         add_branch_description(&sb, branch_name);
1107         fprintf(rev->diffopt.file, "%s\n", sb.buf);
1108
1109         strbuf_release(&sb);
1110
1111         shortlog_init(&log);
1112         log.wrap_lines = 1;
1113         log.wrap = MAIL_DEFAULT_WRAP;
1114         log.in1 = 2;
1115         log.in2 = 4;
1116         log.file = rev->diffopt.file;
1117         for (i = 0; i < nr; i++)
1118                 shortlog_add_commit(&log, list[i]);
1119
1120         shortlog_output(&log);
1121
1122         /* We can only do diffstat with a unique reference point */
1123         if (origin)
1124                 show_diffstat(rev, origin, head);
1125
1126         if (rev->idiff_oid1) {
1127                 fprintf_ln(rev->diffopt.file, "%s", rev->idiff_title);
1128                 show_interdiff(rev, 0);
1129         }
1130
1131         if (rev->rdiff1) {
1132                 /*
1133                  * Pass minimum required diff-options to range-diff; others
1134                  * can be added later if deemed desirable.
1135                  */
1136                 struct diff_options opts;
1137                 diff_setup(&opts);
1138                 opts.file = rev->diffopt.file;
1139                 opts.use_color = rev->diffopt.use_color;
1140                 diff_setup_done(&opts);
1141                 fprintf_ln(rev->diffopt.file, "%s", rev->rdiff_title);
1142                 show_range_diff(rev->rdiff1, rev->rdiff2,
1143                                 rev->creation_factor, 1, &opts);
1144         }
1145 }
1146
1147 static const char *clean_message_id(const char *msg_id)
1148 {
1149         char ch;
1150         const char *a, *z, *m;
1151
1152         m = msg_id;
1153         while ((ch = *m) && (isspace(ch) || (ch == '<')))
1154                 m++;
1155         a = m;
1156         z = NULL;
1157         while ((ch = *m)) {
1158                 if (!isspace(ch) && (ch != '>'))
1159                         z = m;
1160                 m++;
1161         }
1162         if (!z)
1163                 die(_("insane in-reply-to: %s"), msg_id);
1164         if (++z == m)
1165                 return a;
1166         return xmemdupz(a, z - a);
1167 }
1168
1169 static const char *set_outdir(const char *prefix, const char *output_directory)
1170 {
1171         if (output_directory && is_absolute_path(output_directory))
1172                 return output_directory;
1173
1174         if (!prefix || !*prefix) {
1175                 if (output_directory)
1176                         return output_directory;
1177                 /* The user did not explicitly ask for "./" */
1178                 outdir_offset = 2;
1179                 return "./";
1180         }
1181
1182         outdir_offset = strlen(prefix);
1183         if (!output_directory)
1184                 return prefix;
1185
1186         return prefix_filename(prefix, output_directory);
1187 }
1188
1189 static const char * const builtin_format_patch_usage[] = {
1190         N_("git format-patch [<options>] [<since> | <revision-range>]"),
1191         NULL
1192 };
1193
1194 static int keep_subject = 0;
1195
1196 static int keep_callback(const struct option *opt, const char *arg, int unset)
1197 {
1198         BUG_ON_OPT_NEG(unset);
1199         BUG_ON_OPT_ARG(arg);
1200         ((struct rev_info *)opt->value)->total = -1;
1201         keep_subject = 1;
1202         return 0;
1203 }
1204
1205 static int subject_prefix = 0;
1206
1207 static int subject_prefix_callback(const struct option *opt, const char *arg,
1208                             int unset)
1209 {
1210         BUG_ON_OPT_NEG(unset);
1211         subject_prefix = 1;
1212         ((struct rev_info *)opt->value)->subject_prefix = arg;
1213         return 0;
1214 }
1215
1216 static int rfc_callback(const struct option *opt, const char *arg, int unset)
1217 {
1218         BUG_ON_OPT_NEG(unset);
1219         BUG_ON_OPT_ARG(arg);
1220         return subject_prefix_callback(opt, "RFC PATCH", unset);
1221 }
1222
1223 static int numbered_cmdline_opt = 0;
1224
1225 static int numbered_callback(const struct option *opt, const char *arg,
1226                              int unset)
1227 {
1228         BUG_ON_OPT_ARG(arg);
1229         *(int *)opt->value = numbered_cmdline_opt = unset ? 0 : 1;
1230         if (unset)
1231                 auto_number =  0;
1232         return 0;
1233 }
1234
1235 static int no_numbered_callback(const struct option *opt, const char *arg,
1236                                 int unset)
1237 {
1238         BUG_ON_OPT_NEG(unset);
1239         return numbered_callback(opt, arg, 1);
1240 }
1241
1242 static int output_directory_callback(const struct option *opt, const char *arg,
1243                               int unset)
1244 {
1245         const char **dir = (const char **)opt->value;
1246         BUG_ON_OPT_NEG(unset);
1247         if (*dir)
1248                 die(_("two output directories?"));
1249         *dir = arg;
1250         return 0;
1251 }
1252
1253 static int thread_callback(const struct option *opt, const char *arg, int unset)
1254 {
1255         enum thread_level *thread = (enum thread_level *)opt->value;
1256         if (unset)
1257                 *thread = THREAD_UNSET;
1258         else if (!arg || !strcmp(arg, "shallow"))
1259                 *thread = THREAD_SHALLOW;
1260         else if (!strcmp(arg, "deep"))
1261                 *thread = THREAD_DEEP;
1262         /*
1263          * Please update _git_formatpatch() in git-completion.bash
1264          * when you add new options.
1265          */
1266         else
1267                 return 1;
1268         return 0;
1269 }
1270
1271 static int attach_callback(const struct option *opt, const char *arg, int unset)
1272 {
1273         struct rev_info *rev = (struct rev_info *)opt->value;
1274         if (unset)
1275                 rev->mime_boundary = NULL;
1276         else if (arg)
1277                 rev->mime_boundary = arg;
1278         else
1279                 rev->mime_boundary = git_version_string;
1280         rev->no_inline = unset ? 0 : 1;
1281         return 0;
1282 }
1283
1284 static int inline_callback(const struct option *opt, const char *arg, int unset)
1285 {
1286         struct rev_info *rev = (struct rev_info *)opt->value;
1287         if (unset)
1288                 rev->mime_boundary = NULL;
1289         else if (arg)
1290                 rev->mime_boundary = arg;
1291         else
1292                 rev->mime_boundary = git_version_string;
1293         rev->no_inline = 0;
1294         return 0;
1295 }
1296
1297 static int header_callback(const struct option *opt, const char *arg, int unset)
1298 {
1299         if (unset) {
1300                 string_list_clear(&extra_hdr, 0);
1301                 string_list_clear(&extra_to, 0);
1302                 string_list_clear(&extra_cc, 0);
1303         } else {
1304             add_header(arg);
1305         }
1306         return 0;
1307 }
1308
1309 static int to_callback(const struct option *opt, const char *arg, int unset)
1310 {
1311         if (unset)
1312                 string_list_clear(&extra_to, 0);
1313         else
1314                 string_list_append(&extra_to, arg);
1315         return 0;
1316 }
1317
1318 static int cc_callback(const struct option *opt, const char *arg, int unset)
1319 {
1320         if (unset)
1321                 string_list_clear(&extra_cc, 0);
1322         else
1323                 string_list_append(&extra_cc, arg);
1324         return 0;
1325 }
1326
1327 static int from_callback(const struct option *opt, const char *arg, int unset)
1328 {
1329         char **from = opt->value;
1330
1331         free(*from);
1332
1333         if (unset)
1334                 *from = NULL;
1335         else if (arg)
1336                 *from = xstrdup(arg);
1337         else
1338                 *from = xstrdup(git_committer_info(IDENT_NO_DATE));
1339         return 0;
1340 }
1341
1342 struct base_tree_info {
1343         struct object_id base_commit;
1344         int nr_patch_id, alloc_patch_id;
1345         struct object_id *patch_id;
1346 };
1347
1348 static struct commit *get_base_commit(const char *base_commit,
1349                                       struct commit **list,
1350                                       int total)
1351 {
1352         struct commit *base = NULL;
1353         struct commit **rev;
1354         int i = 0, rev_nr = 0;
1355
1356         if (base_commit && strcmp(base_commit, "auto")) {
1357                 base = lookup_commit_reference_by_name(base_commit);
1358                 if (!base)
1359                         die(_("unknown commit %s"), base_commit);
1360         } else if ((base_commit && !strcmp(base_commit, "auto")) || base_auto) {
1361                 struct branch *curr_branch = branch_get(NULL);
1362                 const char *upstream = branch_get_upstream(curr_branch, NULL);
1363                 if (upstream) {
1364                         struct commit_list *base_list;
1365                         struct commit *commit;
1366                         struct object_id oid;
1367
1368                         if (get_oid(upstream, &oid))
1369                                 die(_("failed to resolve '%s' as a valid ref"), upstream);
1370                         commit = lookup_commit_or_die(&oid, "upstream base");
1371                         base_list = get_merge_bases_many(commit, total, list);
1372                         /* There should be one and only one merge base. */
1373                         if (!base_list || base_list->next)
1374                                 die(_("could not find exact merge base"));
1375                         base = base_list->item;
1376                         free_commit_list(base_list);
1377                 } else {
1378                         die(_("failed to get upstream, if you want to record base commit automatically,\n"
1379                               "please use git branch --set-upstream-to to track a remote branch.\n"
1380                               "Or you could specify base commit by --base=<base-commit-id> manually"));
1381                 }
1382         }
1383
1384         ALLOC_ARRAY(rev, total);
1385         for (i = 0; i < total; i++)
1386                 rev[i] = list[i];
1387
1388         rev_nr = total;
1389         /*
1390          * Get merge base through pair-wise computations
1391          * and store it in rev[0].
1392          */
1393         while (rev_nr > 1) {
1394                 for (i = 0; i < rev_nr / 2; i++) {
1395                         struct commit_list *merge_base;
1396                         merge_base = get_merge_bases(rev[2 * i], rev[2 * i + 1]);
1397                         if (!merge_base || merge_base->next)
1398                                 die(_("failed to find exact merge base"));
1399
1400                         rev[i] = merge_base->item;
1401                 }
1402
1403                 if (rev_nr % 2)
1404                         rev[i] = rev[2 * i];
1405                 rev_nr = DIV_ROUND_UP(rev_nr, 2);
1406         }
1407
1408         if (!in_merge_bases(base, rev[0]))
1409                 die(_("base commit should be the ancestor of revision list"));
1410
1411         for (i = 0; i < total; i++) {
1412                 if (base == list[i])
1413                         die(_("base commit shouldn't be in revision list"));
1414         }
1415
1416         free(rev);
1417         return base;
1418 }
1419
1420 define_commit_slab(commit_base, int);
1421
1422 static void prepare_bases(struct base_tree_info *bases,
1423                           struct commit *base,
1424                           struct commit **list,
1425                           int total)
1426 {
1427         struct commit *commit;
1428         struct rev_info revs;
1429         struct diff_options diffopt;
1430         struct commit_base commit_base;
1431         int i;
1432
1433         if (!base)
1434                 return;
1435
1436         init_commit_base(&commit_base);
1437         repo_diff_setup(the_repository, &diffopt);
1438         diffopt.flags.recursive = 1;
1439         diff_setup_done(&diffopt);
1440
1441         oidcpy(&bases->base_commit, &base->object.oid);
1442
1443         repo_init_revisions(the_repository, &revs, NULL);
1444         revs.max_parents = 1;
1445         revs.topo_order = 1;
1446         for (i = 0; i < total; i++) {
1447                 list[i]->object.flags &= ~UNINTERESTING;
1448                 add_pending_object(&revs, &list[i]->object, "rev_list");
1449                 *commit_base_at(&commit_base, list[i]) = 1;
1450         }
1451         base->object.flags |= UNINTERESTING;
1452         add_pending_object(&revs, &base->object, "base");
1453
1454         if (prepare_revision_walk(&revs))
1455                 die(_("revision walk setup failed"));
1456         /*
1457          * Traverse the commits list, get prerequisite patch ids
1458          * and stuff them in bases structure.
1459          */
1460         while ((commit = get_revision(&revs)) != NULL) {
1461                 struct object_id oid;
1462                 struct object_id *patch_id;
1463                 if (*commit_base_at(&commit_base, commit))
1464                         continue;
1465                 if (commit_patch_id(commit, &diffopt, &oid, 0, 1))
1466                         die(_("cannot get patch id"));
1467                 ALLOC_GROW(bases->patch_id, bases->nr_patch_id + 1, bases->alloc_patch_id);
1468                 patch_id = bases->patch_id + bases->nr_patch_id;
1469                 oidcpy(patch_id, &oid);
1470                 bases->nr_patch_id++;
1471         }
1472         clear_commit_base(&commit_base);
1473 }
1474
1475 static void print_bases(struct base_tree_info *bases, FILE *file)
1476 {
1477         int i;
1478
1479         /* Only do this once, either for the cover or for the first one */
1480         if (is_null_oid(&bases->base_commit))
1481                 return;
1482
1483         /* Show the base commit */
1484         fprintf(file, "\nbase-commit: %s\n", oid_to_hex(&bases->base_commit));
1485
1486         /* Show the prerequisite patches */
1487         for (i = bases->nr_patch_id - 1; i >= 0; i--)
1488                 fprintf(file, "prerequisite-patch-id: %s\n", oid_to_hex(&bases->patch_id[i]));
1489
1490         free(bases->patch_id);
1491         bases->nr_patch_id = 0;
1492         bases->alloc_patch_id = 0;
1493         oidclr(&bases->base_commit);
1494 }
1495
1496 static const char *diff_title(struct strbuf *sb, int reroll_count,
1497                        const char *generic, const char *rerolled)
1498 {
1499         if (reroll_count <= 0)
1500                 strbuf_addstr(sb, generic);
1501         else /* RFC may be v0, so allow -v1 to diff against v0 */
1502                 strbuf_addf(sb, rerolled, reroll_count - 1);
1503         return sb->buf;
1504 }
1505
1506 static void infer_range_diff_ranges(struct strbuf *r1,
1507                                     struct strbuf *r2,
1508                                     const char *prev,
1509                                     struct commit *origin,
1510                                     struct commit *head)
1511 {
1512         const char *head_oid = oid_to_hex(&head->object.oid);
1513
1514         if (!strstr(prev, "..")) {
1515                 strbuf_addf(r1, "%s..%s", head_oid, prev);
1516                 strbuf_addf(r2, "%s..%s", prev, head_oid);
1517         } else if (!origin) {
1518                 die(_("failed to infer range-diff ranges"));
1519         } else {
1520                 strbuf_addstr(r1, prev);
1521                 strbuf_addf(r2, "%s..%s",
1522                             oid_to_hex(&origin->object.oid), head_oid);
1523         }
1524 }
1525
1526 int cmd_format_patch(int argc, const char **argv, const char *prefix)
1527 {
1528         struct commit *commit;
1529         struct commit **list = NULL;
1530         struct rev_info rev;
1531         struct setup_revision_opt s_r_opt;
1532         int nr = 0, total, i;
1533         int use_stdout = 0;
1534         int start_number = -1;
1535         int just_numbers = 0;
1536         int ignore_if_in_upstream = 0;
1537         int cover_letter = -1;
1538         int boundary_count = 0;
1539         int no_binary_diff = 0;
1540         int zero_commit = 0;
1541         struct commit *origin = NULL;
1542         const char *in_reply_to = NULL;
1543         struct patch_ids ids;
1544         struct strbuf buf = STRBUF_INIT;
1545         int use_patch_format = 0;
1546         int quiet = 0;
1547         int reroll_count = -1;
1548         char *branch_name = NULL;
1549         char *base_commit = NULL;
1550         struct base_tree_info bases;
1551         int show_progress = 0;
1552         struct progress *progress = NULL;
1553         struct oid_array idiff_prev = OID_ARRAY_INIT;
1554         struct strbuf idiff_title = STRBUF_INIT;
1555         const char *rdiff_prev = NULL;
1556         struct strbuf rdiff1 = STRBUF_INIT;
1557         struct strbuf rdiff2 = STRBUF_INIT;
1558         struct strbuf rdiff_title = STRBUF_INIT;
1559         int creation_factor = -1;
1560
1561         const struct option builtin_format_patch_options[] = {
1562                 { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
1563                             N_("use [PATCH n/m] even with a single patch"),
1564                             PARSE_OPT_NOARG, numbered_callback },
1565                 { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
1566                             N_("use [PATCH] even with multiple patches"),
1567                             PARSE_OPT_NOARG | PARSE_OPT_NONEG, no_numbered_callback },
1568                 OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")),
1569                 OPT_BOOL(0, "stdout", &use_stdout,
1570                             N_("print patches to standard out")),
1571                 OPT_BOOL(0, "cover-letter", &cover_letter,
1572                             N_("generate a cover letter")),
1573                 OPT_BOOL(0, "numbered-files", &just_numbers,
1574                             N_("use simple number sequence for output file names")),
1575                 OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"),
1576                             N_("use <sfx> instead of '.patch'")),
1577                 OPT_INTEGER(0, "start-number", &start_number,
1578                             N_("start numbering patches at <n> instead of 1")),
1579                 OPT_INTEGER('v', "reroll-count", &reroll_count,
1580                             N_("mark the series as Nth re-roll")),
1581                 { OPTION_CALLBACK, 0, "rfc", &rev, NULL,
1582                             N_("Use [RFC PATCH] instead of [PATCH]"),
1583                             PARSE_OPT_NOARG | PARSE_OPT_NONEG, rfc_callback },
1584                 { OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
1585                             N_("Use [<prefix>] instead of [PATCH]"),
1586                             PARSE_OPT_NONEG, subject_prefix_callback },
1587                 { OPTION_CALLBACK, 'o', "output-directory", &output_directory,
1588                             N_("dir"), N_("store resulting files in <dir>"),
1589                             PARSE_OPT_NONEG, output_directory_callback },
1590                 { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
1591                             N_("don't strip/add [PATCH]"),
1592                             PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
1593                 OPT_BOOL(0, "no-binary", &no_binary_diff,
1594                          N_("don't output binary diffs")),
1595                 OPT_BOOL(0, "zero-commit", &zero_commit,
1596                          N_("output all-zero hash in From header")),
1597                 OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
1598                          N_("don't include a patch matching a commit upstream")),
1599                 OPT_SET_INT_F('p', "no-stat", &use_patch_format,
1600                               N_("show patch format instead of default (patch + stat)"),
1601                               1, PARSE_OPT_NONEG),
1602                 OPT_GROUP(N_("Messaging")),
1603                 { OPTION_CALLBACK, 0, "add-header", NULL, N_("header"),
1604                             N_("add email header"), 0, header_callback },
1605                 { OPTION_CALLBACK, 0, "to", NULL, N_("email"), N_("add To: header"),
1606                             0, to_callback },
1607                 { OPTION_CALLBACK, 0, "cc", NULL, N_("email"), N_("add Cc: header"),
1608                             0, cc_callback },
1609                 { OPTION_CALLBACK, 0, "from", &from, N_("ident"),
1610                             N_("set From address to <ident> (or committer ident if absent)"),
1611                             PARSE_OPT_OPTARG, from_callback },
1612                 OPT_STRING(0, "in-reply-to", &in_reply_to, N_("message-id"),
1613                             N_("make first mail a reply to <message-id>")),
1614                 { OPTION_CALLBACK, 0, "attach", &rev, N_("boundary"),
1615                             N_("attach the patch"), PARSE_OPT_OPTARG,
1616                             attach_callback },
1617                 { OPTION_CALLBACK, 0, "inline", &rev, N_("boundary"),
1618                             N_("inline the patch"),
1619                             PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
1620                             inline_callback },
1621                 { OPTION_CALLBACK, 0, "thread", &thread, N_("style"),
1622                             N_("enable message threading, styles: shallow, deep"),
1623                             PARSE_OPT_OPTARG, thread_callback },
1624                 OPT_STRING(0, "signature", &signature, N_("signature"),
1625                             N_("add a signature")),
1626                 OPT_STRING(0, "base", &base_commit, N_("base-commit"),
1627                            N_("add prerequisite tree info to the patch series")),
1628                 OPT_FILENAME(0, "signature-file", &signature_file,
1629                                 N_("add a signature from a file")),
1630                 OPT__QUIET(&quiet, N_("don't print the patch filenames")),
1631                 OPT_BOOL(0, "progress", &show_progress,
1632                          N_("show progress while generating patches")),
1633                 OPT_CALLBACK(0, "interdiff", &idiff_prev, N_("rev"),
1634                              N_("show changes against <rev> in cover letter or single patch"),
1635                              parse_opt_object_name),
1636                 OPT_STRING(0, "range-diff", &rdiff_prev, N_("refspec"),
1637                            N_("show changes against <refspec> in cover letter or single patch")),
1638                 OPT_INTEGER(0, "creation-factor", &creation_factor,
1639                             N_("percentage by which creation is weighted")),
1640                 OPT_END()
1641         };
1642
1643         extra_hdr.strdup_strings = 1;
1644         extra_to.strdup_strings = 1;
1645         extra_cc.strdup_strings = 1;
1646         init_log_defaults();
1647         repo_init_revisions(the_repository, &rev, prefix);
1648         git_config(git_format_config, &rev);
1649         rev.commit_format = CMIT_FMT_EMAIL;
1650         rev.expand_tabs_in_log_default = 0;
1651         rev.verbose_header = 1;
1652         rev.diff = 1;
1653         rev.max_parents = 1;
1654         rev.diffopt.flags.recursive = 1;
1655         rev.subject_prefix = fmt_patch_subject_prefix;
1656         memset(&s_r_opt, 0, sizeof(s_r_opt));
1657         s_r_opt.def = "HEAD";
1658         s_r_opt.revarg_opt = REVARG_COMMITTISH;
1659
1660         if (default_attach) {
1661                 rev.mime_boundary = default_attach;
1662                 rev.no_inline = 1;
1663         }
1664
1665         /*
1666          * Parse the arguments before setup_revisions(), or something
1667          * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1668          * possibly a valid SHA1.
1669          */
1670         argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
1671                              builtin_format_patch_usage,
1672                              PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
1673                              PARSE_OPT_KEEP_DASHDASH);
1674
1675         if (0 < reroll_count) {
1676                 struct strbuf sprefix = STRBUF_INIT;
1677                 strbuf_addf(&sprefix, "%s v%d",
1678                             rev.subject_prefix, reroll_count);
1679                 rev.reroll_count = reroll_count;
1680                 rev.subject_prefix = strbuf_detach(&sprefix, NULL);
1681         }
1682
1683         for (i = 0; i < extra_hdr.nr; i++) {
1684                 strbuf_addstr(&buf, extra_hdr.items[i].string);
1685                 strbuf_addch(&buf, '\n');
1686         }
1687
1688         if (extra_to.nr)
1689                 strbuf_addstr(&buf, "To: ");
1690         for (i = 0; i < extra_to.nr; i++) {
1691                 if (i)
1692                         strbuf_addstr(&buf, "    ");
1693                 strbuf_addstr(&buf, extra_to.items[i].string);
1694                 if (i + 1 < extra_to.nr)
1695                         strbuf_addch(&buf, ',');
1696                 strbuf_addch(&buf, '\n');
1697         }
1698
1699         if (extra_cc.nr)
1700                 strbuf_addstr(&buf, "Cc: ");
1701         for (i = 0; i < extra_cc.nr; i++) {
1702                 if (i)
1703                         strbuf_addstr(&buf, "    ");
1704                 strbuf_addstr(&buf, extra_cc.items[i].string);
1705                 if (i + 1 < extra_cc.nr)
1706                         strbuf_addch(&buf, ',');
1707                 strbuf_addch(&buf, '\n');
1708         }
1709
1710         rev.extra_headers = strbuf_detach(&buf, NULL);
1711
1712         if (from) {
1713                 if (split_ident_line(&rev.from_ident, from, strlen(from)))
1714                         die(_("invalid ident line: %s"), from);
1715         }
1716
1717         if (start_number < 0)
1718                 start_number = 1;
1719
1720         /*
1721          * If numbered is set solely due to format.numbered in config,
1722          * and it would conflict with --keep-subject (-k) from the
1723          * command line, reset "numbered".
1724          */
1725         if (numbered && keep_subject && !numbered_cmdline_opt)
1726                 numbered = 0;
1727
1728         if (numbered && keep_subject)
1729                 die(_("-n and -k are mutually exclusive"));
1730         if (keep_subject && subject_prefix)
1731                 die(_("--subject-prefix/--rfc and -k are mutually exclusive"));
1732         rev.preserve_subject = keep_subject;
1733
1734         argc = setup_revisions(argc, argv, &rev, &s_r_opt);
1735         if (argc > 1)
1736                 die(_("unrecognized argument: %s"), argv[1]);
1737
1738         if (rev.diffopt.output_format & DIFF_FORMAT_NAME)
1739                 die(_("--name-only does not make sense"));
1740         if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)
1741                 die(_("--name-status does not make sense"));
1742         if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
1743                 die(_("--check does not make sense"));
1744
1745         if (!use_patch_format &&
1746                 (!rev.diffopt.output_format ||
1747                  rev.diffopt.output_format == DIFF_FORMAT_PATCH))
1748                 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY;
1749         if (!rev.diffopt.stat_width)
1750                 rev.diffopt.stat_width = MAIL_DEFAULT_WRAP;
1751
1752         /* Always generate a patch */
1753         rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1754
1755         rev.zero_commit = zero_commit;
1756
1757         if (!rev.diffopt.flags.text && !no_binary_diff)
1758                 rev.diffopt.flags.binary = 1;
1759
1760         if (rev.show_notes)
1761                 init_display_notes(&rev.notes_opt);
1762
1763         if (!output_directory && !use_stdout)
1764                 output_directory = config_output_directory;
1765
1766         if (!use_stdout)
1767                 output_directory = set_outdir(prefix, output_directory);
1768         else
1769                 setup_pager();
1770
1771         if (output_directory) {
1772                 if (rev.diffopt.use_color != GIT_COLOR_ALWAYS)
1773                         rev.diffopt.use_color = GIT_COLOR_NEVER;
1774                 if (use_stdout)
1775                         die(_("standard output, or directory, which one?"));
1776                 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
1777                         die_errno(_("could not create directory '%s'"),
1778                                   output_directory);
1779         }
1780
1781         if (rev.pending.nr == 1) {
1782                 int check_head = 0;
1783
1784                 if (rev.max_count < 0 && !rev.show_root_diff) {
1785                         /*
1786                          * This is traditional behaviour of "git format-patch
1787                          * origin" that prepares what the origin side still
1788                          * does not have.
1789                          */
1790                         rev.pending.objects[0].item->flags |= UNINTERESTING;
1791                         add_head_to_pending(&rev);
1792                         check_head = 1;
1793                 }
1794                 /*
1795                  * Otherwise, it is "format-patch -22 HEAD", and/or
1796                  * "format-patch --root HEAD".  The user wants
1797                  * get_revision() to do the usual traversal.
1798                  */
1799
1800                 if (!strcmp(rev.pending.objects[0].name, "HEAD"))
1801                         check_head = 1;
1802
1803                 if (check_head) {
1804                         const char *ref, *v;
1805                         ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
1806                                                  NULL, NULL);
1807                         if (ref && skip_prefix(ref, "refs/heads/", &v))
1808                                 branch_name = xstrdup(v);
1809                         else
1810                                 branch_name = xstrdup(""); /* no branch */
1811                 }
1812         }
1813
1814         /*
1815          * We cannot move this anywhere earlier because we do want to
1816          * know if --root was given explicitly from the command line.
1817          */
1818         rev.show_root_diff = 1;
1819
1820         if (ignore_if_in_upstream) {
1821                 /* Don't say anything if head and upstream are the same. */
1822                 if (rev.pending.nr == 2) {
1823                         struct object_array_entry *o = rev.pending.objects;
1824                         if (oideq(&o[0].item->oid, &o[1].item->oid))
1825                                 goto done;
1826                 }
1827                 get_patch_ids(&rev, &ids);
1828         }
1829
1830         if (prepare_revision_walk(&rev))
1831                 die(_("revision walk setup failed"));
1832         rev.boundary = 1;
1833         while ((commit = get_revision(&rev)) != NULL) {
1834                 if (commit->object.flags & BOUNDARY) {
1835                         boundary_count++;
1836                         origin = (boundary_count == 1) ? commit : NULL;
1837                         continue;
1838                 }
1839
1840                 if (ignore_if_in_upstream && has_commit_patch_id(commit, &ids))
1841                         continue;
1842
1843                 nr++;
1844                 REALLOC_ARRAY(list, nr);
1845                 list[nr - 1] = commit;
1846         }
1847         if (nr == 0)
1848                 /* nothing to do */
1849                 goto done;
1850         total = nr;
1851         if (cover_letter == -1) {
1852                 if (config_cover_letter == COVER_AUTO)
1853                         cover_letter = (total > 1);
1854                 else
1855                         cover_letter = (config_cover_letter == COVER_ON);
1856         }
1857         if (!keep_subject && auto_number && (total > 1 || cover_letter))
1858                 numbered = 1;
1859         if (numbered)
1860                 rev.total = total + start_number - 1;
1861
1862         if (idiff_prev.nr) {
1863                 if (!cover_letter && total != 1)
1864                         die(_("--interdiff requires --cover-letter or single patch"));
1865                 rev.idiff_oid1 = &idiff_prev.oid[idiff_prev.nr - 1];
1866                 rev.idiff_oid2 = get_commit_tree_oid(list[0]);
1867                 rev.idiff_title = diff_title(&idiff_title, reroll_count,
1868                                              _("Interdiff:"),
1869                                              _("Interdiff against v%d:"));
1870         }
1871
1872         if (creation_factor < 0)
1873                 creation_factor = RANGE_DIFF_CREATION_FACTOR_DEFAULT;
1874         else if (!rdiff_prev)
1875                 die(_("--creation-factor requires --range-diff"));
1876
1877         if (rdiff_prev) {
1878                 if (!cover_letter && total != 1)
1879                         die(_("--range-diff requires --cover-letter or single patch"));
1880
1881                 infer_range_diff_ranges(&rdiff1, &rdiff2, rdiff_prev,
1882                                         origin, list[0]);
1883                 rev.rdiff1 = rdiff1.buf;
1884                 rev.rdiff2 = rdiff2.buf;
1885                 rev.creation_factor = creation_factor;
1886                 rev.rdiff_title = diff_title(&rdiff_title, reroll_count,
1887                                              _("Range-diff:"),
1888                                              _("Range-diff against v%d:"));
1889         }
1890
1891         if (!signature) {
1892                 ; /* --no-signature inhibits all signatures */
1893         } else if (signature && signature != git_version_string) {
1894                 ; /* non-default signature already set */
1895         } else if (signature_file) {
1896                 struct strbuf buf = STRBUF_INIT;
1897
1898                 if (strbuf_read_file(&buf, signature_file, 128) < 0)
1899                         die_errno(_("unable to read signature file '%s'"), signature_file);
1900                 signature = strbuf_detach(&buf, NULL);
1901         }
1902
1903         memset(&bases, 0, sizeof(bases));
1904         if (base_commit || base_auto) {
1905                 struct commit *base = get_base_commit(base_commit, list, nr);
1906                 reset_revision_walk();
1907                 clear_object_flags(UNINTERESTING);
1908                 prepare_bases(&bases, base, list, nr);
1909         }
1910
1911         if (in_reply_to || thread || cover_letter)
1912                 rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
1913         if (in_reply_to) {
1914                 const char *msgid = clean_message_id(in_reply_to);
1915                 string_list_append(rev.ref_message_ids, msgid);
1916         }
1917         rev.numbered_files = just_numbers;
1918         rev.patch_suffix = fmt_patch_suffix;
1919         if (cover_letter) {
1920                 if (thread)
1921                         gen_message_id(&rev, "cover");
1922                 make_cover_letter(&rev, use_stdout,
1923                                   origin, nr, list, branch_name, quiet);
1924                 print_bases(&bases, rev.diffopt.file);
1925                 print_signature(rev.diffopt.file);
1926                 total++;
1927                 start_number--;
1928                 /* interdiff/range-diff in cover-letter; omit from patches */
1929                 rev.idiff_oid1 = NULL;
1930                 rev.rdiff1 = NULL;
1931         }
1932         rev.add_signoff = do_signoff;
1933
1934         if (show_progress)
1935                 progress = start_delayed_progress(_("Generating patches"), total);
1936         while (0 <= --nr) {
1937                 int shown;
1938                 display_progress(progress, total - nr);
1939                 commit = list[nr];
1940                 rev.nr = total - nr + (start_number - 1);
1941                 /* Make the second and subsequent mails replies to the first */
1942                 if (thread) {
1943                         /* Have we already had a message ID? */
1944                         if (rev.message_id) {
1945                                 /*
1946                                  * For deep threading: make every mail
1947                                  * a reply to the previous one, no
1948                                  * matter what other options are set.
1949                                  *
1950                                  * For shallow threading:
1951                                  *
1952                                  * Without --cover-letter and
1953                                  * --in-reply-to, make every mail a
1954                                  * reply to the one before.
1955                                  *
1956                                  * With --in-reply-to but no
1957                                  * --cover-letter, make every mail a
1958                                  * reply to the <reply-to>.
1959                                  *
1960                                  * With --cover-letter, make every
1961                                  * mail but the cover letter a reply
1962                                  * to the cover letter.  The cover
1963                                  * letter is a reply to the
1964                                  * --in-reply-to, if specified.
1965                                  */
1966                                 if (thread == THREAD_SHALLOW
1967                                     && rev.ref_message_ids->nr > 0
1968                                     && (!cover_letter || rev.nr > 1))
1969                                         free(rev.message_id);
1970                                 else
1971                                         string_list_append(rev.ref_message_ids,
1972                                                            rev.message_id);
1973                         }
1974                         gen_message_id(&rev, oid_to_hex(&commit->object.oid));
1975                 }
1976
1977                 if (!use_stdout &&
1978                     open_next_file(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
1979                         die(_("failed to create output files"));
1980                 shown = log_tree_commit(&rev, commit);
1981                 free_commit_buffer(the_repository->parsed_objects,
1982                                    commit);
1983
1984                 /* We put one extra blank line between formatted
1985                  * patches and this flag is used by log-tree code
1986                  * to see if it needs to emit a LF before showing
1987                  * the log; when using one file per patch, we do
1988                  * not want the extra blank line.
1989                  */
1990                 if (!use_stdout)
1991                         rev.shown_one = 0;
1992                 if (shown) {
1993                         print_bases(&bases, rev.diffopt.file);
1994                         if (rev.mime_boundary)
1995                                 fprintf(rev.diffopt.file, "\n--%s%s--\n\n\n",
1996                                        mime_boundary_leader,
1997                                        rev.mime_boundary);
1998                         else
1999                                 print_signature(rev.diffopt.file);
2000                 }
2001                 if (!use_stdout)
2002                         fclose(rev.diffopt.file);
2003         }
2004         stop_progress(&progress);
2005         free(list);
2006         free(branch_name);
2007         string_list_clear(&extra_to, 0);
2008         string_list_clear(&extra_cc, 0);
2009         string_list_clear(&extra_hdr, 0);
2010         if (ignore_if_in_upstream)
2011                 free_patch_ids(&ids);
2012
2013 done:
2014         oid_array_clear(&idiff_prev);
2015         strbuf_release(&idiff_title);
2016         strbuf_release(&rdiff1);
2017         strbuf_release(&rdiff2);
2018         strbuf_release(&rdiff_title);
2019         return 0;
2020 }
2021
2022 static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
2023 {
2024         struct object_id oid;
2025         if (get_oid(arg, &oid) == 0) {
2026                 struct commit *commit = lookup_commit_reference(the_repository,
2027                                                                 &oid);
2028                 if (commit) {
2029                         commit->object.flags |= flags;
2030                         add_pending_object(revs, &commit->object, arg);
2031                         return 0;
2032                 }
2033         }
2034         return -1;
2035 }
2036
2037 static const char * const cherry_usage[] = {
2038         N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"),
2039         NULL
2040 };
2041
2042 static void print_commit(char sign, struct commit *commit, int verbose,
2043                          int abbrev, FILE *file)
2044 {
2045         if (!verbose) {
2046                 fprintf(file, "%c %s\n", sign,
2047                        find_unique_abbrev(&commit->object.oid, abbrev));
2048         } else {
2049                 struct strbuf buf = STRBUF_INIT;
2050                 pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
2051                 fprintf(file, "%c %s %s\n", sign,
2052                        find_unique_abbrev(&commit->object.oid, abbrev),
2053                        buf.buf);
2054                 strbuf_release(&buf);
2055         }
2056 }
2057
2058 int cmd_cherry(int argc, const char **argv, const char *prefix)
2059 {
2060         struct rev_info revs;
2061         struct patch_ids ids;
2062         struct commit *commit;
2063         struct commit_list *list = NULL;
2064         struct branch *current_branch;
2065         const char *upstream;
2066         const char *head = "HEAD";
2067         const char *limit = NULL;
2068         int verbose = 0, abbrev = 0;
2069
2070         struct option options[] = {
2071                 OPT__ABBREV(&abbrev),
2072                 OPT__VERBOSE(&verbose, N_("be verbose")),
2073                 OPT_END()
2074         };
2075
2076         argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
2077
2078         switch (argc) {
2079         case 3:
2080                 limit = argv[2];
2081                 /* FALLTHROUGH */
2082         case 2:
2083                 head = argv[1];
2084                 /* FALLTHROUGH */
2085         case 1:
2086                 upstream = argv[0];
2087                 break;
2088         default:
2089                 current_branch = branch_get(NULL);
2090                 upstream = branch_get_upstream(current_branch, NULL);
2091                 if (!upstream) {
2092                         fprintf(stderr, _("Could not find a tracked"
2093                                         " remote branch, please"
2094                                         " specify <upstream> manually.\n"));
2095                         usage_with_options(cherry_usage, options);
2096                 }
2097         }
2098
2099         repo_init_revisions(the_repository, &revs, prefix);
2100         revs.max_parents = 1;
2101
2102         if (add_pending_commit(head, &revs, 0))
2103                 die(_("unknown commit %s"), head);
2104         if (add_pending_commit(upstream, &revs, UNINTERESTING))
2105                 die(_("unknown commit %s"), upstream);
2106
2107         /* Don't say anything if head and upstream are the same. */
2108         if (revs.pending.nr == 2) {
2109                 struct object_array_entry *o = revs.pending.objects;
2110                 if (oideq(&o[0].item->oid, &o[1].item->oid))
2111                         return 0;
2112         }
2113
2114         get_patch_ids(&revs, &ids);
2115
2116         if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
2117                 die(_("unknown commit %s"), limit);
2118
2119         /* reverse the list of commits */
2120         if (prepare_revision_walk(&revs))
2121                 die(_("revision walk setup failed"));
2122         while ((commit = get_revision(&revs)) != NULL) {
2123                 commit_list_insert(commit, &list);
2124         }
2125
2126         while (list) {
2127                 char sign = '+';
2128
2129                 commit = list->item;
2130                 if (has_commit_patch_id(commit, &ids))
2131                         sign = '-';
2132                 print_commit(sign, commit, verbose, abbrev, revs.diffopt.file);
2133                 list = list->next;
2134         }
2135
2136         free_patch_ids(&ids);
2137         return 0;
2138 }