tests: Add tests for missing format-patch long options
[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 419/* format-patch */
0377db77 420
917a8f89 421static const char *fmt_patch_suffix = ".patch";
49604a4d 422static int numbered = 0;
a567fdcb 423static int auto_number = 1;
20ff0680 424
0db5260b
JW
425static char *default_attach = NULL;
426
3ee79d9f
DB
427static char **extra_hdr;
428static int extra_hdr_nr;
429static int extra_hdr_alloc;
430
431static char **extra_to;
432static int extra_to_nr;
433static int extra_to_alloc;
434
435static char **extra_cc;
436static int extra_cc_nr;
437static int extra_cc_alloc;
438
439static void add_header(const char *value)
440{
441 int len = strlen(value);
c8c4450e 442 while (len && value[len - 1] == '\n')
3ee79d9f
DB
443 len--;
444 if (!strncasecmp(value, "to: ", 4)) {
445 ALLOC_GROW(extra_to, extra_to_nr + 1, extra_to_alloc);
446 extra_to[extra_to_nr++] = xstrndup(value + 4, len - 4);
447 return;
448 }
449 if (!strncasecmp(value, "cc: ", 4)) {
450 ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
451 extra_cc[extra_cc_nr++] = xstrndup(value + 4, len - 4);
452 return;
453 }
454 ALLOC_GROW(extra_hdr, extra_hdr_nr + 1, extra_hdr_alloc);
455 extra_hdr[extra_hdr_nr++] = xstrndup(value, len);
456}
457
30984ed2
TR
458#define THREAD_SHALLOW 1
459#define THREAD_DEEP 2
460static int thread = 0;
1d1876e9 461static int do_signoff = 0;
30984ed2 462
ef90d6d4 463static int git_format_config(const char *var, const char *value, void *cb)
20ff0680
JS
464{
465 if (!strcmp(var, "format.headers")) {
d7fb91c6
JH
466 if (!value)
467 die("format.headers without value");
3ee79d9f 468 add_header(value);
20ff0680
JS
469 return 0;
470 }
70cff3ac
BH
471 if (!strcmp(var, "format.suffix"))
472 return git_config_string(&fmt_patch_suffix, var, value);
fe8928e6
MV
473 if (!strcmp(var, "format.cc")) {
474 if (!value)
475 return config_error_nonbool(var);
476 ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
477 extra_cc[extra_cc_nr++] = xstrdup(value);
478 return 0;
479 }
a159ca0c 480 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
f3aafa4d
RA
481 return 0;
482 }
49604a4d 483 if (!strcmp(var, "format.numbered")) {
90f5c186 484 if (value && !strcasecmp(value, "auto")) {
49604a4d
BG
485 auto_number = 1;
486 return 0;
487 }
49604a4d 488 numbered = git_config_bool(var, value);
a567fdcb 489 auto_number = auto_number && numbered;
49604a4d
BG
490 return 0;
491 }
0db5260b
JW
492 if (!strcmp(var, "format.attach")) {
493 if (value && *value)
494 default_attach = xstrdup(value);
495 else
496 default_attach = xstrdup(git_version_string);
497 return 0;
498 }
30984ed2
TR
499 if (!strcmp(var, "format.thread")) {
500 if (value && !strcasecmp(value, "deep")) {
501 thread = THREAD_DEEP;
502 return 0;
503 }
504 if (value && !strcasecmp(value, "shallow")) {
505 thread = THREAD_SHALLOW;
506 return 0;
507 }
508 thread = git_config_bool(var, value) && THREAD_SHALLOW;
509 return 0;
510 }
1d1876e9
HV
511 if (!strcmp(var, "format.signoff")) {
512 do_signoff = git_config_bool(var, value);
513 return 0;
514 }
dbd21447 515
ef90d6d4 516 return git_log_config(var, value, cb);
20ff0680
JS
517}
518
81f3a188 519static FILE *realstdout = NULL;
efd02016 520static const char *output_directory = NULL;
9800a754 521static int outdir_offset;
81f3a188 522
cd2ef591 523static int reopen_stdout(struct commit *commit, struct rev_info *rev)
0377db77 524{
cd2ef591 525 struct strbuf filename = STRBUF_INIT;
c06d2daa 526 int suffix_len = strlen(fmt_patch_suffix) + 1;
0377db77 527
2448482b 528 if (output_directory) {
cd2ef591
SB
529 strbuf_addstr(&filename, output_directory);
530 if (filename.len >=
531 PATH_MAX - FORMAT_PATCH_NAME_MAX - suffix_len)
c06d2daa 532 return error("name of output directory is too long");
cd2ef591
SB
533 if (filename.buf[filename.len - 1] != '/')
534 strbuf_addch(&filename, '/');
2448482b 535 }
0377db77 536
cd2ef591 537 get_patch_filename(commit, rev->nr, fmt_patch_suffix, &filename);
e6ff0f42 538
ec2956df 539 if (!DIFF_OPT_TST(&rev->diffopt, QUIET))
cd2ef591 540 fprintf(realstdout, "%s\n", filename.buf + outdir_offset);
ec2956df 541
cd2ef591
SB
542 if (freopen(filename.buf, "w", stdout) == NULL)
543 return error("Cannot open patch file %s", filename.buf);
c06d2daa 544
cd2ef591 545 strbuf_release(&filename);
e6ff0f42 546 return 0;
0377db77
JS
547}
548
5d23e133 549static void get_patch_ids(struct rev_info *rev, struct patch_ids *ids, const char *prefix)
9c6efa36
JS
550{
551 struct rev_info check_rev;
552 struct commit *commit;
553 struct object *o1, *o2;
554 unsigned flags1, flags2;
9c6efa36
JS
555
556 if (rev->pending.nr != 2)
557 die("Need exactly one range.");
558
559 o1 = rev->pending.objects[0].item;
560 flags1 = o1->flags;
561 o2 = rev->pending.objects[1].item;
562 flags2 = o2->flags;
563
564 if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
565 die("Not a range.");
566
5d23e133 567 init_patch_ids(ids);
9c6efa36
JS
568
569 /* given a range a..b get all patch ids for b..a */
db6296a5 570 init_revisions(&check_rev, prefix);
9c6efa36
JS
571 o1->flags ^= UNINTERESTING;
572 o2->flags ^= UNINTERESTING;
573 add_pending_object(&check_rev, o1, "o1");
574 add_pending_object(&check_rev, o2, "o2");
3d51e1b5
MK
575 if (prepare_revision_walk(&check_rev))
576 die("revision walk setup failed");
9c6efa36
JS
577
578 while ((commit = get_revision(&check_rev)) != NULL) {
579 /* ignore merges */
580 if (commit->parents && commit->parents->next)
581 continue;
582
5d23e133 583 add_commit_patch_id(commit, ids);
9c6efa36
JS
584 }
585
586 /* reset for next revision walk */
81db0941
JS
587 clear_commit_marks((struct commit *)o1,
588 SEEN | UNINTERESTING | SHOWN | ADDED);
589 clear_commit_marks((struct commit *)o2,
590 SEEN | UNINTERESTING | SHOWN | ADDED);
9c6efa36
JS
591 o1->flags = flags1;
592 o2->flags = flags2;
593}
594
e1a37346 595static void gen_message_id(struct rev_info *info, char *base)
d1566f78 596{
774751a8 597 const char *committer = git_committer_info(IDENT_WARN_ON_NO_NAME);
d1566f78
JT
598 const char *email_start = strrchr(committer, '<');
599 const char *email_end = strrchr(committer, '>');
f285a2d7 600 struct strbuf buf = STRBUF_INIT;
e1a37346 601 if (!email_start || !email_end || email_start > email_end - 1)
d1566f78 602 die("Could not extract email from committer identity.");
e1a37346
DB
603 strbuf_addf(&buf, "%s.%lu.git.%.*s", base,
604 (unsigned long) time(NULL),
605 (int)(email_end - email_start - 1), email_start + 1);
606 info->message_id = strbuf_detach(&buf, NULL);
d1566f78
JT
607}
608
2bda2cf4
DB
609static void make_cover_letter(struct rev_info *rev, int use_stdout,
610 int numbered, int numbered_files,
611 struct commit *origin,
612 int nr, struct commit **list, struct commit *head)
a5a27c79
DB
613{
614 const char *committer;
a5a27c79
DB
615 const char *subject_start = NULL;
616 const char *body = "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
617 const char *msg;
618 const char *extra_headers = rev->extra_headers;
2bda2cf4 619 struct shortlog log;
f285a2d7 620 struct strbuf sb = STRBUF_INIT;
2bda2cf4 621 int i;
a5a27c79 622 const char *encoding = "utf-8";
39fe578b 623 struct diff_options opts;
267123b4 624 int need_8bit_cte = 0;
cd2ef591 625 struct commit *commit = NULL;
a5a27c79
DB
626
627 if (rev->commit_format != CMIT_FMT_EMAIL)
628 die("Cover letter needs email format");
629
cd2ef591 630 committer = git_committer_info(0);
6df514af 631
cd2ef591
SB
632 if (!numbered_files) {
633 /*
634 * We fake a commit for the cover letter so we get the filename
635 * desired.
636 */
637 commit = xcalloc(1, sizeof(*commit));
638 commit->buffer = xmalloc(400);
639 snprintf(commit->buffer, 400,
640 "tree 0000000000000000000000000000000000000000\n"
641 "parent %s\n"
642 "author %s\n"
643 "committer %s\n\n"
644 "cover letter\n",
108dab28 645 sha1_to_hex(head->object.sha1), committer, committer);
cd2ef591
SB
646 }
647
648 if (!use_stdout && reopen_stdout(commit, rev))
a5a27c79
DB
649 return;
650
cd2ef591 651 if (commit) {
a5a27c79 652
cd2ef591
SB
653 free(commit->buffer);
654 free(commit);
655 }
a5a27c79 656
108dab28 657 log_write_email_headers(rev, head, &subject_start, &extra_headers,
267123b4 658 &need_8bit_cte);
a5a27c79
DB
659
660 msg = body;
a5a27c79
DB
661 pp_user_info(NULL, CMIT_FMT_EMAIL, &sb, committer, DATE_RFC2822,
662 encoding);
663 pp_title_line(CMIT_FMT_EMAIL, &msg, &sb, subject_start, extra_headers,
267123b4 664 encoding, need_8bit_cte);
a5a27c79
DB
665 pp_remainder(CMIT_FMT_EMAIL, &msg, &sb, 0);
666 printf("%s\n", sb.buf);
667
668 strbuf_release(&sb);
669
2bda2cf4 670 shortlog_init(&log);
859c4fbe
JS
671 log.wrap_lines = 1;
672 log.wrap = 72;
673 log.in1 = 2;
674 log.in2 = 4;
2bda2cf4
DB
675 for (i = 0; i < nr; i++)
676 shortlog_add_commit(&log, list[i]);
677
678 shortlog_output(&log);
679
a5a27c79 680 /*
2bda2cf4 681 * We can only do diffstat with a unique reference point
a5a27c79
DB
682 */
683 if (!origin)
684 return;
685
5d02294c
JS
686 memcpy(&opts, &rev->diffopt, sizeof(opts));
687 opts.output_format = DIFF_FORMAT_SUMMARY | DIFF_FORMAT_DIFFSTAT;
a5a27c79 688
39fe578b
DB
689 diff_setup_done(&opts);
690
691 diff_tree_sha1(origin->tree->object.sha1,
692 head->tree->object.sha1,
693 "", &opts);
694 diffcore_std(&opts);
695 diff_flush(&opts);
a5a27c79 696
a5a27c79 697 printf("\n");
d1566f78
JT
698}
699
8419d2ee
JH
700static const char *clean_message_id(const char *msg_id)
701{
702 char ch;
703 const char *a, *z, *m;
8419d2ee
JH
704
705 m = msg_id;
706 while ((ch = *m) && (isspace(ch) || (ch == '<')))
707 m++;
708 a = m;
709 z = NULL;
710 while ((ch = *m)) {
711 if (!isspace(ch) && (ch != '>'))
712 z = m;
713 m++;
714 }
715 if (!z)
716 die("insane in-reply-to: %s", msg_id);
717 if (++z == m)
718 return a;
182af834 719 return xmemdupz(a, z - a);
8419d2ee
JH
720}
721
9800a754
JH
722static const char *set_outdir(const char *prefix, const char *output_directory)
723{
724 if (output_directory && is_absolute_path(output_directory))
725 return output_directory;
726
727 if (!prefix || !*prefix) {
728 if (output_directory)
729 return output_directory;
730 /* The user did not explicitly ask for "./" */
731 outdir_offset = 2;
732 return "./";
733 }
734
735 outdir_offset = strlen(prefix);
736 if (!output_directory)
737 return prefix;
738
739 return xstrdup(prefix_filename(prefix, outdir_offset,
740 output_directory));
741}
742
a633fca0 743int cmd_format_patch(int argc, const char **argv, const char *prefix)
91efcf60
JH
744{
745 struct commit *commit;
746 struct commit **list = NULL;
747 struct rev_info rev;
2448482b 748 int nr = 0, total, i, j;
0377db77 749 int use_stdout = 0;
fa0f02df 750 int start_number = -1;
8ac80a57 751 int keep_subject = 0;
e6ff0f42 752 int numbered_files = 0; /* _just_ numbers */
2d9e4a47 753 int subject_prefix = 0;
9c6efa36 754 int ignore_if_in_upstream = 0;
a5a27c79 755 int cover_letter = 0;
2bda2cf4 756 int boundary_count = 0;
37c22a4b 757 int no_binary_diff = 0;
a5a27c79 758 struct commit *origin = NULL, *head = NULL;
76af0734 759 const char *in_reply_to = NULL;
5d23e133 760 struct patch_ids ids;
cf2251b6 761 char *add_signoff = NULL;
f285a2d7 762 struct strbuf buf = STRBUF_INIT;
91efcf60 763
ef90d6d4 764 git_config(git_format_config, NULL);
db6296a5 765 init_revisions(&rev, prefix);
91efcf60
JH
766 rev.commit_format = CMIT_FMT_EMAIL;
767 rev.verbose_header = 1;
768 rev.diff = 1;
91efcf60
JH
769 rev.combine_merges = 0;
770 rev.ignore_merges = 1;
8f67f8ae 771 DIFF_OPT_SET(&rev.diffopt, RECURSIVE);
91efcf60 772
dbd21447 773 rev.subject_prefix = fmt_patch_subject_prefix;
20ff0680 774
0db5260b
JW
775 if (default_attach) {
776 rev.mime_boundary = default_attach;
777 rev.no_inline = 1;
778 }
779
2448482b
JS
780 /*
781 * Parse the arguments before setup_revisions(), or something
2dc189a3 782 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
2448482b
JS
783 * possibly a valid SHA1.
784 */
785 for (i = 1, j = 1; i < argc; i++) {
786 if (!strcmp(argv[i], "--stdout"))
0377db77 787 use_stdout = 1;
596524b3
JS
788 else if (!strcmp(argv[i], "-n") ||
789 !strcmp(argv[i], "--numbered"))
790 numbered = 1;
49604a4d
BG
791 else if (!strcmp(argv[i], "-N") ||
792 !strcmp(argv[i], "--no-numbered")) {
793 numbered = 0;
794 auto_number = 0;
795 }
cc44c765 796 else if (!prefixcmp(argv[i], "--start-number="))
fa0f02df 797 start_number = strtol(argv[i] + 15, NULL, 10);
e6ff0f42
JL
798 else if (!strcmp(argv[i], "--numbered-files"))
799 numbered_files = 1;
fa0f02df
JS
800 else if (!strcmp(argv[i], "--start-number")) {
801 i++;
802 if (i == argc)
803 die("Need a number for --start-number");
804 start_number = strtol(argv[i], NULL, 10);
cf2251b6 805 }
736cc67d
DB
806 else if (!prefixcmp(argv[i], "--cc=")) {
807 ALLOC_GROW(extra_cc, extra_cc_nr + 1, extra_cc_alloc);
808 extra_cc[extra_cc_nr++] = xstrdup(argv[i] + 5);
809 }
cf2251b6 810 else if (!strcmp(argv[i], "-k") ||
8ac80a57
JS
811 !strcmp(argv[i], "--keep-subject")) {
812 keep_subject = 1;
813 rev.total = -1;
cf2251b6 814 }
efd02016
JH
815 else if (!strcmp(argv[i], "--output-directory") ||
816 !strcmp(argv[i], "-o")) {
2448482b 817 i++;
efd02016
JH
818 if (argc <= i)
819 die("Which directory?");
820 if (output_directory)
821 die("Two output directories?");
822 output_directory = argv[i];
698ce6f8 823 }
cf2251b6
JH
824 else if (!strcmp(argv[i], "--signoff") ||
825 !strcmp(argv[i], "-s")) {
1d1876e9 826 do_signoff = 1;
cf2251b6 827 }
c112f689 828 else if (!strcmp(argv[i], "--attach")) {
698ce6f8 829 rev.mime_boundary = git_version_string;
c112f689
JS
830 rev.no_inline = 1;
831 }
832 else if (!prefixcmp(argv[i], "--attach=")) {
833 rev.mime_boundary = argv[i] + 9;
834 rev.no_inline = 1;
835 }
0db5260b
JW
836 else if (!strcmp(argv[i], "--no-attach")) {
837 rev.mime_boundary = NULL;
838 rev.no_inline = 0;
839 }
c112f689
JS
840 else if (!strcmp(argv[i], "--inline")) {
841 rev.mime_boundary = git_version_string;
842 rev.no_inline = 0;
843 }
844 else if (!prefixcmp(argv[i], "--inline=")) {
698ce6f8 845 rev.mime_boundary = argv[i] + 9;
c112f689
JS
846 rev.no_inline = 0;
847 }
9c6efa36
JS
848 else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
849 ignore_if_in_upstream = 1;
30984ed2
TR
850 else if (!strcmp(argv[i], "--thread")
851 || !strcmp(argv[i], "--thread=shallow"))
852 thread = THREAD_SHALLOW;
853 else if (!strcmp(argv[i], "--thread=deep"))
854 thread = THREAD_DEEP;
855 else if (!strcmp(argv[i], "--no-thread"))
856 thread = 0;
cc44c765 857 else if (!prefixcmp(argv[i], "--in-reply-to="))
da56645d
JT
858 in_reply_to = argv[i] + 14;
859 else if (!strcmp(argv[i], "--in-reply-to")) {
860 i++;
861 if (i == argc)
862 die("Need a Message-Id for --in-reply-to");
863 in_reply_to = argv[i];
2d9e4a47
RJ
864 } else if (!prefixcmp(argv[i], "--subject-prefix=")) {
865 subject_prefix = 1;
866 rev.subject_prefix = argv[i] + 17;
867 } else if (!prefixcmp(argv[i], "--suffix="))
03eeaeae 868 fmt_patch_suffix = argv[i] + 9;
a5a27c79
DB
869 else if (!strcmp(argv[i], "--cover-letter"))
870 cover_letter = 1;
37c22a4b
CMOF
871 else if (!strcmp(argv[i], "--no-binary"))
872 no_binary_diff = 1;
d7d9c2d0
MH
873 else if (!prefixcmp(argv[i], "--add-header="))
874 add_header(argv[i] + 13);
698ce6f8 875 else
2448482b 876 argv[j++] = argv[i];
0377db77 877 }
2448482b
JS
878 argc = j;
879
1d1876e9
HV
880 if (do_signoff) {
881 const char *committer;
882 const char *endpos;
883 committer = git_committer_info(IDENT_ERROR_ON_NO_NAME);
884 endpos = strchr(committer, '>');
885 if (!endpos)
886 die("bogus committer info %s", committer);
887 add_signoff = xmemdupz(committer, endpos - committer + 1);
888 }
889
3ee79d9f
DB
890 for (i = 0; i < extra_hdr_nr; i++) {
891 strbuf_addstr(&buf, extra_hdr[i]);
892 strbuf_addch(&buf, '\n');
893 }
894
895 if (extra_to_nr)
896 strbuf_addstr(&buf, "To: ");
897 for (i = 0; i < extra_to_nr; i++) {
898 if (i)
899 strbuf_addstr(&buf, " ");
900 strbuf_addstr(&buf, extra_to[i]);
901 if (i + 1 < extra_to_nr)
902 strbuf_addch(&buf, ',');
903 strbuf_addch(&buf, '\n');
904 }
905
906 if (extra_cc_nr)
907 strbuf_addstr(&buf, "Cc: ");
908 for (i = 0; i < extra_cc_nr; i++) {
909 if (i)
910 strbuf_addstr(&buf, " ");
911 strbuf_addstr(&buf, extra_cc[i]);
912 if (i + 1 < extra_cc_nr)
913 strbuf_addch(&buf, ',');
914 strbuf_addch(&buf, '\n');
915 }
916
917 rev.extra_headers = strbuf_detach(&buf, 0);
918
add5c8a5 919 if (start_number < 0)
fa0f02df 920 start_number = 1;
63b398a4 921 if (numbered && keep_subject)
8ac80a57 922 die ("-n and -k are mutually exclusive.");
2d9e4a47
RJ
923 if (keep_subject && subject_prefix)
924 die ("--subject-prefix and -k are mutually exclusive.");
8ac80a57 925
2448482b
JS
926 argc = setup_revisions(argc, argv, &rev, "HEAD");
927 if (argc > 1)
928 die ("unrecognized argument: %s", argv[1]);
0377db77 929
68daa64d
JK
930 if (!rev.diffopt.output_format
931 || rev.diffopt.output_format == DIFF_FORMAT_PATCH)
c261e438 932 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_PATCH;
c9b5ef99 933
37c22a4b 934 if (!DIFF_OPT_TST(&rev.diffopt, TEXT) && !no_binary_diff)
8f67f8ae 935 DIFF_OPT_SET(&rev.diffopt, BINARY);
e47f306d 936
9800a754
JH
937 if (!use_stdout)
938 output_directory = set_outdir(prefix, output_directory);
77e565d8 939
efd02016
JH
940 if (output_directory) {
941 if (use_stdout)
942 die("standard output, or directory, which one?");
943 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
944 die("Could not create directory %s",
945 output_directory);
946 }
947
1f1e895f 948 if (rev.pending.nr == 1) {
8a1d076e
JH
949 if (rev.max_count < 0 && !rev.show_root_diff) {
950 /*
951 * This is traditional behaviour of "git format-patch
952 * origin" that prepares what the origin side still
953 * does not have.
954 */
7c496280 955 rev.pending.objects[0].item->flags |= UNINTERESTING;
3384a2df 956 add_head_to_pending(&rev);
7c496280 957 }
8a1d076e
JH
958 /*
959 * Otherwise, it is "format-patch -22 HEAD", and/or
960 * "format-patch --root HEAD". The user wants
961 * get_revision() to do the usual traversal.
7c496280 962 */
e686eb98 963 }
68c2ec7f
JH
964
965 /*
966 * We cannot move this anywhere earlier because we do want to
967 * know if --root was given explicitly from the comand line.
968 */
969 rev.show_root_diff = 1;
970
a5a27c79
DB
971 if (cover_letter) {
972 /* remember the range */
a5a27c79
DB
973 int i;
974 for (i = 0; i < rev.pending.nr; i++) {
975 struct object *o = rev.pending.objects[i].item;
2bda2cf4 976 if (!(o->flags & UNINTERESTING))
a5a27c79
DB
977 head = (struct commit *)o;
978 }
a5a27c79
DB
979 /* We can't generate a cover letter without any patches */
980 if (!head)
981 return 0;
982 }
e686eb98 983
9c6efa36 984 if (ignore_if_in_upstream)
5d23e133 985 get_patch_ids(&rev, &ids, prefix);
9c6efa36 986
81f3a188 987 if (!use_stdout)
f5788250 988 realstdout = xfdopen(xdup(1), "w");
81f3a188 989
3d51e1b5
MK
990 if (prepare_revision_walk(&rev))
991 die("revision walk setup failed");
2bda2cf4 992 rev.boundary = 1;
91efcf60 993 while ((commit = get_revision(&rev)) != NULL) {
2bda2cf4 994 if (commit->object.flags & BOUNDARY) {
2bda2cf4
DB
995 boundary_count++;
996 origin = (boundary_count == 1) ? commit : NULL;
997 continue;
998 }
999
0377db77
JS
1000 /* ignore merges */
1001 if (commit->parents && commit->parents->next)
1002 continue;
9c6efa36
JS
1003
1004 if (ignore_if_in_upstream &&
5d23e133 1005 has_commit_patch_id(commit, &ids))
9c6efa36
JS
1006 continue;
1007
91efcf60 1008 nr++;
83572c1a 1009 list = xrealloc(list, nr * sizeof(list[0]));
91efcf60
JH
1010 list[nr - 1] = commit;
1011 }
0377db77 1012 total = nr;
49604a4d
BG
1013 if (!keep_subject && auto_number && total > 1)
1014 numbered = 1;
596524b3 1015 if (numbered)
fa0f02df 1016 rev.total = total + start_number - 1;
b079c50e
TR
1017 if (in_reply_to || thread || cover_letter)
1018 rev.ref_message_ids = xcalloc(1, sizeof(struct string_list));
1019 if (in_reply_to) {
1020 const char *msgid = clean_message_id(in_reply_to);
1021 string_list_append(msgid, rev.ref_message_ids);
1022 }
108dab28
SB
1023 rev.numbered_files = numbered_files;
1024 rev.patch_suffix = fmt_patch_suffix;
a5a27c79
DB
1025 if (cover_letter) {
1026 if (thread)
1027 gen_message_id(&rev, "cover");
1028 make_cover_letter(&rev, use_stdout, numbered, numbered_files,
2bda2cf4 1029 origin, nr, list, head);
a5a27c79
DB
1030 total++;
1031 start_number--;
1032 }
1033 rev.add_signoff = add_signoff;
91efcf60
JH
1034 while (0 <= --nr) {
1035 int shown;
1036 commit = list[nr];
add5c8a5 1037 rev.nr = total - nr + (start_number - 1);
d1566f78 1038 /* Make the second and subsequent mails replies to the first */
cc35de84 1039 if (thread) {
a5a27c79 1040 /* Have we already had a message ID? */
e1a37346 1041 if (rev.message_id) {
a5a27c79 1042 /*
30984ed2
TR
1043 * For deep threading: make every mail
1044 * a reply to the previous one, no
1045 * matter what other options are set.
1046 *
1047 * For shallow threading:
1048 *
2175c10d
TR
1049 * Without --cover-letter and
1050 * --in-reply-to, make every mail a
1051 * reply to the one before.
1052 *
1053 * With --in-reply-to but no
1054 * --cover-letter, make every mail a
1055 * reply to the <reply-to>.
1056 *
1057 * With --cover-letter, make every
1058 * mail but the cover letter a reply
1059 * to the cover letter. The cover
1060 * letter is a reply to the
1061 * --in-reply-to, if specified.
a5a27c79 1062 */
30984ed2
TR
1063 if (thread == THREAD_SHALLOW
1064 && rev.ref_message_ids->nr > 0
2175c10d 1065 && (!cover_letter || rev.nr > 1))
e1a37346
DB
1066 free(rev.message_id);
1067 else
b079c50e
TR
1068 string_list_append(rev.message_id,
1069 rev.ref_message_ids);
cc35de84 1070 }
e1a37346 1071 gen_message_id(&rev, sha1_to_hex(commit->object.sha1));
d1566f78 1072 }
6df514af 1073
cd2ef591
SB
1074 if (!use_stdout && reopen_stdout(numbered_files ? NULL : commit,
1075 &rev))
a5a27c79 1076 die("Failed to create output files");
91efcf60
JH
1077 shown = log_tree_commit(&rev, commit);
1078 free(commit->buffer);
1079 commit->buffer = NULL;
add5c8a5
JH
1080
1081 /* We put one extra blank line between formatted
1082 * patches and this flag is used by log-tree code
1083 * to see if it needs to emit a LF before showing
1084 * the log; when using one file per patch, we do
1085 * not want the extra blank line.
1086 */
1087 if (!use_stdout)
1088 rev.shown_one = 0;
698ce6f8
JS
1089 if (shown) {
1090 if (rev.mime_boundary)
1091 printf("\n--%s%s--\n\n\n",
1092 mime_boundary_leader,
1093 rev.mime_boundary);
1094 else
1095 printf("-- \n%s\n\n", git_version_string);
1096 }
0377db77
JS
1097 if (!use_stdout)
1098 fclose(stdout);
91efcf60
JH
1099 }
1100 free(list);
5d23e133
JH
1101 if (ignore_if_in_upstream)
1102 free_patch_ids(&ids);
91efcf60
JH
1103 return 0;
1104}
1105
e827633a
RS
1106static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
1107{
1108 unsigned char sha1[20];
1109 if (get_sha1(arg, sha1) == 0) {
1110 struct commit *commit = lookup_commit_reference(sha1);
1111 if (commit) {
1112 commit->object.flags |= flags;
1113 add_pending_object(revs, &commit->object, arg);
1114 return 0;
1115 }
1116 }
1117 return -1;
1118}
1119
1120static const char cherry_usage[] =
3bc52d7a 1121"git cherry [-v] [<upstream> [<head> [<limit>]]]";
e827633a
RS
1122int cmd_cherry(int argc, const char **argv, const char *prefix)
1123{
1124 struct rev_info revs;
5d23e133 1125 struct patch_ids ids;
e827633a
RS
1126 struct commit *commit;
1127 struct commit_list *list = NULL;
f2968022 1128 struct branch *current_branch;
e827633a
RS
1129 const char *upstream;
1130 const char *head = "HEAD";
1131 const char *limit = NULL;
1132 int verbose = 0;
1133
1134 if (argc > 1 && !strcmp(argv[1], "-v")) {
1135 verbose = 1;
1136 argc--;
1137 argv++;
1138 }
1139
1140 switch (argc) {
1141 case 4:
1142 limit = argv[3];
1143 /* FALLTHROUGH */
1144 case 3:
1145 head = argv[2];
1146 /* FALLTHROUGH */
1147 case 2:
1148 upstream = argv[1];
1149 break;
1150 default:
f2968022
MH
1151 current_branch = branch_get(NULL);
1152 if (!current_branch || !current_branch->merge
1153 || !current_branch->merge[0]
1154 || !current_branch->merge[0]->dst) {
1155 fprintf(stderr, "Could not find a tracked"
1156 " remote branch, please"
1157 " specify <upstream> manually.\n");
1158 usage(cherry_usage);
1159 }
1160
1161 upstream = current_branch->merge[0]->dst;
e827633a
RS
1162 }
1163
1164 init_revisions(&revs, prefix);
1165 revs.diff = 1;
1166 revs.combine_merges = 0;
1167 revs.ignore_merges = 1;
8f67f8ae 1168 DIFF_OPT_SET(&revs.diffopt, RECURSIVE);
e827633a
RS
1169
1170 if (add_pending_commit(head, &revs, 0))
1171 die("Unknown commit %s", head);
1172 if (add_pending_commit(upstream, &revs, UNINTERESTING))
1173 die("Unknown commit %s", upstream);
1174
1175 /* Don't say anything if head and upstream are the same. */
1176 if (revs.pending.nr == 2) {
1177 struct object_array_entry *o = revs.pending.objects;
1178 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
1179 return 0;
1180 }
1181
5d23e133 1182 get_patch_ids(&revs, &ids, prefix);
e827633a
RS
1183
1184 if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
1185 die("Unknown commit %s", limit);
1186
1187 /* reverse the list of commits */
3d51e1b5
MK
1188 if (prepare_revision_walk(&revs))
1189 die("revision walk setup failed");
e827633a
RS
1190 while ((commit = get_revision(&revs)) != NULL) {
1191 /* ignore merges */
1192 if (commit->parents && commit->parents->next)
1193 continue;
1194
1195 commit_list_insert(commit, &list);
1196 }
1197
1198 while (list) {
e827633a
RS
1199 char sign = '+';
1200
1201 commit = list->item;
5d23e133 1202 if (has_commit_patch_id(commit, &ids))
e827633a
RS
1203 sign = '-';
1204
1205 if (verbose) {
f285a2d7 1206 struct strbuf buf = STRBUF_INIT;
674d1727 1207 pretty_print_commit(CMIT_FMT_ONELINE, commit,
4593fb84 1208 &buf, 0, NULL, NULL, 0, 0);
e827633a 1209 printf("%c %s %s\n", sign,
674d1727
PH
1210 sha1_to_hex(commit->object.sha1), buf.buf);
1211 strbuf_release(&buf);
e827633a
RS
1212 }
1213 else {
1214 printf("%c %s\n", sign,
1215 sha1_to_hex(commit->object.sha1));
1216 }
1217
1218 list = list->next;
1219 }
1220
5d23e133 1221 free_patch_ids(&ids);
e827633a
RS
1222 return 0;
1223}