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