pretty.c: add %f format specifier to format_commit_message()
[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"
70827b15 21
dd0ffd5b
HO
22/* Set a default date-time format for git log ("log.date" config variable) */
23static const char *default_date_mode = NULL;
24
0f03ca94 25static int default_show_root = 1;
d54276f2 26static const char *fmt_patch_subject_prefix = "PATCH";
94c22a5e 27static const char *fmt_pretty;
0f03ca94 28
a633fca0 29static void cmd_log_init(int argc, const char **argv, const char *prefix,
70827b15
LT
30 struct rev_info *rev)
31{
52883fbd
JH
32 int i;
33
70827b15
LT
34 rev->abbrev = DEFAULT_ABBREV;
35 rev->commit_format = CMIT_FMT_DEFAULT;
94c22a5e 36 if (fmt_pretty)
4da45bef 37 get_commit_format(fmt_pretty, rev);
70827b15 38 rev->verbose_header = 1;
8f67f8ae 39 DIFF_OPT_SET(&rev->diffopt, RECURSIVE);
0f03ca94 40 rev->show_root_diff = default_show_root;
d54276f2 41 rev->subject_prefix = fmt_patch_subject_prefix;
5ec11af6 42 DIFF_OPT_SET(&rev->diffopt, ALLOW_TEXTCONV);
dd0ffd5b
HO
43
44 if (default_date_mode)
45 rev->date_mode = parse_date_format(default_date_mode);
46
70827b15 47 argc = setup_revisions(argc, argv, rev, "HEAD");
dd0ffd5b 48
9dafea26
TH
49 if (rev->diffopt.pickaxe || rev->diffopt.filter)
50 rev->always_show_header = 0;
8f67f8ae 51 if (DIFF_OPT_TST(&rev->diffopt, FOLLOW_RENAMES)) {
750f7b66
LT
52 rev->always_show_header = 0;
53 if (rev->diffopt.nr_paths != 1)
54 usage("git logs can only follow renames on one pathname at a time");
55 }
52883fbd
JH
56 for (i = 1; i < argc; i++) {
57 const char *arg = argv[i];
66688334 58 if (!strcmp(arg, "--decorate")) {
5e9bf11c 59 load_ref_decorations();
d467a525 60 rev->show_decorations = 1;
0f3a290b
LT
61 } else if (!strcmp(arg, "--source")) {
62 rev->show_source = 1;
ca135e7a 63 } else
52883fbd
JH
64 die("unrecognized argument: %s", arg);
65 }
9dafea26
TH
66}
67
252a7c02
LT
68/*
69 * This gives a rough estimate for how many commits we
70 * will print out in the list.
71 */
72static int estimate_commit_count(struct rev_info *rev, struct commit_list *list)
73{
74 int n = 0;
75
76 while (list) {
77 struct commit *commit = list->item;
78 unsigned int flags = commit->object.flags;
252a7c02 79 list = list->next;
7dc0fe3b 80 if (!(flags & (TREESAME | UNINTERESTING)))
53b2c823 81 n++;
252a7c02
LT
82 }
83 return n;
84}
85
86static void show_early_header(struct rev_info *rev, const char *stage, int nr)
87{
88 if (rev->shown_one) {
89 rev->shown_one = 0;
90 if (rev->commit_format != CMIT_FMT_ONELINE)
91 putchar(rev->diffopt.line_termination);
92 }
93 printf("Final output: %d %s\n", nr, stage);
94}
95
96struct itimerval early_output_timer;
97
cdcefbc9
LT
98static void log_show_early(struct rev_info *revs, struct commit_list *list)
99{
100 int i = revs->early_output;
252a7c02 101 int show_header = 1;
cdcefbc9
LT
102
103 sort_in_topological_order(&list, revs->lifo);
104 while (list && i) {
105 struct commit *commit = list->item;
252a7c02
LT
106 switch (simplify_commit(revs, commit)) {
107 case commit_show:
108 if (show_header) {
109 int n = estimate_commit_count(revs, list);
110 show_early_header(revs, "incomplete", n);
111 show_header = 0;
112 }
113 log_tree_commit(revs, commit);
114 i--;
115 break;
116 case commit_ignore:
117 break;
118 case commit_error:
119 return;
120 }
cdcefbc9 121 list = list->next;
cdcefbc9 122 }
252a7c02
LT
123
124 /* Did we already get enough commits for the early output? */
125 if (!i)
126 return;
127
128 /*
129 * ..if no, then repeat it twice a second until we
130 * do.
131 *
132 * NOTE! We don't use "it_interval", because if the
133 * reader isn't listening, we want our output to be
134 * throttled by the writing, and not have the timer
135 * trigger every second even if we're blocked on a
136 * reader!
137 */
138 early_output_timer.it_value.tv_sec = 0;
139 early_output_timer.it_value.tv_usec = 500000;
140 setitimer(ITIMER_REAL, &early_output_timer, NULL);
cdcefbc9
LT
141}
142
143static void early_output(int signal)
144{
145 show_early_output = log_show_early;
146}
147
148static void setup_early_output(struct rev_info *rev)
149{
150 struct sigaction sa;
cdcefbc9
LT
151
152 /*
153 * Set up the signal handler, minimally intrusively:
154 * we only set a single volatile integer word (not
155 * using sigatomic_t - trying to avoid unnecessary
156 * system dependencies and headers), and using
157 * SA_RESTART.
158 */
159 memset(&sa, 0, sizeof(sa));
160 sa.sa_handler = early_output;
161 sigemptyset(&sa.sa_mask);
162 sa.sa_flags = SA_RESTART;
163 sigaction(SIGALRM, &sa, NULL);
164
165 /*
166 * If we can get the whole output in less than a
167 * tenth of a second, don't even bother doing the
168 * early-output thing..
169 *
170 * This is a one-time-only trigger.
171 */
252a7c02
LT
172 early_output_timer.it_value.tv_sec = 0;
173 early_output_timer.it_value.tv_usec = 100000;
174 setitimer(ITIMER_REAL, &early_output_timer, NULL);
cdcefbc9
LT
175}
176
177static void finish_early_output(struct rev_info *rev)
178{
252a7c02 179 int n = estimate_commit_count(rev, rev->commits);
cdcefbc9 180 signal(SIGALRM, SIG_IGN);
252a7c02 181 show_early_header(rev, "done", n);
cdcefbc9
LT
182}
183
9dafea26
TH
184static int cmd_log_walk(struct rev_info *rev)
185{
186 struct commit *commit;
70827b15 187
cdcefbc9
LT
188 if (rev->early_output)
189 setup_early_output(rev);
190
3d51e1b5
MK
191 if (prepare_revision_walk(rev))
192 die("revision walk setup failed");
cdcefbc9
LT
193
194 if (rev->early_output)
195 finish_early_output(rev);
196
036d17fe 197 /*
84102a33
PVM
198 * For --check and --exit-code, the exit code is based on CHECK_FAILED
199 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
200 * retain that state information if replacing rev->diffopt in this loop
036d17fe 201 */
70827b15
LT
202 while ((commit = get_revision(rev)) != NULL) {
203 log_tree_commit(rev, commit);
a6c73064
JS
204 if (!rev->reflog_info) {
205 /* we allow cycles in reflog ancestry */
206 free(commit->buffer);
207 commit->buffer = NULL;
208 }
cb115748
LT
209 free_commit_list(commit->parents);
210 commit->parents = NULL;
70827b15 211 }
036d17fe
PVM
212 if (rev->diffopt.output_format & DIFF_FORMAT_CHECKDIFF &&
213 DIFF_OPT_TST(&rev->diffopt, CHECK_FAILED)) {
214 return 02;
215 }
84102a33 216 return diff_result_code(&rev->diffopt, 0);
70827b15
LT
217}
218
ef90d6d4 219static int git_log_config(const char *var, const char *value, void *cb)
0f03ca94 220{
94c22a5e
CR
221 if (!strcmp(var, "format.pretty"))
222 return git_config_string(&fmt_pretty, var, value);
70cff3ac
BH
223 if (!strcmp(var, "format.subjectprefix"))
224 return git_config_string(&fmt_patch_subject_prefix, var, value);
dd0ffd5b
HO
225 if (!strcmp(var, "log.date"))
226 return git_config_string(&default_date_mode, var, value);
0f03ca94
PB
227 if (!strcmp(var, "log.showroot")) {
228 default_show_root = git_config_bool(var, value);
229 return 0;
230 }
ef90d6d4 231 return git_diff_ui_config(var, value, cb);
0f03ca94
PB
232}
233
a633fca0 234int cmd_whatchanged(int argc, const char **argv, const char *prefix)
70827b15
LT
235{
236 struct rev_info rev;
237
ef90d6d4 238 git_config(git_log_config, NULL);
6b2f2d98
MK
239
240 if (diff_use_color_default == -1)
241 diff_use_color_default = git_use_color_default;
242
db6296a5 243 init_revisions(&rev, prefix);
70827b15 244 rev.diff = 1;
9202434c 245 rev.simplify_history = 0;
a633fca0 246 cmd_log_init(argc, argv, prefix, &rev);
9dafea26
TH
247 if (!rev.diffopt.output_format)
248 rev.diffopt.output_format = DIFF_FORMAT_RAW;
249 return cmd_log_walk(&rev);
70827b15
LT
250}
251
56122ed8
JS
252static void show_tagger(char *buf, int len, struct rev_info *rev)
253{
ea718e65 254 struct strbuf out = STRBUF_INIT;
56122ed8 255
ea718e65
JS
256 pp_user_info("Tagger", rev->commit_format, &out, buf, rev->date_mode,
257 git_log_output_encoding ?
258 git_log_output_encoding: git_commit_encoding);
259 printf("%s\n", out.buf);
260 strbuf_release(&out);
56122ed8
JS
261}
262
263static int show_object(const unsigned char *sha1, int show_tag_object,
264 struct rev_info *rev)
5d7eeee2
JS
265{
266 unsigned long size;
21666f1a
NP
267 enum object_type type;
268 char *buf = read_sha1_file(sha1, &type, &size);
5d7eeee2
JS
269 int offset = 0;
270
271 if (!buf)
272 return error("Could not read object %s", sha1_to_hex(sha1));
273
56122ed8
JS
274 if (show_tag_object)
275 while (offset < size && buf[offset] != '\n') {
276 int new_offset = offset + 1;
5d7eeee2
JS
277 while (new_offset < size && buf[new_offset++] != '\n')
278 ; /* do nothing */
56122ed8
JS
279 if (!prefixcmp(buf + offset, "tagger "))
280 show_tagger(buf + offset + 7,
281 new_offset - offset - 7, rev);
5d7eeee2
JS
282 offset = new_offset;
283 }
284
285 if (offset < size)
286 fwrite(buf + offset, size - offset, 1, stdout);
287 free(buf);
288 return 0;
289}
290
291static int show_tree_object(const unsigned char *sha1,
292 const char *base, int baselen,
671f0707 293 const char *pathname, unsigned mode, int stage, void *context)
5d7eeee2
JS
294{
295 printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
296 return 0;
297}
298
a633fca0 299int cmd_show(int argc, const char **argv, const char *prefix)
70827b15
LT
300{
301 struct rev_info rev;
5d7eeee2
JS
302 struct object_array_entry *objects;
303 int i, count, ret = 0;
70827b15 304
ef90d6d4 305 git_config(git_log_config, NULL);
6b2f2d98
MK
306
307 if (diff_use_color_default == -1)
308 diff_use_color_default = git_use_color_default;
309
db6296a5 310 init_revisions(&rev, prefix);
70827b15 311 rev.diff = 1;
70827b15
LT
312 rev.combine_merges = 1;
313 rev.dense_combined_merges = 1;
314 rev.always_show_header = 1;
315 rev.ignore_merges = 0;
316 rev.no_walk = 1;
a633fca0 317 cmd_log_init(argc, argv, prefix, &rev);
5d7eeee2
JS
318
319 count = rev.pending.nr;
320 objects = rev.pending.objects;
321 for (i = 0; i < count && !ret; i++) {
322 struct object *o = objects[i].item;
323 const char *name = objects[i].name;
324 switch (o->type) {
325 case OBJ_BLOB:
56122ed8 326 ret = show_object(o->sha1, 0, NULL);
5d7eeee2
JS
327 break;
328 case OBJ_TAG: {
329 struct tag *t = (struct tag *)o;
330
56122ed8 331 printf("%stag %s%s\n",
8f67f8ae 332 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
5d7eeee2 333 t->tag,
8f67f8ae 334 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
56122ed8 335 ret = show_object(o->sha1, 1, &rev);
d2dadfe8
JH
336 if (ret)
337 break;
338 o = parse_object(t->tagged->sha1);
339 if (!o)
340 ret = error("Could not read object %s",
341 sha1_to_hex(t->tagged->sha1));
342 objects[i].item = o;
5d7eeee2
JS
343 i--;
344 break;
345 }
346 case OBJ_TREE:
347 printf("%stree %s%s\n\n",
8f67f8ae 348 diff_get_color_opt(&rev.diffopt, DIFF_COMMIT),
5d7eeee2 349 name,
8f67f8ae 350 diff_get_color_opt(&rev.diffopt, DIFF_RESET));
5d7eeee2 351 read_tree_recursive((struct tree *)o, "", 0, 0, NULL,
671f0707 352 show_tree_object, NULL);
5d7eeee2
JS
353 break;
354 case OBJ_COMMIT:
355 rev.pending.nr = rev.pending.alloc = 0;
356 rev.pending.objects = NULL;
357 add_object_array(o, name, &rev.pending);
358 ret = cmd_log_walk(&rev);
359 break;
360 default:
361 ret = error("Unknown type: %d", o->type);
362 }
363 }
364 free(objects);
365 return ret;
70827b15
LT
366}
367
cf39f54e
LT
368/*
369 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
370 */
371int cmd_log_reflog(int argc, const char **argv, const char *prefix)
372{
373 struct rev_info rev;
374
ef90d6d4 375 git_config(git_log_config, NULL);
6b2f2d98
MK
376
377 if (diff_use_color_default == -1)
378 diff_use_color_default = git_use_color_default;
379
cf39f54e
LT
380 init_revisions(&rev, prefix);
381 init_reflog_walk(&rev.reflog_info);
382 rev.abbrev_commit = 1;
383 rev.verbose_header = 1;
384 cmd_log_init(argc, argv, prefix, &rev);
385
386 /*
387 * This means that we override whatever commit format the user gave
388 * on the cmd line. Sad, but cmd_log_init() currently doesn't
389 * allow us to set a different default.
390 */
391 rev.commit_format = CMIT_FMT_ONELINE;
4da45bef 392 rev.use_terminator = 1;
cf39f54e
LT
393 rev.always_show_header = 1;
394
395 /*
396 * We get called through "git reflog", so unlike the other log
397 * routines, we need to set up our pager manually..
398 */
399 setup_pager();
400
401 return cmd_log_walk(&rev);
402}
403
a633fca0 404int cmd_log(int argc, const char **argv, const char *prefix)
70827b15
LT
405{
406 struct rev_info rev;
407
ef90d6d4 408 git_config(git_log_config, NULL);
6b2f2d98
MK
409
410 if (diff_use_color_default == -1)
411 diff_use_color_default = git_use_color_default;
412
db6296a5 413 init_revisions(&rev, prefix);
70827b15 414 rev.always_show_header = 1;
a633fca0 415 cmd_log_init(argc, argv, prefix, &rev);
9dafea26 416 return cmd_log_walk(&rev);
70827b15 417}
91efcf60 418
c06d2daa
RR
419/* format-patch */
420#define FORMAT_PATCH_NAME_MAX 64
421
0377db77
JS
422static int istitlechar(char c)
423{
424 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
425 (c >= '0' && c <= '9') || c == '.' || c == '_';
426}
427
917a8f89 428static const char *fmt_patch_suffix = ".patch";
49604a4d 429static int numbered = 0;
a567fdcb 430static int auto_number = 1;
20ff0680 431
0db5260b
JW
432static char *default_attach = NULL;
433
3ee79d9f
DB
434static char **extra_hdr;
435static int extra_hdr_nr;
436static int extra_hdr_alloc;
437
438static char **extra_to;
439static int extra_to_nr;
440static int extra_to_alloc;
441
442static char **extra_cc;
443static int extra_cc_nr;
444static int extra_cc_alloc;
445
446static void add_header(const char *value)
447{
448 int len = strlen(value);
c8c4450e 449 while (len && value[len - 1] == '\n')
3ee79d9f
DB
450 len--;
451 if (!strncasecmp(value, "to: ", 4)) {
452 ALLOC_GROW(extra_to, extra_to_nr + 1, extra_to_alloc);
453 extra_to[extra_to_nr++] = xstrndup(value + 4, len - 4);
454 return;
455 }
456 if (!strncasecmp(value, "cc: ", 4)) {
457 ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
458 extra_cc[extra_cc_nr++] = xstrndup(value + 4, len - 4);
459 return;
460 }
461 ALLOC_GROW(extra_hdr, extra_hdr_nr + 1, extra_hdr_alloc);
462 extra_hdr[extra_hdr_nr++] = xstrndup(value, len);
463}
464
30984ed2
TR
465#define THREAD_SHALLOW 1
466#define THREAD_DEEP 2
467static int thread = 0;
468
ef90d6d4 469static int git_format_config(const char *var, const char *value, void *cb)
20ff0680
JS
470{
471 if (!strcmp(var, "format.headers")) {
d7fb91c6
JH
472 if (!value)
473 die("format.headers without value");
3ee79d9f 474 add_header(value);
20ff0680
JS
475 return 0;
476 }
70cff3ac
BH
477 if (!strcmp(var, "format.suffix"))
478 return git_config_string(&fmt_patch_suffix, var, value);
fe8928e6
MV
479 if (!strcmp(var, "format.cc")) {
480 if (!value)
481 return config_error_nonbool(var);
482 ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
483 extra_cc[extra_cc_nr++] = xstrdup(value);
484 return 0;
485 }
a159ca0c 486 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
f3aafa4d
RA
487 return 0;
488 }
49604a4d 489 if (!strcmp(var, "format.numbered")) {
90f5c186 490 if (value && !strcasecmp(value, "auto")) {
49604a4d
BG
491 auto_number = 1;
492 return 0;
493 }
49604a4d 494 numbered = git_config_bool(var, value);
a567fdcb 495 auto_number = auto_number && numbered;
49604a4d
BG
496 return 0;
497 }
0db5260b
JW
498 if (!strcmp(var, "format.attach")) {
499 if (value && *value)
500 default_attach = xstrdup(value);
501 else
502 default_attach = xstrdup(git_version_string);
503 return 0;
504 }
30984ed2
TR
505 if (!strcmp(var, "format.thread")) {
506 if (value && !strcasecmp(value, "deep")) {
507 thread = THREAD_DEEP;
508 return 0;
509 }
510 if (value && !strcasecmp(value, "shallow")) {
511 thread = THREAD_SHALLOW;
512 return 0;
513 }
514 thread = git_config_bool(var, value) && THREAD_SHALLOW;
515 return 0;
516 }
dbd21447 517
ef90d6d4 518 return git_log_config(var, value, cb);
20ff0680
JS
519}
520
521
a5a27c79
DB
522static const char *get_oneline_for_filename(struct commit *commit,
523 int keep_subject)
524{
525 static char filename[PATH_MAX];
526 char *sol;
527 int len = 0;
528 int suffix_len = strlen(fmt_patch_suffix) + 1;
529
530 sol = strstr(commit->buffer, "\n\n");
531 if (!sol)
532 filename[0] = '\0';
533 else {
534 int j, space = 0;
535
536 sol += 2;
537 /* strip [PATCH] or [PATCH blabla] */
538 if (!keep_subject && !prefixcmp(sol, "[PATCH")) {
539 char *eos = strchr(sol + 6, ']');
540 if (eos) {
541 while (isspace(*eos))
542 eos++;
543 sol = eos;
544 }
545 }
546
547 for (j = 0;
548 j < FORMAT_PATCH_NAME_MAX - suffix_len - 5 &&
549 len < sizeof(filename) - suffix_len &&
550 sol[j] && sol[j] != '\n';
551 j++) {
552 if (istitlechar(sol[j])) {
553 if (space) {
554 filename[len++] = '-';
555 space = 0;
556 }
557 filename[len++] = sol[j];
558 if (sol[j] == '.')
559 while (sol[j + 1] == '.')
560 j++;
561 } else
562 space = 1;
563 }
564 while (filename[len - 1] == '.'
565 || filename[len - 1] == '-')
566 len--;
567 filename[len] = '\0';
568 }
569 return filename;
570}
571
81f3a188 572static FILE *realstdout = NULL;
efd02016 573static const char *output_directory = NULL;
9800a754 574static int outdir_offset;
81f3a188 575
ec2956df 576static int reopen_stdout(const char *oneline, int nr, struct rev_info *rev)
0377db77 577{
c06d2daa 578 char filename[PATH_MAX];
2448482b 579 int len = 0;
c06d2daa 580 int suffix_len = strlen(fmt_patch_suffix) + 1;
0377db77 581
2448482b 582 if (output_directory) {
a5a27c79
DB
583 len = snprintf(filename, sizeof(filename), "%s",
584 output_directory);
585 if (len >=
c06d2daa
RR
586 sizeof(filename) - FORMAT_PATCH_NAME_MAX - suffix_len)
587 return error("name of output directory is too long");
2448482b
JS
588 if (filename[len - 1] != '/')
589 filename[len++] = '/';
590 }
0377db77 591
a5a27c79
DB
592 if (!oneline)
593 len += sprintf(filename + len, "%d", nr);
594 else {
595 len += sprintf(filename + len, "%04d-", nr);
596 len += snprintf(filename + len, sizeof(filename) - len - 1
597 - suffix_len, "%s", oneline);
e6ff0f42 598 strcpy(filename + len, fmt_patch_suffix);
0377db77 599 }
e6ff0f42 600
ec2956df
NC
601 if (!DIFF_OPT_TST(&rev->diffopt, QUIET))
602 fprintf(realstdout, "%s\n", filename + outdir_offset);
603
c06d2daa
RR
604 if (freopen(filename, "w", stdout) == NULL)
605 return error("Cannot open patch file %s",filename);
c06d2daa 606
e6ff0f42 607 return 0;
0377db77
JS
608}
609
5d23e133 610static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const char *prefix)
9c6efa36
JS
611{
612 struct rev_info check_rev;
613 struct commit *commit;
614 struct object *o1, *o2;
615 unsigned flags1, flags2;
9c6efa36
JS
616
617 if (rev->pending.nr != 2)
618 die("Need exactly one range.");
619
620 o1 = rev->pending.objects[0].item;
621 flags1 = o1->flags;
622 o2 = rev->pending.objects[1].item;
623 flags2 = o2->flags;
624
625 if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
626 die("Not a range.");
627
5d23e133 628 init_patch_ids(ids);
9c6efa36
JS
629
630 /* given a range a..b get all patch ids for b..a */
db6296a5 631 init_revisions(&check_rev, prefix);
9c6efa36
JS
632 o1->flags ^= UNINTERESTING;
633 o2->flags ^= UNINTERESTING;
634 add_pending_object(&check_rev, o1, "o1");
635 add_pending_object(&check_rev, o2, "o2");
3d51e1b5
MK
636 if (prepare_revision_walk(&check_rev))
637 die("revision walk setup failed");
9c6efa36
JS
638
639 while ((commit = get_revision(&check_rev)) != NULL) {
640 /* ignore merges */
641 if (commit->parents && commit->parents->next)
642 continue;
643
5d23e133 644 add_commit_patch_id(commit, ids);
9c6efa36
JS
645 }
646
647 /* reset for next revision walk */
81db0941
JS
648 clear_commit_marks((struct commit *)o1,
649 SEEN | UNINTERESTING | SHOWN | ADDED);
650 clear_commit_marks((struct commit *)o2,
651 SEEN | UNINTERESTING | SHOWN | ADDED);
9c6efa36
JS
652 o1->flags = flags1;
653 o2->flags = flags2;
654}
655
e1a37346 656static void gen_message_id(struct rev_info *info, char *base)
d1566f78 657{
774751a8 658 const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
d1566f78
JT
659 const char *email_start = strrchr(committer, '<');
660 const char *email_end = strrchr(committer, '>');
f285a2d7 661 struct strbuf buf = STRBUF_INIT;
e1a37346 662 if (!email_start || !email_end || email_start > email_end - 1)
d1566f78 663 die("Could not extract email from committer identity.");
e1a37346
DB
664 strbuf_addf(&buf, "%s.%lu.git.%.*s", base,
665 (unsigned long) time(NULL),
666 (int)(email_end - email_start - 1), email_start + 1);
667 info->message_id = strbuf_detach(&buf, NULL);
d1566f78
JT
668}
669
2bda2cf4
DB
670static void make_cover_letter(struct rev_info *rev, int use_stdout,
671 int numbered, int numbered_files,
672 struct commit *origin,
673 int nr, struct commit **list, struct commit *head)
a5a27c79
DB
674{
675 const char *committer;
39fe578b 676 char *head_sha1;
a5a27c79
DB
677 const char *subject_start = NULL;
678 const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
679 const char *msg;
680 const char *extra_headers = rev->extra_headers;
2bda2cf4 681 struct shortlog log;
f285a2d7 682 struct strbuf sb = STRBUF_INIT;
2bda2cf4 683 int i;
a5a27c79 684 const char *encoding = "utf-8";
39fe578b 685 struct diff_options opts;
267123b4 686 int need_8bit_cte = 0;
a5a27c79
DB
687
688 if (rev->commit_format != CMIT_FMT_EMAIL)
689 die("Cover letter needs email format");
690
691 if (!use_stdout && reopen_stdout(numbered_files ?
ec2956df 692 NULL : "cover-letter", 0, rev))
a5a27c79
DB
693 return;
694
a5a27c79
DB
695 head_sha1 = sha1_to_hex(head->object.sha1);
696
267123b4
JH
697 log_write_email_headers(rev, head_sha1, &subject_start, &extra_headers,
698 &need_8bit_cte);
a5a27c79
DB
699
700 committer = git_committer_info(0);
701
702 msg = body;
a5a27c79
DB
703 pp_user_info(NULL, CMIT_FMT_EMAIL, &sb, committer, DATE_RFC2822,
704 encoding);
705 pp_title_line(CMIT_FMT_EMAIL, &msg, &sb, subject_start, extra_headers,
267123b4 706 encoding, need_8bit_cte);
a5a27c79
DB
707 pp_remainder(CMIT_FMT_EMAIL, &msg, &sb, 0);
708 printf("%s\n", sb.buf);
709
710 strbuf_release(&sb);
711
2bda2cf4 712 shortlog_init(&log);
859c4fbe
JS
713 log.wrap_lines = 1;
714 log.wrap = 72;
715 log.in1 = 2;
716 log.in2 = 4;
2bda2cf4
DB
717 for (i = 0; i < nr; i++)
718 shortlog_add_commit(&log, list[i]);
719
720 shortlog_output(&log);
721
a5a27c79 722 /*
2bda2cf4 723 * We can only do diffstat with a unique reference point
a5a27c79
DB
724 */
725 if (!origin)
726 return;
727
5d02294c
JS
728 memcpy(&opts, &rev->diffopt, sizeof(opts));
729 opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
a5a27c79 730
39fe578b
DB
731 diff_setup_done(&opts);
732
733 diff_tree_sha1(origin->tree->object.sha1,
734 head->tree->object.sha1,
735 "", &opts);
736 diffcore_std(&opts);
737 diff_flush(&opts);
a5a27c79 738
a5a27c79 739 printf("\n");
d1566f78
JT
740}
741
8419d2ee
JH
742static const char *clean_message_id(const char *msg_id)
743{
744 char ch;
745 const char *a, *z, *m;
8419d2ee
JH
746
747 m = msg_id;
748 while ((ch = *m) && (isspace(ch) || (ch == '<')))
749 m++;
750 a = m;
751 z = NULL;
752 while ((ch = *m)) {
753 if (!isspace(ch) && (ch != '>'))
754 z = m;
755 m++;
756 }
757 if (!z)
758 die("insane in-reply-to: %s", msg_id);
759 if (++z == m)
760 return a;
182af834 761 return xmemdupz(a, z - a);
8419d2ee
JH
762}
763
9800a754
JH
764static const char *set_outdir(const char *prefix, const char *output_directory)
765{
766 if (output_directory && is_absolute_path(output_directory))
767 return output_directory;
768
769 if (!prefix || !*prefix) {
770 if (output_directory)
771 return output_directory;
772 /* The user did not explicitly ask for "./" */
773 outdir_offset = 2;
774 return "./";
775 }
776
777 outdir_offset = strlen(prefix);
778 if (!output_directory)
779 return prefix;
780
781 return xstrdup(prefix_filename(prefix, outdir_offset,
782 output_directory));
783}
784
a633fca0 785int cmd_format_patch(int argc, const char **argv, const char *prefix)
91efcf60
JH
786{
787 struct commit *commit;
788 struct commit **list = NULL;
789 struct rev_info rev;
2448482b 790 int nr = 0, total, i, j;
0377db77 791 int use_stdout = 0;
fa0f02df 792 int start_number = -1;
8ac80a57 793 int keep_subject = 0;
e6ff0f42 794 int numbered_files = 0; /* _just_ numbers */
2d9e4a47 795 int subject_prefix = 0;
9c6efa36 796 int ignore_if_in_upstream = 0;
a5a27c79 797 int cover_letter = 0;
2bda2cf4 798 int boundary_count = 0;
37c22a4b 799 int no_binary_diff = 0;
a5a27c79 800 struct commit *origin = NULL, *head = NULL;
76af0734 801 const char *in_reply_to = NULL;
5d23e133 802 struct patch_ids ids;
cf2251b6 803 char *add_signoff = NULL;
f285a2d7 804 struct strbuf buf = STRBUF_INIT;
91efcf60 805
ef90d6d4 806 git_config(git_format_config, NULL);
db6296a5 807 init_revisions(&rev, prefix);
91efcf60
JH
808 rev.commit_format = CMIT_FMT_EMAIL;
809 rev.verbose_header = 1;
810 rev.diff = 1;
91efcf60
JH
811 rev.combine_merges = 0;
812 rev.ignore_merges = 1;
8f67f8ae 813 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
91efcf60 814
dbd21447 815 rev.subject_prefix = fmt_patch_subject_prefix;
20ff0680 816
0db5260b
JW
817 if (default_attach) {
818 rev.mime_boundary = default_attach;
819 rev.no_inline = 1;
820 }
821
2448482b
JS
822 /*
823 * Parse the arguments before setup_revisions(), or something
2dc189a3 824 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
2448482b
JS
825 * possibly a valid SHA1.
826 */
827 for (i = 1, j = 1; i < argc; i++) {
828 if (!strcmp(argv[i], "--stdout"))
0377db77 829 use_stdout = 1;
596524b3
JS
830 else if (!strcmp(argv[i], "-n") ||
831 !strcmp(argv[i], "--numbered"))
832 numbered = 1;
49604a4d
BG
833 else if (!strcmp(argv[i], "-N") ||
834 !strcmp(argv[i], "--no-numbered")) {
835 numbered = 0;
836 auto_number = 0;
837 }
cc44c765 838 else if (!prefixcmp(argv[i], "--start-number="))
fa0f02df 839 start_number = strtol(argv[i] + 15, NULL, 10);
e6ff0f42
JL
840 else if (!strcmp(argv[i], "--numbered-files"))
841 numbered_files = 1;
fa0f02df
JS
842 else if (!strcmp(argv[i], "--start-number")) {
843 i++;
844 if (i == argc)
845 die("Need a number for --start-number");
846 start_number = strtol(argv[i], NULL, 10);
cf2251b6 847 }
736cc67d
DB
848 else if (!prefixcmp(argv[i], "--cc=")) {
849 ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
850 extra_cc[extra_cc_nr++] = xstrdup(argv[i] + 5);
851 }
cf2251b6 852 else if (!strcmp(argv[i], "-k") ||
8ac80a57
JS
853 !strcmp(argv[i], "--keep-subject")) {
854 keep_subject = 1;
855 rev.total = -1;
cf2251b6 856 }
efd02016
JH
857 else if (!strcmp(argv[i], "--output-directory") ||
858 !strcmp(argv[i], "-o")) {
2448482b 859 i++;
efd02016
JH
860 if (argc <= i)
861 die("Which directory?");
862 if (output_directory)
863 die("Two output directories?");
864 output_directory = argv[i];
698ce6f8 865 }
cf2251b6
JH
866 else if (!strcmp(argv[i], "--signoff") ||
867 !strcmp(argv[i], "-s")) {
6c4cca1c
EB
868 const char *committer;
869 const char *endpos;
774751a8 870 committer = git_committer_info(IDENT_ERROR_ON_NO_NAME);
6c4cca1c 871 endpos = strchr(committer, '>');
cf2251b6 872 if (!endpos)
d7530708 873 die("bogus committer info %s", committer);
182af834 874 add_signoff = xmemdupz(committer, endpos - committer + 1);
cf2251b6 875 }
c112f689 876 else if (!strcmp(argv[i], "--attach")) {
698ce6f8 877 rev.mime_boundary = git_version_string;
c112f689
JS
878 rev.no_inline = 1;
879 }
880 else if (!prefixcmp(argv[i], "--attach=")) {
881 rev.mime_boundary = argv[i] + 9;
882 rev.no_inline = 1;
883 }
0db5260b
JW
884 else if (!strcmp(argv[i], "--no-attach")) {
885 rev.mime_boundary = NULL;
886 rev.no_inline = 0;
887 }
c112f689
JS
888 else if (!strcmp(argv[i], "--inline")) {
889 rev.mime_boundary = git_version_string;
890 rev.no_inline = 0;
891 }
892 else if (!prefixcmp(argv[i], "--inline=")) {
698ce6f8 893 rev.mime_boundary = argv[i] + 9;
c112f689
JS
894 rev.no_inline = 0;
895 }
9c6efa36
JS
896 else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
897 ignore_if_in_upstream = 1;
30984ed2
TR
898 else if (!strcmp(argv[i], "--thread")
899 || !strcmp(argv[i], "--thread=shallow"))
900 thread = THREAD_SHALLOW;
901 else if (!strcmp(argv[i], "--thread=deep"))
902 thread = THREAD_DEEP;
903 else if (!strcmp(argv[i], "--no-thread"))
904 thread = 0;
cc44c765 905 else if (!prefixcmp(argv[i], "--in-reply-to="))
da56645d
JT
906 in_reply_to = argv[i] + 14;
907 else if (!strcmp(argv[i], "--in-reply-to")) {
908 i++;
909 if (i == argc)
910 die("Need a Message-Id for --in-reply-to");
911 in_reply_to = argv[i];
2d9e4a47
RJ
912 } else if (!prefixcmp(argv[i], "--subject-prefix=")) {
913 subject_prefix = 1;
914 rev.subject_prefix = argv[i] + 17;
915 } else if (!prefixcmp(argv[i], "--suffix="))
03eeaeae 916 fmt_patch_suffix = argv[i] + 9;
a5a27c79
DB
917 else if (!strcmp(argv[i], "--cover-letter"))
918 cover_letter = 1;
37c22a4b
CMOF
919 else if (!strcmp(argv[i], "--no-binary"))
920 no_binary_diff = 1;
698ce6f8 921 else
2448482b 922 argv[j++] = argv[i];
0377db77 923 }
2448482b
JS
924 argc = j;
925
3ee79d9f
DB
926 for (i = 0; i < extra_hdr_nr; i++) {
927 strbuf_addstr(&buf, extra_hdr[i]);
928 strbuf_addch(&buf, '\n');
929 }
930
931 if (extra_to_nr)
932 strbuf_addstr(&buf, "To: ");
933 for (i = 0; i < extra_to_nr; i++) {
934 if (i)
935 strbuf_addstr(&buf, " ");
936 strbuf_addstr(&buf, extra_to[i]);
937 if (i + 1 < extra_to_nr)
938 strbuf_addch(&buf, ',');
939 strbuf_addch(&buf, '\n');
940 }
941
942 if (extra_cc_nr)
943 strbuf_addstr(&buf, "Cc: ");
944 for (i = 0; i < extra_cc_nr; i++) {
945 if (i)
946 strbuf_addstr(&buf, " ");
947 strbuf_addstr(&buf, extra_cc[i]);
948 if (i + 1 < extra_cc_nr)
949 strbuf_addch(&buf, ',');
950 strbuf_addch(&buf, '\n');
951 }
952
953 rev.extra_headers = strbuf_detach(&buf, 0);
954
add5c8a5 955 if (start_number < 0)
fa0f02df 956 start_number = 1;
63b398a4 957 if (numbered && keep_subject)
8ac80a57 958 die ("-n and -k are mutually exclusive.");
2d9e4a47
RJ
959 if (keep_subject && subject_prefix)
960 die ("--subject-prefix and -k are mutually exclusive.");
8ac80a57 961
2448482b
JS
962 argc = setup_revisions(argc, argv, &rev, "HEAD");
963 if (argc > 1)
964 die ("unrecognized argument: %s", argv[1]);
0377db77 965
68daa64d
JK
966 if (!rev.diffopt.output_format
967 || rev.diffopt.output_format == DIFF_FORMAT_PATCH)
c261e438 968 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_PATCH;
c9b5ef99 969
37c22a4b 970 if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
8f67f8ae 971 DIFF_OPT_SET(&rev.diffopt, BINARY);
e47f306d 972
9800a754
JH
973 if (!use_stdout)
974 output_directory = set_outdir(prefix, output_directory);
77e565d8 975
efd02016
JH
976 if (output_directory) {
977 if (use_stdout)
978 die("standard output, or directory, which one?");
979 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
980 die("Could not create directory %s",
981 output_directory);
982 }
983
1f1e895f 984 if (rev.pending.nr == 1) {
8a1d076e
JH
985 if (rev.max_count < 0 && !rev.show_root_diff) {
986 /*
987 * This is traditional behaviour of "git format-patch
988 * origin" that prepares what the origin side still
989 * does not have.
990 */
7c496280 991 rev.pending.objects[0].item->flags |= UNINTERESTING;
3384a2df 992 add_head_to_pending(&rev);
7c496280 993 }
8a1d076e
JH
994 /*
995 * Otherwise, it is "format-patch -22 HEAD", and/or
996 * "format-patch --root HEAD". The user wants
997 * get_revision() to do the usual traversal.
7c496280 998 */
e686eb98 999 }
68c2ec7f
JH
1000
1001 /*
1002 * We cannot move this anywhere earlier because we do want to
1003 * know if --root was given explicitly from the comand line.
1004 */
1005 rev.show_root_diff = 1;
1006
a5a27c79
DB
1007 if (cover_letter) {
1008 /* remember the range */
a5a27c79
DB
1009 int i;
1010 for (i = 0; i < rev.pending.nr; i++) {
1011 struct object *o = rev.pending.objects[i].item;
2bda2cf4 1012 if (!(o->flags & UNINTERESTING))
a5a27c79
DB
1013 head = (struct commit *)o;
1014 }
a5a27c79
DB
1015 /* We can't generate a cover letter without any patches */
1016 if (!head)
1017 return 0;
1018 }
e686eb98 1019
9c6efa36 1020 if (ignore_if_in_upstream)
5d23e133 1021 get_patch_ids(&rev, &ids, prefix);
9c6efa36 1022
81f3a188 1023 if (!use_stdout)
f5788250 1024 realstdout = xfdopen(xdup(1), "w");
81f3a188 1025
3d51e1b5
MK
1026 if (prepare_revision_walk(&rev))
1027 die("revision walk setup failed");
2bda2cf4 1028 rev.boundary = 1;
91efcf60 1029 while ((commit = get_revision(&rev)) != NULL) {
2bda2cf4 1030 if (commit->object.flags & BOUNDARY) {
2bda2cf4
DB
1031 boundary_count++;
1032 origin = (boundary_count == 1) ? commit : NULL;
1033 continue;
1034 }
1035
0377db77
JS
1036 /* ignore merges */
1037 if (commit->parents && commit->parents->next)
1038 continue;
9c6efa36
JS
1039
1040 if (ignore_if_in_upstream &&
5d23e133 1041 has_commit_patch_id(commit, &ids))
9c6efa36
JS
1042 continue;
1043
91efcf60 1044 nr++;
83572c1a 1045 list = xrealloc(list, nr * sizeof(list[0]));
91efcf60
JH
1046 list[nr - 1] = commit;
1047 }
0377db77 1048 total = nr;
49604a4d
BG
1049 if (!keep_subject && auto_number && total > 1)
1050 numbered = 1;
596524b3 1051 if (numbered)
fa0f02df 1052 rev.total = total + start_number - 1;
b079c50e
TR
1053 if (in_reply_to || thread || cover_letter)
1054 rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
1055 if (in_reply_to) {
1056 const char *msgid = clean_message_id(in_reply_to);
1057 string_list_append(msgid, rev.ref_message_ids);
1058 }
a5a27c79
DB
1059 if (cover_letter) {
1060 if (thread)
1061 gen_message_id(&rev, "cover");
1062 make_cover_letter(&rev, use_stdout, numbered, numbered_files,
2bda2cf4 1063 origin, nr, list, head);
a5a27c79
DB
1064 total++;
1065 start_number--;
1066 }
1067 rev.add_signoff = add_signoff;
91efcf60
JH
1068 while (0 <= --nr) {
1069 int shown;
1070 commit = list[nr];
add5c8a5 1071 rev.nr = total - nr + (start_number - 1);
d1566f78 1072 /* Make the second and subsequent mails replies to the first */
cc35de84 1073 if (thread) {
a5a27c79 1074 /* Have we already had a message ID? */
e1a37346 1075 if (rev.message_id) {
a5a27c79 1076 /*
30984ed2
TR
1077 * For deep threading: make every mail
1078 * a reply to the previous one, no
1079 * matter what other options are set.
1080 *
1081 * For shallow threading:
1082 *
2175c10d
TR
1083 * Without --cover-letter and
1084 * --in-reply-to, make every mail a
1085 * reply to the one before.
1086 *
1087 * With --in-reply-to but no
1088 * --cover-letter, make every mail a
1089 * reply to the <reply-to>.
1090 *
1091 * With --cover-letter, make every
1092 * mail but the cover letter a reply
1093 * to the cover letter. The cover
1094 * letter is a reply to the
1095 * --in-reply-to, if specified.
a5a27c79 1096 */
30984ed2
TR
1097 if (thread == THREAD_SHALLOW
1098 && rev.ref_message_ids->nr > 0
2175c10d 1099 && (!cover_letter || rev.nr > 1))
e1a37346
DB
1100 free(rev.message_id);
1101 else
b079c50e
TR
1102 string_list_append(rev.message_id,
1103 rev.ref_message_ids);
cc35de84 1104 }
e1a37346 1105 gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
d1566f78 1106 }
a5a27c79
DB
1107 if (!use_stdout && reopen_stdout(numbered_files ? NULL :
1108 get_oneline_for_filename(commit, keep_subject),
ec2956df 1109 rev.nr, &rev))
a5a27c79 1110 die("Failed to create output files");
91efcf60
JH
1111 shown = log_tree_commit(&rev, commit);
1112 free(commit->buffer);
1113 commit->buffer = NULL;
add5c8a5
JH
1114
1115 /* We put one extra blank line between formatted
1116 * patches and this flag is used by log-tree code
1117 * to see if it needs to emit a LF before showing
1118 * the log; when using one file per patch, we do
1119 * not want the extra blank line.
1120 */
1121 if (!use_stdout)
1122 rev.shown_one = 0;
698ce6f8
JS
1123 if (shown) {
1124 if (rev.mime_boundary)
1125 printf("\n--%s%s--\n\n\n",
1126 mime_boundary_leader,
1127 rev.mime_boundary);
1128 else
1129 printf("-- \n%s\n\n", git_version_string);
1130 }
0377db77
JS
1131 if (!use_stdout)
1132 fclose(stdout);
91efcf60
JH
1133 }
1134 free(list);
5d23e133
JH
1135 if (ignore_if_in_upstream)
1136 free_patch_ids(&ids);
91efcf60
JH
1137 return 0;
1138}
1139
e827633a
RS
1140static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
1141{
1142 unsigned char sha1[20];
1143 if (get_sha1(arg, sha1) == 0) {
1144 struct commit *commit = lookup_commit_reference(sha1);
1145 if (commit) {
1146 commit->object.flags |= flags;
1147 add_pending_object(revs, &commit->object, arg);
1148 return 0;
1149 }
1150 }
1151 return -1;
1152}
1153
1154static const char cherry_usage[] =
3bc52d7a 1155"git cherry [-v] [<upstream> [<head> [<limit>]]]";
e827633a
RS
1156int cmd_cherry(int argc, const char **argv, const char *prefix)
1157{
1158 struct rev_info revs;
5d23e133 1159 struct patch_ids ids;
e827633a
RS
1160 struct commit *commit;
1161 struct commit_list *list = NULL;
f2968022 1162 struct branch *current_branch;
e827633a
RS
1163 const char *upstream;
1164 const char *head = "HEAD";
1165 const char *limit = NULL;
1166 int verbose = 0;
1167
1168 if (argc > 1 && !strcmp(argv[1], "-v")) {
1169 verbose = 1;
1170 argc--;
1171 argv++;
1172 }
1173
1174 switch (argc) {
1175 case 4:
1176 limit = argv[3];
1177 /* FALLTHROUGH */
1178 case 3:
1179 head = argv[2];
1180 /* FALLTHROUGH */
1181 case 2:
1182 upstream = argv[1];
1183 break;
1184 default:
f2968022
MH
1185 current_branch = branch_get(NULL);
1186 if (!current_branch || !current_branch->merge
1187 || !current_branch->merge[0]
1188 || !current_branch->merge[0]->dst) {
1189 fprintf(stderr, "Could not find a tracked"
1190 " remote branch, please"
1191 " specify <upstream> manually.\n");
1192 usage(cherry_usage);
1193 }
1194
1195 upstream = current_branch->merge[0]->dst;
e827633a
RS
1196 }
1197
1198 init_revisions(&revs, prefix);
1199 revs.diff = 1;
1200 revs.combine_merges = 0;
1201 revs.ignore_merges = 1;
8f67f8ae 1202 DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
e827633a
RS
1203
1204 if (add_pending_commit(head, &revs, 0))
1205 die("Unknown commit %s", head);
1206 if (add_pending_commit(upstream, &revs, UNINTERESTING))
1207 die("Unknown commit %s", upstream);
1208
1209 /* Don't say anything if head and upstream are the same. */
1210 if (revs.pending.nr == 2) {
1211 struct object_array_entry *o = revs.pending.objects;
1212 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1213 return 0;
1214 }
1215
5d23e133 1216 get_patch_ids(&revs, &ids, prefix);
e827633a
RS
1217
1218 if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
1219 die("Unknown commit %s", limit);
1220
1221 /* reverse the list of commits */
3d51e1b5
MK
1222 if (prepare_revision_walk(&revs))
1223 die("revision walk setup failed");
e827633a
RS
1224 while ((commit = get_revision(&revs)) != NULL) {
1225 /* ignore merges */
1226 if (commit->parents && commit->parents->next)
1227 continue;
1228
1229 commit_list_insert(commit, &list);
1230 }
1231
1232 while (list) {
e827633a
RS
1233 char sign = '+';
1234
1235 commit = list->item;
5d23e133 1236 if (has_commit_patch_id(commit, &ids))
e827633a
RS
1237 sign = '-';
1238
1239 if (verbose) {
f285a2d7 1240 struct strbuf buf = STRBUF_INIT;
674d1727 1241 pretty_print_commit(CMIT_FMT_ONELINE, commit,
4593fb84 1242 &buf, 0, NULL, NULL, 0, 0);
e827633a 1243 printf("%c %s %s\n", sign,
674d1727
PH
1244 sha1_to_hex(commit->object.sha1), buf.buf);
1245 strbuf_release(&buf);
e827633a
RS
1246 }
1247 else {
1248 printf("%c %s\n", sign,
1249 sha1_to_hex(commit->object.sha1));
1250 }
1251
1252 list = list->next;
1253 }
1254
5d23e133 1255 free_patch_ids(&ids);
e827633a
RS
1256 return 0;
1257}