0cdd88971d64651a43f9fdb46235183912e1ad5c
   1/*
   2 * Builtin "git log" and related commands (show, whatchanged)
   3 *
   4 * (C) Copyright 2006 Linus Torvalds
   5 *               2006 Junio Hamano
   6 */
   7#include "cache.h"
   8#include "refs.h"
   9#include "color.h"
  10#include "commit.h"
  11#include "diff.h"
  12#include "revision.h"
  13#include "log-tree.h"
  14#include "builtin.h"
  15#include "tag.h"
  16#include "reflog-walk.h"
  17#include "patch-ids.h"
  18#include "run-command.h"
  19#include "shortlog.h"
  20#include "remote.h"
  21#include "string-list.h"
  22#include "parse-options.h"
  23#include "line-log.h"
  24#include "branch.h"
  25#include "streaming.h"
  26#include "version.h"
  27#include "mailmap.h"
  28#include "gpg-interface.h"
  29
  30/* Set a default date-time format for git log ("log.date" config variable) */
  31static const char *default_date_mode = NULL;
  32
  33static int default_abbrev_commit;
  34static int default_show_root = 1;
  35static int default_follow;
  36static int decoration_style;
  37static int decoration_given;
  38static int use_mailmap_config;
  39static const char *fmt_patch_subject_prefix = "PATCH";
  40static const char *fmt_pretty;
  41
  42static const char * const builtin_log_usage[] = {
  43        N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
  44        N_("git show [<options>] <object>..."),
  45        NULL
  46};
  47
  48struct line_opt_callback_data {
  49        struct rev_info *rev;
  50        const char *prefix;
  51        struct string_list args;
  52};
  53
  54static int parse_decoration_style(const char *var, const char *value)
  55{
  56        switch (git_config_maybe_bool(var, value)) {
  57        case 1:
  58                return DECORATE_SHORT_REFS;
  59        case 0:
  60                return 0;
  61        default:
  62                break;
  63        }
  64        if (!strcmp(value, "full"))
  65                return DECORATE_FULL_REFS;
  66        else if (!strcmp(value, "short"))
  67                return DECORATE_SHORT_REFS;
  68        else if (!strcmp(value, "auto"))
  69                return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS : 0;
  70        return -1;
  71}
  72
  73static int decorate_callback(const struct option *opt, const char *arg, int unset)
  74{
  75        if (unset)
  76                decoration_style = 0;
  77        else if (arg)
  78                decoration_style = parse_decoration_style("command line", arg);
  79        else
  80                decoration_style = DECORATE_SHORT_REFS;
  81
  82        if (decoration_style < 0)
  83                die(_("invalid --decorate option: %s"), arg);
  84
  85        decoration_given = 1;
  86
  87        return 0;
  88}
  89
  90static int log_line_range_callback(const struct option *option, const char *arg, int unset)
  91{
  92        struct line_opt_callback_data *data = option->value;
  93
  94        if (!arg)
  95                return -1;
  96
  97        data->rev->line_level_traverse = 1;
  98        string_list_append(&data->args, arg);
  99
 100        return 0;
 101}
 102
 103static void cmd_log_init_defaults(struct rev_info *rev)
 104{
 105        if (fmt_pretty)
 106                get_commit_format(fmt_pretty, rev);
 107        if (default_follow)
 108                DIFF_OPT_SET(&rev->diffopt, DEFAULT_FOLLOW_RENAMES);
 109        rev->verbose_header = 1;
 110        DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
 111        rev->diffopt.stat_width = -1; /* use full terminal width */
 112        rev->diffopt.stat_graph_width = -1; /* respect statGraphWidth config */
 113        rev->abbrev_commit = default_abbrev_commit;
 114        rev->show_root_diff = default_show_root;
 115        rev->subject_prefix = fmt_patch_subject_prefix;
 116        DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
 117
 118        if (default_date_mode)
 119                parse_date_format(default_date_mode, &rev->date_mode);
 120        rev->diffopt.touched_flags = 0;
 121}
 122
 123static void cmd_log_init_finish(int argc, const char **argv, const char *prefix,
 124                         struct rev_info *rev, struct setup_revision_opt *opt)
 125{
 126        struct userformat_want w;
 127        int quiet = 0, source = 0, mailmap = 0;
 128        static struct line_opt_callback_data line_cb = {NULL, NULL, STRING_LIST_INIT_DUP};
 129
 130        const struct option builtin_log_options[] = {
 131                OPT__QUIET(&quiet, N_("suppress diff output")),
 132                OPT_BOOL(0, "source", &source, N_("show source")),
 133                OPT_BOOL(0, "use-mailmap", &mailmap, N_("Use mail map file")),
 134                { OPTION_CALLBACK, 0, "decorate", NULL, NULL, N_("decorate options"),
 135                  PARSE_OPT_OPTARG, decorate_callback},
 136                OPT_CALLBACK('L', NULL, &line_cb, "n,m:file",
 137                             N_("Process line range n,m in file, counting from 1"),
 138                             log_line_range_callback),
 139                OPT_END()
 140        };
 141
 142        line_cb.rev = rev;
 143        line_cb.prefix = prefix;
 144
 145        mailmap = use_mailmap_config;
 146        argc = parse_options(argc, argv, prefix,
 147                             builtin_log_options, builtin_log_usage,
 148                             PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
 149                             PARSE_OPT_KEEP_DASHDASH);
 150
 151        if (quiet)
 152                rev->diffopt.output_format |= DIFF_FORMAT_NO_OUTPUT;
 153        argc = setup_revisions(argc, argv, rev, opt);
 154
 155        /* Any arguments at this point are not recognized */
 156        if (argc > 1)
 157                die(_("unrecognized argument: %s"), argv[1]);
 158
 159        memset(&w, 0, sizeof(w));
 160        userformat_find_requirements(NULL, &w);
 161
 162        if (!rev->show_notes_given && (!rev->pretty_given || w.notes))
 163                rev->show_notes = 1;
 164        if (rev->show_notes)
 165                init_display_notes(&rev->notes_opt);
 166
 167        if (rev->diffopt.pickaxe || rev->diffopt.filter ||
 168            DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES))
 169                rev->always_show_header = 0;
 170
 171        if (source)
 172                rev->show_source = 1;
 173
 174        if (mailmap) {
 175                rev->mailmap = xcalloc(1, sizeof(struct string_list));
 176                read_mailmap(rev->mailmap, NULL);
 177        }
 178
 179        if (rev->pretty_given && rev->commit_format == CMIT_FMT_RAW) {
 180                /*
 181                 * "log --pretty=raw" is special; ignore UI oriented
 182                 * configuration variables such as decoration.
 183                 */
 184                if (!decoration_given)
 185                        decoration_style = 0;
 186                if (!rev->abbrev_commit_given)
 187                        rev->abbrev_commit = 0;
 188        }
 189
 190        if (decoration_style) {
 191                rev->show_decorations = 1;
 192                load_ref_decorations(decoration_style);
 193        }
 194
 195        if (rev->line_level_traverse)
 196                line_log_init(rev, line_cb.prefix, &line_cb.args);
 197
 198        setup_pager();
 199}
 200
 201static void cmd_log_init(int argc, const char **argv, const char *prefix,
 202                         struct rev_info *rev, struct setup_revision_opt *opt)
 203{
 204        cmd_log_init_defaults(rev);
 205        cmd_log_init_finish(argc, argv, prefix, rev, opt);
 206}
 207
 208/*
 209 * This gives a rough estimate for how many commits we
 210 * will print out in the list.
 211 */
 212static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
 213{
 214        int n = 0;
 215
 216        while (list) {
 217                struct commit *commit = list->item;
 218                unsigned int flags = commit->object.flags;
 219                list = list->next;
 220                if (!(flags & (TREESAME | UNINTERESTING)))
 221                        n++;
 222        }
 223        return n;
 224}
 225
 226static void show_early_header(struct rev_info *rev, const char *stage, int nr)
 227{
 228        if (rev->shown_one) {
 229                rev->shown_one = 0;
 230                if (rev->commit_format != CMIT_FMT_ONELINE)
 231                        putchar(rev->diffopt.line_termination);
 232        }
 233        printf(_("Final output: %d %s\n"), nr, stage);
 234}
 235
 236static struct itimerval early_output_timer;
 237
 238static void log_show_early(struct rev_info *revs, struct commit_list *list)
 239{
 240        int i = revs->early_output;
 241        int show_header = 1;
 242
 243        sort_in_topological_order(&list, revs->sort_order);
 244        while (list && i) {
 245                struct commit *commit = list->item;
 246                switch (simplify_commit(revs, commit)) {
 247                case commit_show:
 248                        if (show_header) {
 249                                int n = estimate_commit_count(revs, list);
 250                                show_early_header(revs, "incomplete", n);
 251                                show_header = 0;
 252                        }
 253                        log_tree_commit(revs, commit);
 254                        i--;
 255                        break;
 256                case commit_ignore:
 257                        break;
 258                case commit_error:
 259                        return;
 260                }
 261                list = list->next;
 262        }
 263
 264        /* Did we already get enough commits for the early output? */
 265        if (!i)
 266                return;
 267
 268        /*
 269         * ..if no, then repeat it twice a second until we
 270         * do.
 271         *
 272         * NOTE! We don't use "it_interval", because if the
 273         * reader isn't listening, we want our output to be
 274         * throttled by the writing, and not have the timer
 275         * trigger every second even if we're blocked on a
 276         * reader!
 277         */
 278        early_output_timer.it_value.tv_sec = 0;
 279        early_output_timer.it_value.tv_usec = 500000;
 280        setitimer(ITIMER_REAL, &early_output_timer, NULL);
 281}
 282
 283static void early_output(int signal)
 284{
 285        show_early_output = log_show_early;
 286}
 287
 288static void setup_early_output(struct rev_info *rev)
 289{
 290        struct sigaction sa;
 291
 292        /*
 293         * Set up the signal handler, minimally intrusively:
 294         * we only set a single volatile integer word (not
 295         * using sigatomic_t - trying to avoid unnecessary
 296         * system dependencies and headers), and using
 297         * SA_RESTART.
 298         */
 299        memset(&sa, 0, sizeof(sa));
 300        sa.sa_handler = early_output;
 301        sigemptyset(&sa.sa_mask);
 302        sa.sa_flags = SA_RESTART;
 303        sigaction(SIGALRM, &sa, NULL);
 304
 305        /*
 306         * If we can get the whole output in less than a
 307         * tenth of a second, don't even bother doing the
 308         * early-output thing..
 309         *
 310         * This is a one-time-only trigger.
 311         */
 312        early_output_timer.it_value.tv_sec = 0;
 313        early_output_timer.it_value.tv_usec = 100000;
 314        setitimer(ITIMER_REAL, &early_output_timer, NULL);
 315}
 316
 317static void finish_early_output(struct rev_info *rev)
 318{
 319        int n = estimate_commit_count(rev, rev->commits);
 320        signal(SIGALRM, SIG_IGN);
 321        show_early_header(rev, "done", n);
 322}
 323
 324static int cmd_log_walk(struct rev_info *rev)
 325{
 326        struct commit *commit;
 327        int saved_nrl = 0;
 328        int saved_dcctc = 0;
 329
 330        if (rev->early_output)
 331                setup_early_output(rev);
 332
 333        if (prepare_revision_walk(rev))
 334                die(_("revision walk setup failed"));
 335
 336        if (rev->early_output)
 337                finish_early_output(rev);
 338
 339        /*
 340         * For --check and --exit-code, the exit code is based on CHECK_FAILED
 341         * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
 342         * retain that state information if replacing rev->diffopt in this loop
 343         */
 344        while ((commit = get_revision(rev)) != NULL) {
 345                if (!log_tree_commit(rev, commit) &&
 346                    rev->max_count >= 0)
 347                        /*
 348                         * We decremented max_count in get_revision,
 349                         * but we didn't actually show the commit.
 350                         */
 351                        rev->max_count++;
 352                if (!rev->reflog_info) {
 353                        /* we allow cycles in reflog ancestry */
 354                        free_commit_buffer(commit);
 355                }
 356                free_commit_list(commit->parents);
 357                commit->parents = NULL;
 358                if (saved_nrl < rev->diffopt.needed_rename_limit)
 359                        saved_nrl = rev->diffopt.needed_rename_limit;
 360                if (rev->diffopt.degraded_cc_to_c)
 361                        saved_dcctc = 1;
 362        }
 363        rev->diffopt.degraded_cc_to_c = saved_dcctc;
 364        rev->diffopt.needed_rename_limit = saved_nrl;
 365
 366        if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
 367            DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
 368                return 02;
 369        }
 370        return diff_result_code(&rev->diffopt, 0);
 371}
 372
 373static int git_log_config(const char *var, const char *value, void *cb)
 374{
 375        const char *slot_name;
 376
 377        if (!strcmp(var, "format.pretty"))
 378                return git_config_string(&fmt_pretty, var, value);
 379        if (!strcmp(var, "format.subjectprefix"))
 380                return git_config_string(&fmt_patch_subject_prefix, var, value);
 381        if (!strcmp(var, "log.abbrevcommit")) {
 382                default_abbrev_commit = git_config_bool(var, value);
 383                return 0;
 384        }
 385        if (!strcmp(var, "log.date"))
 386                return git_config_string(&default_date_mode, var, value);
 387        if (!strcmp(var, "log.decorate")) {
 388                decoration_style = parse_decoration_style(var, value);
 389                if (decoration_style < 0)
 390                        decoration_style = 0; /* maybe warn? */
 391                return 0;
 392        }
 393        if (!strcmp(var, "log.showroot")) {
 394                default_show_root = git_config_bool(var, value);
 395                return 0;
 396        }
 397        if (!strcmp(var, "log.follow")) {
 398                default_follow = git_config_bool(var, value);
 399                return 0;
 400        }
 401        if (skip_prefix(var, "color.decorate.", &slot_name))
 402                return parse_decorate_color_config(var, slot_name, value);
 403        if (!strcmp(var, "log.mailmap")) {
 404                use_mailmap_config = git_config_bool(var, value);
 405                return 0;
 406        }
 407
 408        if (grep_config(var, value, cb) < 0)
 409                return -1;
 410        if (git_gpg_config(var, value, cb) < 0)
 411                return -1;
 412        return git_diff_ui_config(var, value, cb);
 413}
 414
 415int cmd_whatchanged(int argc, const char **argv, const char *prefix)
 416{
 417        struct rev_info rev;
 418        struct setup_revision_opt opt;
 419
 420        init_grep_defaults();
 421        git_config(git_log_config, NULL);
 422
 423        init_revisions(&rev, prefix);
 424        rev.diff = 1;
 425        rev.simplify_history = 0;
 426        memset(&opt, 0, sizeof(opt));
 427        opt.def = "HEAD";
 428        opt.revarg_opt = REVARG_COMMITTISH;
 429        cmd_log_init(argc, argv, prefix, &rev, &opt);
 430        if (!rev.diffopt.output_format)
 431                rev.diffopt.output_format = DIFF_FORMAT_RAW;
 432        return cmd_log_walk(&rev);
 433}
 434
 435static void show_tagger(char *buf, int len, struct rev_info *rev)
 436{
 437        struct strbuf out = STRBUF_INIT;
 438        struct pretty_print_context pp = {0};
 439
 440        pp.fmt = rev->commit_format;
 441        pp.date_mode = rev->date_mode;
 442        pp_user_info(&pp, "Tagger", &out, buf, get_log_output_encoding());
 443        printf("%s", out.buf);
 444        strbuf_release(&out);
 445}
 446
 447static int show_blob_object(const unsigned char *sha1, struct rev_info *rev, const char *obj_name)
 448{
 449        unsigned char sha1c[20];
 450        struct object_context obj_context;
 451        char *buf;
 452        unsigned long size;
 453
 454        fflush(stdout);
 455        if (!DIFF_OPT_TOUCHED(&rev->diffopt, ALLOW_TEXTCONV) ||
 456            !DIFF_OPT_TST(&rev->diffopt, ALLOW_TEXTCONV))
 457                return stream_blob_to_fd(1, sha1, NULL, 0);
 458
 459        if (get_sha1_with_context(obj_name, 0, sha1c, &obj_context))
 460                die(_("Not a valid object name %s"), obj_name);
 461        if (!obj_context.path[0] ||
 462            !textconv_object(obj_context.path, obj_context.mode, sha1c, 1, &buf, &size))
 463                return stream_blob_to_fd(1, sha1, NULL, 0);
 464
 465        if (!buf)
 466                die(_("git show %s: bad file"), obj_name);
 467
 468        write_or_die(1, buf, size);
 469        return 0;
 470}
 471
 472static int show_tag_object(const unsigned char *sha1, struct rev_info *rev)
 473{
 474        unsigned long size;
 475        enum object_type type;
 476        char *buf = read_sha1_file(sha1, &type, &size);
 477        int offset = 0;
 478
 479        if (!buf)
 480                return error(_("Could not read object %s"), sha1_to_hex(sha1));
 481
 482        assert(type == OBJ_TAG);
 483        while (offset < size && buf[offset] != '\n') {
 484                int new_offset = offset + 1;
 485                while (new_offset < size && buf[new_offset++] != '\n')
 486                        ; /* do nothing */
 487                if (starts_with(buf + offset, "tagger "))
 488                        show_tagger(buf + offset + 7,
 489                                    new_offset - offset - 7, rev);
 490                offset = new_offset;
 491        }
 492
 493        if (offset < size)
 494                fwrite(buf + offset, size - offset, 1, stdout);
 495        free(buf);
 496        return 0;
 497}
 498
 499static int show_tree_object(const unsigned char *sha1,
 500                struct strbuf *base,
 501                const char *pathname, unsigned mode, int stage, void *context)
 502{
 503        printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
 504        return 0;
 505}
 506
 507static void show_setup_revisions_tweak(struct rev_info *rev,
 508                                       struct setup_revision_opt *opt)
 509{
 510        if (rev->ignore_merges) {
 511                /* There was no "-m" on the command line */
 512                rev->ignore_merges = 0;
 513                if (!rev->first_parent_only && !rev->combine_merges) {
 514                        /* No "--first-parent", "-c", or "--cc" */
 515                        rev->combine_merges = 1;
 516                        rev->dense_combined_merges = 1;
 517                }
 518        }
 519        if (!rev->diffopt.output_format)
 520                rev->diffopt.output_format = DIFF_FORMAT_PATCH;
 521}
 522
 523int cmd_show(int argc, const char **argv, const char *prefix)
 524{
 525        struct rev_info rev;
 526        struct object_array_entry *objects;
 527        struct setup_revision_opt opt;
 528        struct pathspec match_all;
 529        int i, count, ret = 0;
 530
 531        init_grep_defaults();
 532        git_config(git_log_config, NULL);
 533
 534        memset(&match_all, 0, sizeof(match_all));
 535        init_revisions(&rev, prefix);
 536        rev.diff = 1;
 537        rev.always_show_header = 1;
 538        rev.no_walk = REVISION_WALK_NO_WALK_SORTED;
 539        rev.diffopt.stat_width = -1;    /* Scale to real terminal size */
 540
 541        memset(&opt, 0, sizeof(opt));
 542        opt.def = "HEAD";
 543        opt.tweak = show_setup_revisions_tweak;
 544        cmd_log_init(argc, argv, prefix, &rev, &opt);
 545
 546        if (!rev.no_walk)
 547                return cmd_log_walk(&rev);
 548
 549        count = rev.pending.nr;
 550        objects = rev.pending.objects;
 551        for (i = 0; i < count && !ret; i++) {
 552                struct object *o = objects[i].item;
 553                const char *name = objects[i].name;
 554                switch (o->type) {
 555                case OBJ_BLOB:
 556                        ret = show_blob_object(o->sha1, &rev, name);
 557                        break;
 558                case OBJ_TAG: {
 559                        struct tag *t = (struct tag *)o;
 560
 561                        if (rev.shown_one)
 562                                putchar('\n');
 563                        printf("%stag %s%s\n",
 564                                        diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
 565                                        t->tag,
 566                                        diff_get_color_opt(&rev.diffopt, DIFF_RESET));
 567                        ret = show_tag_object(o->sha1, &rev);
 568                        rev.shown_one = 1;
 569                        if (ret)
 570                                break;
 571                        o = parse_object(t->tagged->sha1);
 572                        if (!o)
 573                                ret = error(_("Could not read object %s"),
 574                                            sha1_to_hex(t->tagged->sha1));
 575                        objects[i].item = o;
 576                        i--;
 577                        break;
 578                }
 579                case OBJ_TREE:
 580                        if (rev.shown_one)
 581                                putchar('\n');
 582                        printf("%stree %s%s\n\n",
 583                                        diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
 584                                        name,
 585                                        diff_get_color_opt(&rev.diffopt, DIFF_RESET));
 586                        read_tree_recursive((struct tree *)o, "", 0, 0, &match_all,
 587                                        show_tree_object, NULL);
 588                        rev.shown_one = 1;
 589                        break;
 590                case OBJ_COMMIT:
 591                        rev.pending.nr = rev.pending.alloc = 0;
 592                        rev.pending.objects = NULL;
 593                        add_object_array(o, name, &rev.pending);
 594                        ret = cmd_log_walk(&rev);
 595                        break;
 596                default:
 597                        ret = error(_("Unknown type: %d"), o->type);
 598                }
 599        }
 600        free(objects);
 601        return ret;
 602}
 603
 604/*
 605 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
 606 */
 607int cmd_log_reflog(int argc, const char **argv, const char *prefix)
 608{
 609        struct rev_info rev;
 610        struct setup_revision_opt opt;
 611
 612        init_grep_defaults();
 613        git_config(git_log_config, NULL);
 614
 615        init_revisions(&rev, prefix);
 616        init_reflog_walk(&rev.reflog_info);
 617        rev.verbose_header = 1;
 618        memset(&opt, 0, sizeof(opt));
 619        opt.def = "HEAD";
 620        cmd_log_init_defaults(&rev);
 621        rev.abbrev_commit = 1;
 622        rev.commit_format = CMIT_FMT_ONELINE;
 623        rev.use_terminator = 1;
 624        rev.always_show_header = 1;
 625        cmd_log_init_finish(argc, argv, prefix, &rev, &opt);
 626
 627        return cmd_log_walk(&rev);
 628}
 629
 630static void log_setup_revisions_tweak(struct rev_info *rev,
 631                                      struct setup_revision_opt *opt)
 632{
 633        if (DIFF_OPT_TST(&rev->diffopt, DEFAULT_FOLLOW_RENAMES) &&
 634            rev->prune_data.nr == 1)
 635                DIFF_OPT_SET(&rev->diffopt, FOLLOW_RENAMES);
 636
 637        /* Turn --cc/-c into -p --cc/-c when -p was not given */
 638        if (!rev->diffopt.output_format && rev->combine_merges)
 639                rev->diffopt.output_format = DIFF_FORMAT_PATCH;
 640
 641        /* Turn -m on when --cc/-c was given */
 642        if (rev->combine_merges)
 643                rev->ignore_merges = 0;
 644}
 645
 646int cmd_log(int argc, const char **argv, const char *prefix)
 647{
 648        struct rev_info rev;
 649        struct setup_revision_opt opt;
 650
 651        init_grep_defaults();
 652        git_config(git_log_config, NULL);
 653
 654        init_revisions(&rev, prefix);
 655        rev.always_show_header = 1;
 656        memset(&opt, 0, sizeof(opt));
 657        opt.def = "HEAD";
 658        opt.revarg_opt = REVARG_COMMITTISH;
 659        opt.tweak = log_setup_revisions_tweak;
 660        cmd_log_init(argc, argv, prefix, &rev, &opt);
 661        return cmd_log_walk(&rev);
 662}
 663
 664/* format-patch */
 665
 666static const char *fmt_patch_suffix = ".patch";
 667static int numbered = 0;
 668static int auto_number = 1;
 669
 670static char *default_attach = NULL;
 671
 672static struct string_list extra_hdr;
 673static struct string_list extra_to;
 674static struct string_list extra_cc;
 675
 676static void add_header(const char *value)
 677{
 678        struct string_list_item *item;
 679        int len = strlen(value);
 680        while (len && value[len - 1] == '\n')
 681                len--;
 682
 683        if (!strncasecmp(value, "to: ", 4)) {
 684                item = string_list_append(&extra_to, value + 4);
 685                len -= 4;
 686        } else if (!strncasecmp(value, "cc: ", 4)) {
 687                item = string_list_append(&extra_cc, value + 4);
 688                len -= 4;
 689        } else {
 690                item = string_list_append(&extra_hdr, value);
 691        }
 692
 693        item->string[len] = '\0';
 694}
 695
 696#define THREAD_SHALLOW 1
 697#define THREAD_DEEP 2
 698static int thread;
 699static int do_signoff;
 700static const char *signature = git_version_string;
 701static const char *signature_file;
 702static int config_cover_letter;
 703
 704enum {
 705        COVER_UNSET,
 706        COVER_OFF,
 707        COVER_ON,
 708        COVER_AUTO
 709};
 710
 711static int git_format_config(const char *var, const char *value, void *cb)
 712{
 713        if (!strcmp(var, "format.headers")) {
 714                if (!value)
 715                        die(_("format.headers without value"));
 716                add_header(value);
 717                return 0;
 718        }
 719        if (!strcmp(var, "format.suffix"))
 720                return git_config_string(&fmt_patch_suffix, var, value);
 721        if (!strcmp(var, "format.to")) {
 722                if (!value)
 723                        return config_error_nonbool(var);
 724                string_list_append(&extra_to, value);
 725                return 0;
 726        }
 727        if (!strcmp(var, "format.cc")) {
 728                if (!value)
 729                        return config_error_nonbool(var);
 730                string_list_append(&extra_cc, value);
 731                return 0;
 732        }
 733        if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff") ||
 734            !strcmp(var, "color.ui") || !strcmp(var, "diff.submodule")) {
 735                return 0;
 736        }
 737        if (!strcmp(var, "format.numbered")) {
 738                if (value && !strcasecmp(value, "auto")) {
 739                        auto_number = 1;
 740                        return 0;
 741                }
 742                numbered = git_config_bool(var, value);
 743                auto_number = auto_number && numbered;
 744                return 0;
 745        }
 746        if (!strcmp(var, "format.attach")) {
 747                if (value && *value)
 748                        default_attach = xstrdup(value);
 749                else
 750                        default_attach = xstrdup(git_version_string);
 751                return 0;
 752        }
 753        if (!strcmp(var, "format.thread")) {
 754                if (value && !strcasecmp(value, "deep")) {
 755                        thread = THREAD_DEEP;
 756                        return 0;
 757                }
 758                if (value && !strcasecmp(value, "shallow")) {
 759                        thread = THREAD_SHALLOW;
 760                        return 0;
 761                }
 762                thread = git_config_bool(var, value) && THREAD_SHALLOW;
 763                return 0;
 764        }
 765        if (!strcmp(var, "format.signoff")) {
 766                do_signoff = git_config_bool(var, value);
 767                return 0;
 768        }
 769        if (!strcmp(var, "format.signature"))
 770                return git_config_string(&signature, var, value);
 771        if (!strcmp(var, "format.signaturefile"))
 772                return git_config_pathname(&signature_file, var, value);
 773        if (!strcmp(var, "format.coverletter")) {
 774                if (value && !strcasecmp(value, "auto")) {
 775                        config_cover_letter = COVER_AUTO;
 776                        return 0;
 777                }
 778                config_cover_letter = git_config_bool(var, value) ? COVER_ON : COVER_OFF;
 779                return 0;
 780        }
 781
 782        return git_log_config(var, value, cb);
 783}
 784
 785static FILE *realstdout = NULL;
 786static const char *output_directory = NULL;
 787static int outdir_offset;
 788
 789static int reopen_stdout(struct commit *commit, const char *subject,
 790                         struct rev_info *rev, int quiet)
 791{
 792        struct strbuf filename = STRBUF_INIT;
 793        int suffix_len = strlen(rev->patch_suffix) + 1;
 794
 795        if (output_directory) {
 796                strbuf_addstr(&filename, output_directory);
 797                if (filename.len >=
 798                    PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len)
 799                        return error(_("name of output directory is too long"));
 800                if (filename.buf[filename.len - 1] != '/')
 801                        strbuf_addch(&filename, '/');
 802        }
 803
 804        if (rev->numbered_files)
 805                strbuf_addf(&filename, "%d", rev->nr);
 806        else if (commit)
 807                fmt_output_commit(&filename, commit, rev);
 808        else
 809                fmt_output_subject(&filename, subject, rev);
 810
 811        if (!quiet)
 812                fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
 813
 814        if (freopen(filename.buf, "w", stdout) == NULL)
 815                return error(_("Cannot open patch file %s"), filename.buf);
 816
 817        strbuf_release(&filename);
 818        return 0;
 819}
 820
 821static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids)
 822{
 823        struct rev_info check_rev;
 824        struct commit *commit, *c1, *c2;
 825        struct object *o1, *o2;
 826        unsigned flags1, flags2;
 827
 828        if (rev->pending.nr != 2)
 829                die(_("Need exactly one range."));
 830
 831        o1 = rev->pending.objects[0].item;
 832        o2 = rev->pending.objects[1].item;
 833        flags1 = o1->flags;
 834        flags2 = o2->flags;
 835        c1 = lookup_commit_reference(o1->sha1);
 836        c2 = lookup_commit_reference(o2->sha1);
 837
 838        if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
 839                die(_("Not a range."));
 840
 841        init_patch_ids(ids);
 842
 843        /* given a range a..b get all patch ids for b..a */
 844        init_revisions(&check_rev, rev->prefix);
 845        check_rev.max_parents = 1;
 846        o1->flags ^= UNINTERESTING;
 847        o2->flags ^= UNINTERESTING;
 848        add_pending_object(&check_rev, o1, "o1");
 849        add_pending_object(&check_rev, o2, "o2");
 850        if (prepare_revision_walk(&check_rev))
 851                die(_("revision walk setup failed"));
 852
 853        while ((commit = get_revision(&check_rev)) != NULL) {
 854                add_commit_patch_id(commit, ids);
 855        }
 856
 857        /* reset for next revision walk */
 858        clear_commit_marks(c1, SEEN | UNINTERESTING | SHOWN | ADDED);
 859        clear_commit_marks(c2, SEEN | UNINTERESTING | SHOWN | ADDED);
 860        o1->flags = flags1;
 861        o2->flags = flags2;
 862}
 863
 864static void gen_message_id(struct rev_info *info, char *base)
 865{
 866        struct strbuf buf = STRBUF_INIT;
 867        strbuf_addf(&buf, "%s.%lu.git.%s", base,
 868                    (unsigned long) time(NULL),
 869                    git_committer_info(IDENT_NO_NAME|IDENT_NO_DATE|IDENT_STRICT));
 870        info->message_id = strbuf_detach(&buf, NULL);
 871}
 872
 873static void print_signature(void)
 874{
 875        if (!signature || !*signature)
 876                return;
 877
 878        printf("-- \n%s", signature);
 879        if (signature[strlen(signature)-1] != '\n')
 880                putchar('\n');
 881        putchar('\n');
 882}
 883
 884static void add_branch_description(struct strbuf *buf, const char *branch_name)
 885{
 886        struct strbuf desc = STRBUF_INIT;
 887        if (!branch_name || !*branch_name)
 888                return;
 889        read_branch_desc(&desc, branch_name);
 890        if (desc.len) {
 891                strbuf_addch(buf, '\n');
 892                strbuf_addbuf(buf, &desc);
 893                strbuf_addch(buf, '\n');
 894        }
 895        strbuf_release(&desc);
 896}
 897
 898static char *find_branch_name(struct rev_info *rev)
 899{
 900        int i, positive = -1;
 901        unsigned char branch_sha1[20];
 902        const unsigned char *tip_sha1;
 903        const char *ref, *v;
 904        char *full_ref, *branch = NULL;
 905
 906        for (i = 0; i < rev->cmdline.nr; i++) {
 907                if (rev->cmdline.rev[i].flags & UNINTERESTING)
 908                        continue;
 909                if (positive < 0)
 910                        positive = i;
 911                else
 912                        return NULL;
 913        }
 914        if (positive < 0)
 915                return NULL;
 916        ref = rev->cmdline.rev[positive].name;
 917        tip_sha1 = rev->cmdline.rev[positive].item->sha1;
 918        if (dwim_ref(ref, strlen(ref), branch_sha1, &full_ref) &&
 919            skip_prefix(full_ref, "refs/heads/", &v) &&
 920            !hashcmp(tip_sha1, branch_sha1))
 921                branch = xstrdup(v);
 922        free(full_ref);
 923        return branch;
 924}
 925
 926static void make_cover_letter(struct rev_info *rev, int use_stdout,
 927                              struct commit *origin,
 928                              int nr, struct commit **list,
 929                              const char *branch_name,
 930                              int quiet)
 931{
 932        const char *committer;
 933        const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
 934        const char *msg;
 935        struct shortlog log;
 936        struct strbuf sb = STRBUF_INIT;
 937        int i;
 938        const char *encoding = "UTF-8";
 939        struct diff_options opts;
 940        int need_8bit_cte = 0;
 941        struct pretty_print_context pp = {0};
 942        struct commit *head = list[0];
 943
 944        if (rev->commit_format != CMIT_FMT_EMAIL)
 945                die(_("Cover letter needs email format"));
 946
 947        committer = git_committer_info(0);
 948
 949        if (!use_stdout &&
 950            reopen_stdout(NULL, rev->numbered_files ? NULL : "cover-letter", rev, quiet))
 951                return;
 952
 953        log_write_email_headers(rev, head, &pp.subject, &pp.after_subject,
 954                                &need_8bit_cte);
 955
 956        for (i = 0; !need_8bit_cte && i < nr; i++) {
 957                const char *buf = get_commit_buffer(list[i], NULL);
 958                if (has_non_ascii(buf))
 959                        need_8bit_cte = 1;
 960                unuse_commit_buffer(list[i], buf);
 961        }
 962
 963        if (!branch_name)
 964                branch_name = find_branch_name(rev);
 965
 966        msg = body;
 967        pp.fmt = CMIT_FMT_EMAIL;
 968        pp.date_mode.type = DATE_RFC2822;
 969        pp_user_info(&pp, NULL, &sb, committer, encoding);
 970        pp_title_line(&pp, &msg, &sb, encoding, need_8bit_cte);
 971        pp_remainder(&pp, &msg, &sb, 0);
 972        add_branch_description(&sb, branch_name);
 973        printf("%s\n", sb.buf);
 974
 975        strbuf_release(&sb);
 976
 977        shortlog_init(&log);
 978        log.wrap_lines = 1;
 979        log.wrap = 72;
 980        log.in1 = 2;
 981        log.in2 = 4;
 982        for (i = 0; i < nr; i++)
 983                shortlog_add_commit(&log, list[i]);
 984
 985        shortlog_output(&log);
 986
 987        /*
 988         * We can only do diffstat with a unique reference point
 989         */
 990        if (!origin)
 991                return;
 992
 993        memcpy(&opts, &rev->diffopt, sizeof(opts));
 994        opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
 995
 996        diff_setup_done(&opts);
 997
 998        diff_tree_sha1(origin->tree->object.sha1,
 999                       head->tree->object.sha1,
1000                       "", &opts);
1001        diffcore_std(&opts);
1002        diff_flush(&opts);
1003
1004        printf("\n");
1005        print_signature();
1006}
1007
1008static const char *clean_message_id(const char *msg_id)
1009{
1010        char ch;
1011        const char *a, *z, *m;
1012
1013        m = msg_id;
1014        while ((ch = *m) && (isspace(ch) || (ch == '<')))
1015                m++;
1016        a = m;
1017        z = NULL;
1018        while ((ch = *m)) {
1019                if (!isspace(ch) && (ch != '>'))
1020                        z = m;
1021                m++;
1022        }
1023        if (!z)
1024                die(_("insane in-reply-to: %s"), msg_id);
1025        if (++z == m)
1026                return a;
1027        return xmemdupz(a, z - a);
1028}
1029
1030static const char *set_outdir(const char *prefix, const char *output_directory)
1031{
1032        if (output_directory && is_absolute_path(output_directory))
1033                return output_directory;
1034
1035        if (!prefix || !*prefix) {
1036                if (output_directory)
1037                        return output_directory;
1038                /* The user did not explicitly ask for "./" */
1039                outdir_offset = 2;
1040                return "./";
1041        }
1042
1043        outdir_offset = strlen(prefix);
1044        if (!output_directory)
1045                return prefix;
1046
1047        return xstrdup(prefix_filename(prefix, outdir_offset,
1048                                       output_directory));
1049}
1050
1051static const char * const builtin_format_patch_usage[] = {
1052        N_("git format-patch [<options>] [<since> | <revision-range>]"),
1053        NULL
1054};
1055
1056static int keep_subject = 0;
1057
1058static int keep_callback(const struct option *opt, const char *arg, int unset)
1059{
1060        ((struct rev_info *)opt->value)->total = -1;
1061        keep_subject = 1;
1062        return 0;
1063}
1064
1065static int subject_prefix = 0;
1066
1067static int subject_prefix_callback(const struct option *opt, const char *arg,
1068                            int unset)
1069{
1070        subject_prefix = 1;
1071        ((struct rev_info *)opt->value)->subject_prefix = arg;
1072        return 0;
1073}
1074
1075static int numbered_cmdline_opt = 0;
1076
1077static int numbered_callback(const struct option *opt, const char *arg,
1078                             int unset)
1079{
1080        *(int *)opt->value = numbered_cmdline_opt = unset ? 0 : 1;
1081        if (unset)
1082                auto_number =  0;
1083        return 0;
1084}
1085
1086static int no_numbered_callback(const struct option *opt, const char *arg,
1087                                int unset)
1088{
1089        return numbered_callback(opt, arg, 1);
1090}
1091
1092static int output_directory_callback(const struct option *opt, const char *arg,
1093                              int unset)
1094{
1095        const char **dir = (const char **)opt->value;
1096        if (*dir)
1097                die(_("Two output directories?"));
1098        *dir = arg;
1099        return 0;
1100}
1101
1102static int thread_callback(const struct option *opt, const char *arg, int unset)
1103{
1104        int *thread = (int *)opt->value;
1105        if (unset)
1106                *thread = 0;
1107        else if (!arg || !strcmp(arg, "shallow"))
1108                *thread = THREAD_SHALLOW;
1109        else if (!strcmp(arg, "deep"))
1110                *thread = THREAD_DEEP;
1111        else
1112                return 1;
1113        return 0;
1114}
1115
1116static int attach_callback(const struct option *opt, const char *arg, int unset)
1117{
1118        struct rev_info *rev = (struct rev_info *)opt->value;
1119        if (unset)
1120                rev->mime_boundary = NULL;
1121        else if (arg)
1122                rev->mime_boundary = arg;
1123        else
1124                rev->mime_boundary = git_version_string;
1125        rev->no_inline = unset ? 0 : 1;
1126        return 0;
1127}
1128
1129static int inline_callback(const struct option *opt, const char *arg, int unset)
1130{
1131        struct rev_info *rev = (struct rev_info *)opt->value;
1132        if (unset)
1133                rev->mime_boundary = NULL;
1134        else if (arg)
1135                rev->mime_boundary = arg;
1136        else
1137                rev->mime_boundary = git_version_string;
1138        rev->no_inline = 0;
1139        return 0;
1140}
1141
1142static int header_callback(const struct option *opt, const char *arg, int unset)
1143{
1144        if (unset) {
1145                string_list_clear(&extra_hdr, 0);
1146                string_list_clear(&extra_to, 0);
1147                string_list_clear(&extra_cc, 0);
1148        } else {
1149            add_header(arg);
1150        }
1151        return 0;
1152}
1153
1154static int to_callback(const struct option *opt, const char *arg, int unset)
1155{
1156        if (unset)
1157                string_list_clear(&extra_to, 0);
1158        else
1159                string_list_append(&extra_to, arg);
1160        return 0;
1161}
1162
1163static int cc_callback(const struct option *opt, const char *arg, int unset)
1164{
1165        if (unset)
1166                string_list_clear(&extra_cc, 0);
1167        else
1168                string_list_append(&extra_cc, arg);
1169        return 0;
1170}
1171
1172static int from_callback(const struct option *opt, const char *arg, int unset)
1173{
1174        char **from = opt->value;
1175
1176        free(*from);
1177
1178        if (unset)
1179                *from = NULL;
1180        else if (arg)
1181                *from = xstrdup(arg);
1182        else
1183                *from = xstrdup(git_committer_info(IDENT_NO_DATE));
1184        return 0;
1185}
1186
1187int cmd_format_patch(int argc, const char **argv, const char *prefix)
1188{
1189        struct commit *commit;
1190        struct commit **list = NULL;
1191        struct rev_info rev;
1192        struct setup_revision_opt s_r_opt;
1193        int nr = 0, total, i;
1194        int use_stdout = 0;
1195        int start_number = -1;
1196        int just_numbers = 0;
1197        int ignore_if_in_upstream = 0;
1198        int cover_letter = -1;
1199        int boundary_count = 0;
1200        int no_binary_diff = 0;
1201        struct commit *origin = NULL;
1202        const char *in_reply_to = NULL;
1203        struct patch_ids ids;
1204        struct strbuf buf = STRBUF_INIT;
1205        int use_patch_format = 0;
1206        int quiet = 0;
1207        int reroll_count = -1;
1208        char *branch_name = NULL;
1209        char *from = NULL;
1210        const struct option builtin_format_patch_options[] = {
1211                { OPTION_CALLBACK, 'n', "numbered", &numbered, NULL,
1212                            N_("use [PATCH n/m] even with a single patch"),
1213                            PARSE_OPT_NOARG, numbered_callback },
1214                { OPTION_CALLBACK, 'N', "no-numbered", &numbered, NULL,
1215                            N_("use [PATCH] even with multiple patches"),
1216                            PARSE_OPT_NOARG, no_numbered_callback },
1217                OPT_BOOL('s', "signoff", &do_signoff, N_("add Signed-off-by:")),
1218                OPT_BOOL(0, "stdout", &use_stdout,
1219                            N_("print patches to standard out")),
1220                OPT_BOOL(0, "cover-letter", &cover_letter,
1221                            N_("generate a cover letter")),
1222                OPT_BOOL(0, "numbered-files", &just_numbers,
1223                            N_("use simple number sequence for output file names")),
1224                OPT_STRING(0, "suffix", &fmt_patch_suffix, N_("sfx"),
1225                            N_("use <sfx> instead of '.patch'")),
1226                OPT_INTEGER(0, "start-number", &start_number,
1227                            N_("start numbering patches at <n> instead of 1")),
1228                OPT_INTEGER('v', "reroll-count", &reroll_count,
1229                            N_("mark the series as Nth re-roll")),
1230                { OPTION_CALLBACK, 0, "subject-prefix", &rev, N_("prefix"),
1231                            N_("Use [<prefix>] instead of [PATCH]"),
1232                            PARSE_OPT_NONEG, subject_prefix_callback },
1233                { OPTION_CALLBACK, 'o', "output-directory", &output_directory,
1234                            N_("dir"), N_("store resulting files in <dir>"),
1235                            PARSE_OPT_NONEG, output_directory_callback },
1236                { OPTION_CALLBACK, 'k', "keep-subject", &rev, NULL,
1237                            N_("don't strip/add [PATCH]"),
1238                            PARSE_OPT_NOARG | PARSE_OPT_NONEG, keep_callback },
1239                OPT_BOOL(0, "no-binary", &no_binary_diff,
1240                         N_("don't output binary diffs")),
1241                OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream,
1242                         N_("don't include a patch matching a commit upstream")),
1243                { OPTION_SET_INT, 'p', "no-stat", &use_patch_format, NULL,
1244                  N_("show patch format instead of default (patch + stat)"),
1245                  PARSE_OPT_NONEG | PARSE_OPT_NOARG, NULL, 1},
1246                OPT_GROUP(N_("Messaging")),
1247                { OPTION_CALLBACK, 0, "add-header", NULL, N_("header"),
1248                            N_("add email header"), 0, header_callback },
1249                { OPTION_CALLBACK, 0, "to", NULL, N_("email"), N_("add To: header"),
1250                            0, to_callback },
1251                { OPTION_CALLBACK, 0, "cc", NULL, N_("email"), N_("add Cc: header"),
1252                            0, cc_callback },
1253                { OPTION_CALLBACK, 0, "from", &from, N_("ident"),
1254                            N_("set From address to <ident> (or committer ident if absent)"),
1255                            PARSE_OPT_OPTARG, from_callback },
1256                OPT_STRING(0, "in-reply-to", &in_reply_to, N_("message-id"),
1257                            N_("make first mail a reply to <message-id>")),
1258                { OPTION_CALLBACK, 0, "attach", &rev, N_("boundary"),
1259                            N_("attach the patch"), PARSE_OPT_OPTARG,
1260                            attach_callback },
1261                { OPTION_CALLBACK, 0, "inline", &rev, N_("boundary"),
1262                            N_("inline the patch"),
1263                            PARSE_OPT_OPTARG | PARSE_OPT_NONEG,
1264                            inline_callback },
1265                { OPTION_CALLBACK, 0, "thread", &thread, N_("style"),
1266                            N_("enable message threading, styles: shallow, deep"),
1267                            PARSE_OPT_OPTARG, thread_callback },
1268                OPT_STRING(0, "signature", &signature, N_("signature"),
1269                            N_("add a signature")),
1270                OPT_FILENAME(0, "signature-file", &signature_file,
1271                                N_("add a signature from a file")),
1272                OPT__QUIET(&quiet, N_("don't print the patch filenames")),
1273                OPT_END()
1274        };
1275
1276        extra_hdr.strdup_strings = 1;
1277        extra_to.strdup_strings = 1;
1278        extra_cc.strdup_strings = 1;
1279        init_grep_defaults();
1280        git_config(git_format_config, NULL);
1281        init_revisions(&rev, prefix);
1282        rev.commit_format = CMIT_FMT_EMAIL;
1283        rev.verbose_header = 1;
1284        rev.diff = 1;
1285        rev.max_parents = 1;
1286        DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
1287        rev.subject_prefix = fmt_patch_subject_prefix;
1288        memset(&s_r_opt, 0, sizeof(s_r_opt));
1289        s_r_opt.def = "HEAD";
1290        s_r_opt.revarg_opt = REVARG_COMMITTISH;
1291
1292        if (default_attach) {
1293                rev.mime_boundary = default_attach;
1294                rev.no_inline = 1;
1295        }
1296
1297        /*
1298         * Parse the arguments before setup_revisions(), or something
1299         * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1300         * possibly a valid SHA1.
1301         */
1302        argc = parse_options(argc, argv, prefix, builtin_format_patch_options,
1303                             builtin_format_patch_usage,
1304                             PARSE_OPT_KEEP_ARGV0 | PARSE_OPT_KEEP_UNKNOWN |
1305                             PARSE_OPT_KEEP_DASHDASH);
1306
1307        if (0 < reroll_count) {
1308                struct strbuf sprefix = STRBUF_INIT;
1309                strbuf_addf(&sprefix, "%s v%d",
1310                            rev.subject_prefix, reroll_count);
1311                rev.reroll_count = reroll_count;
1312                rev.subject_prefix = strbuf_detach(&sprefix, NULL);
1313        }
1314
1315        for (i = 0; i < extra_hdr.nr; i++) {
1316                strbuf_addstr(&buf, extra_hdr.items[i].string);
1317                strbuf_addch(&buf, '\n');
1318        }
1319
1320        if (extra_to.nr)
1321                strbuf_addstr(&buf, "To: ");
1322        for (i = 0; i < extra_to.nr; i++) {
1323                if (i)
1324                        strbuf_addstr(&buf, "    ");
1325                strbuf_addstr(&buf, extra_to.items[i].string);
1326                if (i + 1 < extra_to.nr)
1327                        strbuf_addch(&buf, ',');
1328                strbuf_addch(&buf, '\n');
1329        }
1330
1331        if (extra_cc.nr)
1332                strbuf_addstr(&buf, "Cc: ");
1333        for (i = 0; i < extra_cc.nr; i++) {
1334                if (i)
1335                        strbuf_addstr(&buf, "    ");
1336                strbuf_addstr(&buf, extra_cc.items[i].string);
1337                if (i + 1 < extra_cc.nr)
1338                        strbuf_addch(&buf, ',');
1339                strbuf_addch(&buf, '\n');
1340        }
1341
1342        rev.extra_headers = strbuf_detach(&buf, NULL);
1343
1344        if (from) {
1345                if (split_ident_line(&rev.from_ident, from, strlen(from)))
1346                        die(_("invalid ident line: %s"), from);
1347        }
1348
1349        if (start_number < 0)
1350                start_number = 1;
1351
1352        /*
1353         * If numbered is set solely due to format.numbered in config,
1354         * and it would conflict with --keep-subject (-k) from the
1355         * command line, reset "numbered".
1356         */
1357        if (numbered && keep_subject && !numbered_cmdline_opt)
1358                numbered = 0;
1359
1360        if (numbered && keep_subject)
1361                die (_("-n and -k are mutually exclusive."));
1362        if (keep_subject && subject_prefix)
1363                die (_("--subject-prefix and -k are mutually exclusive."));
1364        rev.preserve_subject = keep_subject;
1365
1366        argc = setup_revisions(argc, argv, &rev, &s_r_opt);
1367        if (argc > 1)
1368                die (_("unrecognized argument: %s"), argv[1]);
1369
1370        if (rev.diffopt.output_format & DIFF_FORMAT_NAME)
1371                die(_("--name-only does not make sense"));
1372        if (rev.diffopt.output_format & DIFF_FORMAT_NAME_STATUS)
1373                die(_("--name-status does not make sense"));
1374        if (rev.diffopt.output_format & DIFF_FORMAT_CHECKDIFF)
1375                die(_("--check does not make sense"));
1376
1377        if (!use_patch_format &&
1378                (!rev.diffopt.output_format ||
1379                 rev.diffopt.output_format == DIFF_FORMAT_PATCH))
1380                rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY;
1381
1382        /* Always generate a patch */
1383        rev.diffopt.output_format |= DIFF_FORMAT_PATCH;
1384
1385        if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
1386                DIFF_OPT_SET(&rev.diffopt, BINARY);
1387
1388        if (rev.show_notes)
1389                init_display_notes(&rev.notes_opt);
1390
1391        if (!use_stdout)
1392                output_directory = set_outdir(prefix, output_directory);
1393        else
1394                setup_pager();
1395
1396        if (output_directory) {
1397                if (use_stdout)
1398                        die(_("standard output, or directory, which one?"));
1399                if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
1400                        die_errno(_("Could not create directory '%s'"),
1401                                  output_directory);
1402        }
1403
1404        if (rev.pending.nr == 1) {
1405                int check_head = 0;
1406
1407                if (rev.max_count < 0 && !rev.show_root_diff) {
1408                        /*
1409                         * This is traditional behaviour of "git format-patch
1410                         * origin" that prepares what the origin side still
1411                         * does not have.
1412                         */
1413                        rev.pending.objects[0].item->flags |= UNINTERESTING;
1414                        add_head_to_pending(&rev);
1415                        check_head = 1;
1416                }
1417                /*
1418                 * Otherwise, it is "format-patch -22 HEAD", and/or
1419                 * "format-patch --root HEAD".  The user wants
1420                 * get_revision() to do the usual traversal.
1421                 */
1422
1423                if (!strcmp(rev.pending.objects[0].name, "HEAD"))
1424                        check_head = 1;
1425
1426                if (check_head) {
1427                        unsigned char sha1[20];
1428                        const char *ref, *v;
1429                        ref = resolve_ref_unsafe("HEAD", RESOLVE_REF_READING,
1430                                                 sha1, NULL);
1431                        if (ref && skip_prefix(ref, "refs/heads/", &v))
1432                                branch_name = xstrdup(v);
1433                        else
1434                                branch_name = xstrdup(""); /* no branch */
1435                }
1436        }
1437
1438        /*
1439         * We cannot move this anywhere earlier because we do want to
1440         * know if --root was given explicitly from the command line.
1441         */
1442        rev.show_root_diff = 1;
1443
1444        if (ignore_if_in_upstream) {
1445                /* Don't say anything if head and upstream are the same. */
1446                if (rev.pending.nr == 2) {
1447                        struct object_array_entry *o = rev.pending.objects;
1448                        if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1449                                return 0;
1450                }
1451                get_patch_ids(&rev, &ids);
1452        }
1453
1454        if (!use_stdout)
1455                realstdout = xfdopen(xdup(1), "w");
1456
1457        if (prepare_revision_walk(&rev))
1458                die(_("revision walk setup failed"));
1459        rev.boundary = 1;
1460        while ((commit = get_revision(&rev)) != NULL) {
1461                if (commit->object.flags & BOUNDARY) {
1462                        boundary_count++;
1463                        origin = (boundary_count == 1) ? commit : NULL;
1464                        continue;
1465                }
1466
1467                if (ignore_if_in_upstream &&
1468                                has_commit_patch_id(commit, &ids))
1469                        continue;
1470
1471                nr++;
1472                REALLOC_ARRAY(list, nr);
1473                list[nr - 1] = commit;
1474        }
1475        if (nr == 0)
1476                /* nothing to do */
1477                return 0;
1478        total = nr;
1479        if (!keep_subject && auto_number && total > 1)
1480                numbered = 1;
1481        if (numbered)
1482                rev.total = total + start_number - 1;
1483        if (cover_letter == -1) {
1484                if (config_cover_letter == COVER_AUTO)
1485                        cover_letter = (total > 1);
1486                else
1487                        cover_letter = (config_cover_letter == COVER_ON);
1488        }
1489
1490        if (!signature) {
1491                ; /* --no-signature inhibits all signatures */
1492        } else if (signature && signature != git_version_string) {
1493                ; /* non-default signature already set */
1494        } else if (signature_file) {
1495                struct strbuf buf = STRBUF_INIT;
1496
1497                if (strbuf_read_file(&buf, signature_file, 128) < 0)
1498                        die_errno(_("unable to read signature file '%s'"), signature_file);
1499                signature = strbuf_detach(&buf, NULL);
1500        }
1501
1502        if (in_reply_to || thread || cover_letter)
1503                rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
1504        if (in_reply_to) {
1505                const char *msgid = clean_message_id(in_reply_to);
1506                string_list_append(rev.ref_message_ids, msgid);
1507        }
1508        rev.numbered_files = just_numbers;
1509        rev.patch_suffix = fmt_patch_suffix;
1510        if (cover_letter) {
1511                if (thread)
1512                        gen_message_id(&rev, "cover");
1513                make_cover_letter(&rev, use_stdout,
1514                                  origin, nr, list, branch_name, quiet);
1515                total++;
1516                start_number--;
1517        }
1518        rev.add_signoff = do_signoff;
1519        while (0 <= --nr) {
1520                int shown;
1521                commit = list[nr];
1522                rev.nr = total - nr + (start_number - 1);
1523                /* Make the second and subsequent mails replies to the first */
1524                if (thread) {
1525                        /* Have we already had a message ID? */
1526                        if (rev.message_id) {
1527                                /*
1528                                 * For deep threading: make every mail
1529                                 * a reply to the previous one, no
1530                                 * matter what other options are set.
1531                                 *
1532                                 * For shallow threading:
1533                                 *
1534                                 * Without --cover-letter and
1535                                 * --in-reply-to, make every mail a
1536                                 * reply to the one before.
1537                                 *
1538                                 * With --in-reply-to but no
1539                                 * --cover-letter, make every mail a
1540                                 * reply to the <reply-to>.
1541                                 *
1542                                 * With --cover-letter, make every
1543                                 * mail but the cover letter a reply
1544                                 * to the cover letter.  The cover
1545                                 * letter is a reply to the
1546                                 * --in-reply-to, if specified.
1547                                 */
1548                                if (thread == THREAD_SHALLOW
1549                                    && rev.ref_message_ids->nr > 0
1550                                    && (!cover_letter || rev.nr > 1))
1551                                        free(rev.message_id);
1552                                else
1553                                        string_list_append(rev.ref_message_ids,
1554                                                           rev.message_id);
1555                        }
1556                        gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
1557                }
1558
1559                if (!use_stdout &&
1560                    reopen_stdout(rev.numbered_files ? NULL : commit, NULL, &rev, quiet))
1561                        die(_("Failed to create output files"));
1562                shown = log_tree_commit(&rev, commit);
1563                free_commit_buffer(commit);
1564
1565                /* We put one extra blank line between formatted
1566                 * patches and this flag is used by log-tree code
1567                 * to see if it needs to emit a LF before showing
1568                 * the log; when using one file per patch, we do
1569                 * not want the extra blank line.
1570                 */
1571                if (!use_stdout)
1572                        rev.shown_one = 0;
1573                if (shown) {
1574                        if (rev.mime_boundary)
1575                                printf("\n--%s%s--\n\n\n",
1576                                       mime_boundary_leader,
1577                                       rev.mime_boundary);
1578                        else
1579                                print_signature();
1580                }
1581                if (!use_stdout)
1582                        fclose(stdout);
1583        }
1584        free(list);
1585        free(branch_name);
1586        string_list_clear(&extra_to, 0);
1587        string_list_clear(&extra_cc, 0);
1588        string_list_clear(&extra_hdr, 0);
1589        if (ignore_if_in_upstream)
1590                free_patch_ids(&ids);
1591        return 0;
1592}
1593
1594static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
1595{
1596        unsigned char sha1[20];
1597        if (get_sha1(arg, sha1) == 0) {
1598                struct commit *commit = lookup_commit_reference(sha1);
1599                if (commit) {
1600                        commit->object.flags |= flags;
1601                        add_pending_object(revs, &commit->object, arg);
1602                        return 0;
1603                }
1604        }
1605        return -1;
1606}
1607
1608static const char * const cherry_usage[] = {
1609        N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"),
1610        NULL
1611};
1612
1613static void print_commit(char sign, struct commit *commit, int verbose,
1614                         int abbrev)
1615{
1616        if (!verbose) {
1617                printf("%c %s\n", sign,
1618                       find_unique_abbrev(commit->object.sha1, abbrev));
1619        } else {
1620                struct strbuf buf = STRBUF_INIT;
1621                pp_commit_easy(CMIT_FMT_ONELINE, commit, &buf);
1622                printf("%c %s %s\n", sign,
1623                       find_unique_abbrev(commit->object.sha1, abbrev),
1624                       buf.buf);
1625                strbuf_release(&buf);
1626        }
1627}
1628
1629int cmd_cherry(int argc, const char **argv, const char *prefix)
1630{
1631        struct rev_info revs;
1632        struct patch_ids ids;
1633        struct commit *commit;
1634        struct commit_list *list = NULL;
1635        struct branch *current_branch;
1636        const char *upstream;
1637        const char *head = "HEAD";
1638        const char *limit = NULL;
1639        int verbose = 0, abbrev = 0;
1640
1641        struct option options[] = {
1642                OPT__ABBREV(&abbrev),
1643                OPT__VERBOSE(&verbose, N_("be verbose")),
1644                OPT_END()
1645        };
1646
1647        argc = parse_options(argc, argv, prefix, options, cherry_usage, 0);
1648
1649        switch (argc) {
1650        case 3:
1651                limit = argv[2];
1652                /* FALLTHROUGH */
1653        case 2:
1654                head = argv[1];
1655                /* FALLTHROUGH */
1656        case 1:
1657                upstream = argv[0];
1658                break;
1659        default:
1660                current_branch = branch_get(NULL);
1661                upstream = branch_get_upstream(current_branch, NULL);
1662                if (!upstream) {
1663                        fprintf(stderr, _("Could not find a tracked"
1664                                        " remote branch, please"
1665                                        " specify <upstream> manually.\n"));
1666                        usage_with_options(cherry_usage, options);
1667                }
1668        }
1669
1670        init_revisions(&revs, prefix);
1671        revs.max_parents = 1;
1672
1673        if (add_pending_commit(head, &revs, 0))
1674                die(_("Unknown commit %s"), head);
1675        if (add_pending_commit(upstream, &revs, UNINTERESTING))
1676                die(_("Unknown commit %s"), upstream);
1677
1678        /* Don't say anything if head and upstream are the same. */
1679        if (revs.pending.nr == 2) {
1680                struct object_array_entry *o = revs.pending.objects;
1681                if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1682                        return 0;
1683        }
1684
1685        get_patch_ids(&revs, &ids);
1686
1687        if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
1688                die(_("Unknown commit %s"), limit);
1689
1690        /* reverse the list of commits */
1691        if (prepare_revision_walk(&revs))
1692                die(_("revision walk setup failed"));
1693        while ((commit = get_revision(&revs)) != NULL) {
1694                commit_list_insert(commit, &list);
1695        }
1696
1697        while (list) {
1698                char sign = '+';
1699
1700                commit = list->item;
1701                if (has_commit_patch_id(commit, &ids))
1702                        sign = '-';
1703                print_commit(sign, commit, verbose, abbrev);
1704                list = list->next;
1705        }
1706
1707        free_patch_ids(&ids);
1708        return 0;
1709}