2 * Builtin "git log" and related commands (show, whatchanged)
4 * (C) Copyright 2006 Linus Torvalds
16 #include "reflog-walk.h"
17 #include "patch-ids.h"
18 #include "run-command.h"
21 #include "string-list.h"
22 #include "parse-options.h"
25 #include "streaming.h"
28 #include "gpg-interface.h"
30 /* Set a default date-time format for git log ("log.date" config variable) */
31 static const char *default_date_mode
= NULL
;
33 static int default_abbrev_commit
;
34 static int default_show_root
= 1;
35 static int default_follow
;
36 static int decoration_style
;
37 static int decoration_given
;
38 static int use_mailmap_config
;
39 static const char *fmt_patch_subject_prefix
= "PATCH";
40 static const char *fmt_pretty
;
42 static const char * const builtin_log_usage
[] = {
43 N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
44 N_("git show [<options>] <object>..."),
48 struct line_opt_callback_data
{
51 struct string_list args
;
54 static int parse_decoration_style(const char *var
, const char *value
)
56 switch (git_config_maybe_bool(var
, value
)) {
58 return DECORATE_SHORT_REFS
;
64 if (!strcmp(value
, "full"))
65 return DECORATE_FULL_REFS
;
66 else if (!strcmp(value
, "short"))
67 return DECORATE_SHORT_REFS
;
68 else if (!strcmp(value
, "auto"))
69 return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS
: 0;
73 static int decorate_callback(const struct option
*opt
, const char *arg
, int unset
)
78 decoration_style
= parse_decoration_style("command line", arg
);
80 decoration_style
= DECORATE_SHORT_REFS
;
82 if (decoration_style
< 0)
83 die(_("invalid --decorate option: %s"), arg
);
90 static int log_line_range_callback(const struct option
*option
, const char *arg
, int unset
)
92 struct line_opt_callback_data
*data
= option
->value
;
97 data
->rev
->line_level_traverse
= 1;
98 string_list_append(&data
->args
, arg
);
103 static void cmd_log_init_defaults(struct rev_info
*rev
)
106 get_commit_format(fmt_pretty
, rev
);
108 DIFF_OPT_SET(&rev
->diffopt
, DEFAULT_FOLLOW_RENAMES
);
109 rev
->verbose_header
= 1;
110 DIFF_OPT_SET(&rev
->diffopt
, RECURSIVE
);
111 rev
->diffopt
.stat_width
= -1; /* use full terminal width */
112 rev
->diffopt
.stat_graph_width
= -1; /* respect statGraphWidth config */
113 rev
->abbrev_commit
= default_abbrev_commit
;
114 rev
->show_root_diff
= default_show_root
;
115 rev
->subject_prefix
= fmt_patch_subject_prefix
;
116 DIFF_OPT_SET(&rev
->diffopt
, ALLOW_TEXTCONV
);
118 if (default_date_mode
)
119 parse_date_format(default_date_mode
, &rev
->date_mode
);
120 rev
->diffopt
.touched_flags
= 0;
123 static void cmd_log_init_finish(int argc
, const char **argv
, const char *prefix
,
124 struct rev_info
*rev
, struct setup_revision_opt
*opt
)
126 struct userformat_want w
;
127 int quiet
= 0, source
= 0, mailmap
= 0;
128 static struct line_opt_callback_data line_cb
= {NULL
, NULL
, STRING_LIST_INIT_DUP
};
130 const struct option builtin_log_options
[] = {
131 OPT__QUIET(&quiet
, N_("suppress diff output")),
132 OPT_BOOL(0, "source", &source
, N_("show source")),
133 OPT_BOOL(0, "use-mailmap", &mailmap
, N_("Use mail map file")),
134 { OPTION_CALLBACK
, 0, "decorate", NULL
, NULL
, N_("decorate options"),
135 PARSE_OPT_OPTARG
, decorate_callback
},
136 OPT_CALLBACK('L', NULL
, &line_cb
, "n,m:file",
137 N_("Process line range n,m in file, counting from 1"),
138 log_line_range_callback
),
143 line_cb
.prefix
= prefix
;
145 mailmap
= use_mailmap_config
;
146 argc
= parse_options(argc
, argv
, prefix
,
147 builtin_log_options
, builtin_log_usage
,
148 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN
|
149 PARSE_OPT_KEEP_DASHDASH
);
152 rev
->diffopt
.output_format
|= DIFF_FORMAT_NO_OUTPUT
;
153 argc
= setup_revisions(argc
, argv
, rev
, opt
);
155 /* Any arguments at this point are not recognized */
157 die(_("unrecognized argument: %s"), argv
[1]);
159 memset(&w
, 0, sizeof(w
));
160 userformat_find_requirements(NULL
, &w
);
162 if (!rev
->show_notes_given
&& (!rev
->pretty_given
|| w
.notes
))
165 init_display_notes(&rev
->notes_opt
);
167 if (rev
->diffopt
.pickaxe
|| rev
->diffopt
.filter
||
168 DIFF_OPT_TST(&rev
->diffopt
, FOLLOW_RENAMES
))
169 rev
->always_show_header
= 0;
172 rev
->show_source
= 1;
175 rev
->mailmap
= xcalloc(1, sizeof(struct string_list
));
176 read_mailmap(rev
->mailmap
, NULL
);
179 if (rev
->pretty_given
&& rev
->commit_format
== CMIT_FMT_RAW
) {
181 * "log --pretty=raw" is special; ignore UI oriented
182 * configuration variables such as decoration.
184 if (!decoration_given
)
185 decoration_style
= 0;
186 if (!rev
->abbrev_commit_given
)
187 rev
->abbrev_commit
= 0;
190 if (decoration_style
) {
191 rev
->show_decorations
= 1;
192 load_ref_decorations(decoration_style
);
195 if (rev
->line_level_traverse
)
196 line_log_init(rev
, line_cb
.prefix
, &line_cb
.args
);
201 static void cmd_log_init(int argc
, const char **argv
, const char *prefix
,
202 struct rev_info
*rev
, struct setup_revision_opt
*opt
)
204 cmd_log_init_defaults(rev
);
205 cmd_log_init_finish(argc
, argv
, prefix
, rev
, opt
);
209 * This gives a rough estimate for how many commits we
210 * will print out in the list.
212 static int estimate_commit_count(struct rev_info
*rev
, struct commit_list
*list
)
217 struct commit
*commit
= list
->item
;
218 unsigned int flags
= commit
->object
.flags
;
220 if (!(flags
& (TREESAME
| UNINTERESTING
)))
226 static void show_early_header(struct rev_info
*rev
, const char *stage
, int nr
)
228 if (rev
->shown_one
) {
230 if (rev
->commit_format
!= CMIT_FMT_ONELINE
)
231 putchar(rev
->diffopt
.line_termination
);
233 printf(_("Final output: %d %s\n"), nr
, stage
);
236 static struct itimerval early_output_timer
;
238 static void log_show_early(struct rev_info
*revs
, struct commit_list
*list
)
240 int i
= revs
->early_output
;
243 sort_in_topological_order(&list
, revs
->sort_order
);
245 struct commit
*commit
= list
->item
;
246 switch (simplify_commit(revs
, commit
)) {
249 int n
= estimate_commit_count(revs
, list
);
250 show_early_header(revs
, "incomplete", n
);
253 log_tree_commit(revs
, commit
);
264 /* Did we already get enough commits for the early output? */
269 * ..if no, then repeat it twice a second until we
272 * NOTE! We don't use "it_interval", because if the
273 * reader isn't listening, we want our output to be
274 * throttled by the writing, and not have the timer
275 * trigger every second even if we're blocked on a
278 early_output_timer
.it_value
.tv_sec
= 0;
279 early_output_timer
.it_value
.tv_usec
= 500000;
280 setitimer(ITIMER_REAL
, &early_output_timer
, NULL
);
283 static void early_output(int signal
)
285 show_early_output
= log_show_early
;
288 static void setup_early_output(struct rev_info
*rev
)
293 * Set up the signal handler, minimally intrusively:
294 * we only set a single volatile integer word (not
295 * using sigatomic_t - trying to avoid unnecessary
296 * system dependencies and headers), and using
299 memset(&sa
, 0, sizeof(sa
));
300 sa
.sa_handler
= early_output
;
301 sigemptyset(&sa
.sa_mask
);
302 sa
.sa_flags
= SA_RESTART
;
303 sigaction(SIGALRM
, &sa
, NULL
);
306 * If we can get the whole output in less than a
307 * tenth of a second, don't even bother doing the
308 * early-output thing..
310 * This is a one-time-only trigger.
312 early_output_timer
.it_value
.tv_sec
= 0;
313 early_output_timer
.it_value
.tv_usec
= 100000;
314 setitimer(ITIMER_REAL
, &early_output_timer
, NULL
);
317 static void finish_early_output(struct rev_info
*rev
)
319 int n
= estimate_commit_count(rev
, rev
->commits
);
320 signal(SIGALRM
, SIG_IGN
);
321 show_early_header(rev
, "done", n
);
324 static int cmd_log_walk(struct rev_info
*rev
)
326 struct commit
*commit
;
330 if (rev
->early_output
)
331 setup_early_output(rev
);
333 if (prepare_revision_walk(rev
))
334 die(_("revision walk setup failed"));
336 if (rev
->early_output
)
337 finish_early_output(rev
);
340 * For --check and --exit-code, the exit code is based on CHECK_FAILED
341 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
342 * retain that state information if replacing rev->diffopt in this loop
344 while ((commit
= get_revision(rev
)) != NULL
) {
345 if (!log_tree_commit(rev
, commit
) && rev
->max_count
>= 0)
347 * We decremented max_count in get_revision,
348 * but we didn't actually show the commit.
351 if (!rev
->reflog_info
) {
352 /* we allow cycles in reflog ancestry */
353 free_commit_buffer(commit
);
355 free_commit_list(commit
->parents
);
356 commit
->parents
= NULL
;
357 if (saved_nrl
< rev
->diffopt
.needed_rename_limit
)
358 saved_nrl
= rev
->diffopt
.needed_rename_limit
;
359 if (rev
->diffopt
.degraded_cc_to_c
)
362 rev
->diffopt
.degraded_cc_to_c
= saved_dcctc
;
363 rev
->diffopt
.needed_rename_limit
= saved_nrl
;
365 if (rev
->diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
&&
366 DIFF_OPT_TST(&rev
->diffopt
, CHECK_FAILED
)) {
369 return diff_result_code(&rev
->diffopt
, 0);
372 static int git_log_config(const char *var
, const char *value
, void *cb
)
374 const char *slot_name
;
376 if (!strcmp(var
, "format.pretty"))
377 return git_config_string(&fmt_pretty
, var
, value
);
378 if (!strcmp(var
, "format.subjectprefix"))
379 return git_config_string(&fmt_patch_subject_prefix
, var
, value
);
380 if (!strcmp(var
, "log.abbrevcommit")) {
381 default_abbrev_commit
= git_config_bool(var
, value
);
384 if (!strcmp(var
, "log.date"))
385 return git_config_string(&default_date_mode
, var
, value
);
386 if (!strcmp(var
, "log.decorate")) {
387 decoration_style
= parse_decoration_style(var
, value
);
388 if (decoration_style
< 0)
389 decoration_style
= 0; /* maybe warn? */
392 if (!strcmp(var
, "log.showroot")) {
393 default_show_root
= git_config_bool(var
, value
);
396 if (!strcmp(var
, "log.follow")) {
397 default_follow
= git_config_bool(var
, value
);
400 if (skip_prefix(var
, "color.decorate.", &slot_name
))
401 return parse_decorate_color_config(var
, slot_name
, value
);
402 if (!strcmp(var
, "log.mailmap")) {
403 use_mailmap_config
= git_config_bool(var
, value
);
407 if (grep_config(var
, value
, cb
) < 0)
409 if (git_gpg_config(var
, value
, cb
) < 0)
411 return git_diff_ui_config(var
, value
, cb
);
414 int cmd_whatchanged(int argc
, const char **argv
, const char *prefix
)
417 struct setup_revision_opt opt
;
419 init_grep_defaults();
420 git_config(git_log_config
, NULL
);
422 init_revisions(&rev
, prefix
);
424 rev
.simplify_history
= 0;
425 memset(&opt
, 0, sizeof(opt
));
427 opt
.revarg_opt
= REVARG_COMMITTISH
;
428 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
429 if (!rev
.diffopt
.output_format
)
430 rev
.diffopt
.output_format
= DIFF_FORMAT_RAW
;
431 return cmd_log_walk(&rev
);
434 static void show_tagger(char *buf
, int len
, struct rev_info
*rev
)
436 struct strbuf out
= STRBUF_INIT
;
437 struct pretty_print_context pp
= {0};
439 pp
.fmt
= rev
->commit_format
;
440 pp
.date_mode
= rev
->date_mode
;
441 pp_user_info(&pp
, "Tagger", &out
, buf
, get_log_output_encoding());
442 printf("%s", out
.buf
);
443 strbuf_release(&out
);
446 static int show_blob_object(const unsigned char *sha1
, struct rev_info
*rev
, const char *obj_name
)
448 unsigned char sha1c
[20];
449 struct object_context obj_context
;
454 if (!DIFF_OPT_TOUCHED(&rev
->diffopt
, ALLOW_TEXTCONV
) ||
455 !DIFF_OPT_TST(&rev
->diffopt
, ALLOW_TEXTCONV
))
456 return stream_blob_to_fd(1, sha1
, NULL
, 0);
458 if (get_sha1_with_context(obj_name
, 0, sha1c
, &obj_context
))
459 die(_("Not a valid object name %s"), obj_name
);
460 if (!obj_context
.path
[0] ||
461 !textconv_object(obj_context
.path
, obj_context
.mode
, sha1c
, 1, &buf
, &size
))
462 return stream_blob_to_fd(1, sha1
, NULL
, 0);
465 die(_("git show %s: bad file"), obj_name
);
467 write_or_die(1, buf
, size
);
471 static int show_tag_object(const unsigned char *sha1
, struct rev_info
*rev
)
474 enum object_type type
;
475 char *buf
= read_sha1_file(sha1
, &type
, &size
);
479 return error(_("Could not read object %s"), sha1_to_hex(sha1
));
481 assert(type
== OBJ_TAG
);
482 while (offset
< size
&& buf
[offset
] != '\n') {
483 int new_offset
= offset
+ 1;
484 while (new_offset
< size
&& buf
[new_offset
++] != '\n')
486 if (starts_with(buf
+ offset
, "tagger "))
487 show_tagger(buf
+ offset
+ 7,
488 new_offset
- offset
- 7, rev
);
493 fwrite(buf
+ offset
, size
- offset
, 1, stdout
);
498 static int show_tree_object(const unsigned char *sha1
,
500 const char *pathname
, unsigned mode
, int stage
, void *context
)
502 printf("%s%s\n", pathname
, S_ISDIR(mode
) ? "/" : "");
506 static void show_setup_revisions_tweak(struct rev_info
*rev
,
507 struct setup_revision_opt
*opt
)
509 if (rev
->ignore_merges
) {
510 /* There was no "-m" on the command line */
511 rev
->ignore_merges
= 0;
512 if (!rev
->first_parent_only
&& !rev
->combine_merges
) {
513 /* No "--first-parent", "-c", or "--cc" */
514 rev
->combine_merges
= 1;
515 rev
->dense_combined_merges
= 1;
518 if (!rev
->diffopt
.output_format
)
519 rev
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
522 int cmd_show(int argc
, const char **argv
, const char *prefix
)
525 struct object_array_entry
*objects
;
526 struct setup_revision_opt opt
;
527 struct pathspec match_all
;
528 int i
, count
, ret
= 0;
530 init_grep_defaults();
531 git_config(git_log_config
, NULL
);
533 memset(&match_all
, 0, sizeof(match_all
));
534 init_revisions(&rev
, prefix
);
536 rev
.always_show_header
= 1;
537 rev
.no_walk
= REVISION_WALK_NO_WALK_SORTED
;
538 rev
.diffopt
.stat_width
= -1; /* Scale to real terminal size */
540 memset(&opt
, 0, sizeof(opt
));
542 opt
.tweak
= show_setup_revisions_tweak
;
543 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
546 return cmd_log_walk(&rev
);
548 count
= rev
.pending
.nr
;
549 objects
= rev
.pending
.objects
;
550 for (i
= 0; i
< count
&& !ret
; i
++) {
551 struct object
*o
= objects
[i
].item
;
552 const char *name
= objects
[i
].name
;
555 ret
= show_blob_object(o
->oid
.hash
, &rev
, name
);
558 struct tag
*t
= (struct tag
*)o
;
562 printf("%stag %s%s\n",
563 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
565 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
566 ret
= show_tag_object(o
->oid
.hash
, &rev
);
570 o
= parse_object(t
->tagged
->oid
.hash
);
572 ret
= error(_("Could not read object %s"),
573 oid_to_hex(&t
->tagged
->oid
));
581 printf("%stree %s%s\n\n",
582 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
584 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
585 read_tree_recursive((struct tree
*)o
, "", 0, 0, &match_all
,
586 show_tree_object
, NULL
);
590 rev
.pending
.nr
= rev
.pending
.alloc
= 0;
591 rev
.pending
.objects
= NULL
;
592 add_object_array(o
, name
, &rev
.pending
);
593 ret
= cmd_log_walk(&rev
);
596 ret
= error(_("Unknown type: %d"), o
->type
);
604 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
606 int cmd_log_reflog(int argc
, const char **argv
, const char *prefix
)
609 struct setup_revision_opt opt
;
611 init_grep_defaults();
612 git_config(git_log_config
, NULL
);
614 init_revisions(&rev
, prefix
);
615 init_reflog_walk(&rev
.reflog_info
);
616 rev
.verbose_header
= 1;
617 memset(&opt
, 0, sizeof(opt
));
619 cmd_log_init_defaults(&rev
);
620 rev
.abbrev_commit
= 1;
621 rev
.commit_format
= CMIT_FMT_ONELINE
;
622 rev
.use_terminator
= 1;
623 rev
.always_show_header
= 1;
624 cmd_log_init_finish(argc
, argv
, prefix
, &rev
, &opt
);
626 return cmd_log_walk(&rev
);
629 static void log_setup_revisions_tweak(struct rev_info
*rev
,
630 struct setup_revision_opt
*opt
)
632 if (DIFF_OPT_TST(&rev
->diffopt
, DEFAULT_FOLLOW_RENAMES
) &&
633 rev
->prune_data
.nr
== 1)
634 DIFF_OPT_SET(&rev
->diffopt
, FOLLOW_RENAMES
);
636 /* Turn --cc/-c into -p --cc/-c when -p was not given */
637 if (!rev
->diffopt
.output_format
&& rev
->combine_merges
)
638 rev
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
640 /* Turn -m on when --cc/-c was given */
641 if (rev
->combine_merges
)
642 rev
->ignore_merges
= 0;
645 int cmd_log(int argc
, const char **argv
, const char *prefix
)
648 struct setup_revision_opt opt
;
650 init_grep_defaults();
651 git_config(git_log_config
, NULL
);
653 init_revisions(&rev
, prefix
);
654 rev
.always_show_header
= 1;
655 memset(&opt
, 0, sizeof(opt
));
657 opt
.revarg_opt
= REVARG_COMMITTISH
;
658 opt
.tweak
= log_setup_revisions_tweak
;
659 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
660 return cmd_log_walk(&rev
);
665 static const char *fmt_patch_suffix
= ".patch";
666 static int numbered
= 0;
667 static int auto_number
= 1;
669 static char *default_attach
= NULL
;
671 static struct string_list extra_hdr
;
672 static struct string_list extra_to
;
673 static struct string_list extra_cc
;
675 static void add_header(const char *value
)
677 struct string_list_item
*item
;
678 int len
= strlen(value
);
679 while (len
&& value
[len
- 1] == '\n')
682 if (!strncasecmp(value
, "to: ", 4)) {
683 item
= string_list_append(&extra_to
, value
+ 4);
685 } else if (!strncasecmp(value
, "cc: ", 4)) {
686 item
= string_list_append(&extra_cc
, value
+ 4);
689 item
= string_list_append(&extra_hdr
, value
);
692 item
->string
[len
] = '\0';
695 #define THREAD_SHALLOW 1
696 #define THREAD_DEEP 2
698 static int do_signoff
;
699 static const char *signature
= git_version_string
;
700 static const char *signature_file
;
701 static int config_cover_letter
;
710 static int git_format_config(const char *var
, const char *value
, void *cb
)
712 if (!strcmp(var
, "format.headers")) {
714 die(_("format.headers without value"));
718 if (!strcmp(var
, "format.suffix"))
719 return git_config_string(&fmt_patch_suffix
, var
, value
);
720 if (!strcmp(var
, "format.to")) {
722 return config_error_nonbool(var
);
723 string_list_append(&extra_to
, value
);
726 if (!strcmp(var
, "format.cc")) {
728 return config_error_nonbool(var
);
729 string_list_append(&extra_cc
, value
);
732 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff") ||
733 !strcmp(var
, "color.ui") || !strcmp(var
, "diff.submodule")) {
736 if (!strcmp(var
, "format.numbered")) {
737 if (value
&& !strcasecmp(value
, "auto")) {
741 numbered
= git_config_bool(var
, value
);
742 auto_number
= auto_number
&& numbered
;
745 if (!strcmp(var
, "format.attach")) {
747 default_attach
= xstrdup(value
);
749 default_attach
= xstrdup(git_version_string
);
752 if (!strcmp(var
, "format.thread")) {
753 if (value
&& !strcasecmp(value
, "deep")) {
754 thread
= THREAD_DEEP
;
757 if (value
&& !strcasecmp(value
, "shallow")) {
758 thread
= THREAD_SHALLOW
;
761 thread
= git_config_bool(var
, value
) && THREAD_SHALLOW
;
764 if (!strcmp(var
, "format.signoff")) {
765 do_signoff
= git_config_bool(var
, value
);
768 if (!strcmp(var
, "format.signature"))
769 return git_config_string(&signature
, var
, value
);
770 if (!strcmp(var
, "format.signaturefile"))
771 return git_config_pathname(&signature_file
, var
, value
);
772 if (!strcmp(var
, "format.coverletter")) {
773 if (value
&& !strcasecmp(value
, "auto")) {
774 config_cover_letter
= COVER_AUTO
;
777 config_cover_letter
= git_config_bool(var
, value
) ? COVER_ON
: COVER_OFF
;
781 return git_log_config(var
, value
, cb
);
784 static FILE *realstdout
= NULL
;
785 static const char *output_directory
= NULL
;
786 static int outdir_offset
;
788 static int reopen_stdout(struct commit
*commit
, const char *subject
,
789 struct rev_info
*rev
, int quiet
)
791 struct strbuf filename
= STRBUF_INIT
;
792 int suffix_len
= strlen(rev
->patch_suffix
) + 1;
794 if (output_directory
) {
795 strbuf_addstr(&filename
, output_directory
);
797 PATH_MAX
- FORMAT_PATCH_NAME_MAX
- suffix_len
)
798 return error(_("name of output directory is too long"));
799 strbuf_complete(&filename
, '/');
802 if (rev
->numbered_files
)
803 strbuf_addf(&filename
, "%d", rev
->nr
);
805 fmt_output_commit(&filename
, commit
, rev
);
807 fmt_output_subject(&filename
, subject
, rev
);
810 fprintf(realstdout
, "%s\n", filename
.buf
+ outdir_offset
);
812 if (freopen(filename
.buf
, "w", stdout
) == NULL
)
813 return error(_("Cannot open patch file %s"), filename
.buf
);
815 strbuf_release(&filename
);
819 static void get_patch_ids(struct rev_info
*rev
, struct patch_ids
*ids
)
821 struct rev_info check_rev
;
822 struct commit
*commit
, *c1
, *c2
;
823 struct object
*o1
, *o2
;
824 unsigned flags1
, flags2
;
826 if (rev
->pending
.nr
!= 2)
827 die(_("Need exactly one range."));
829 o1
= rev
->pending
.objects
[0].item
;
830 o2
= rev
->pending
.objects
[1].item
;
833 c1
= lookup_commit_reference(o1
->oid
.hash
);
834 c2
= lookup_commit_reference(o2
->oid
.hash
);
836 if ((flags1
& UNINTERESTING
) == (flags2
& UNINTERESTING
))
837 die(_("Not a range."));
841 /* given a range a..b get all patch ids for b..a */
842 init_revisions(&check_rev
, rev
->prefix
);
843 check_rev
.max_parents
= 1;
844 o1
->flags
^= UNINTERESTING
;
845 o2
->flags
^= UNINTERESTING
;
846 add_pending_object(&check_rev
, o1
, "o1");
847 add_pending_object(&check_rev
, o2
, "o2");
848 if (prepare_revision_walk(&check_rev
))
849 die(_("revision walk setup failed"));
851 while ((commit
= get_revision(&check_rev
)) != NULL
) {
852 add_commit_patch_id(commit
, ids
);
855 /* reset for next revision walk */
856 clear_commit_marks(c1
, SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
857 clear_commit_marks(c2
, SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
862 static void gen_message_id(struct rev_info
*info
, char *base
)
864 struct strbuf buf
= STRBUF_INIT
;
865 strbuf_addf(&buf
, "%s.%lu.git.%s", base
,
866 (unsigned long) time(NULL
),
867 git_committer_info(IDENT_NO_NAME
|IDENT_NO_DATE
|IDENT_STRICT
));
868 info
->message_id
= strbuf_detach(&buf
, NULL
);
871 static void print_signature(void)
873 if (!signature
|| !*signature
)
876 printf("-- \n%s", signature
);
877 if (signature
[strlen(signature
)-1] != '\n')
882 static void add_branch_description(struct strbuf
*buf
, const char *branch_name
)
884 struct strbuf desc
= STRBUF_INIT
;
885 if (!branch_name
|| !*branch_name
)
887 read_branch_desc(&desc
, branch_name
);
889 strbuf_addch(buf
, '\n');
890 strbuf_addbuf(buf
, &desc
);
891 strbuf_addch(buf
, '\n');
893 strbuf_release(&desc
);
896 static char *find_branch_name(struct rev_info
*rev
)
898 int i
, positive
= -1;
899 struct object_id branch_oid
;
900 const struct object_id
*tip_oid
;
902 char *full_ref
, *branch
= NULL
;
904 for (i
= 0; i
< rev
->cmdline
.nr
; i
++) {
905 if (rev
->cmdline
.rev
[i
].flags
& UNINTERESTING
)
914 ref
= rev
->cmdline
.rev
[positive
].name
;
915 tip_oid
= &rev
->cmdline
.rev
[positive
].item
->oid
;
916 if (dwim_ref(ref
, strlen(ref
), branch_oid
.hash
, &full_ref
) &&
917 skip_prefix(full_ref
, "refs/heads/", &v
) &&
918 !oidcmp(tip_oid
, &branch_oid
))
924 static void make_cover_letter(struct rev_info
*rev
, int use_stdout
,
925 struct commit
*origin
,
926 int nr
, struct commit
**list
,
927 const char *branch_name
,
930 const char *committer
;
931 const char *body
= "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
934 struct strbuf sb
= STRBUF_INIT
;
936 const char *encoding
= "UTF-8";
937 struct diff_options opts
;
938 int need_8bit_cte
= 0;
939 struct pretty_print_context pp
= {0};
940 struct commit
*head
= list
[0];
942 if (rev
->commit_format
!= CMIT_FMT_EMAIL
)
943 die(_("Cover letter needs email format"));
945 committer
= git_committer_info(0);
948 reopen_stdout(NULL
, rev
->numbered_files
? NULL
: "cover-letter", rev
, quiet
))
951 log_write_email_headers(rev
, head
, &pp
.subject
, &pp
.after_subject
,
954 for (i
= 0; !need_8bit_cte
&& i
< nr
; i
++) {
955 const char *buf
= get_commit_buffer(list
[i
], NULL
);
956 if (has_non_ascii(buf
))
958 unuse_commit_buffer(list
[i
], buf
);
962 branch_name
= find_branch_name(rev
);
965 pp
.fmt
= CMIT_FMT_EMAIL
;
966 pp
.date_mode
.type
= DATE_RFC2822
;
967 pp_user_info(&pp
, NULL
, &sb
, committer
, encoding
);
968 pp_title_line(&pp
, &msg
, &sb
, encoding
, need_8bit_cte
);
969 pp_remainder(&pp
, &msg
, &sb
, 0);
970 add_branch_description(&sb
, branch_name
);
971 printf("%s\n", sb
.buf
);
980 for (i
= 0; i
< nr
; i
++)
981 shortlog_add_commit(&log
, list
[i
]);
983 shortlog_output(&log
);
986 * We can only do diffstat with a unique reference point
991 memcpy(&opts
, &rev
->diffopt
, sizeof(opts
));
992 opts
.output_format
= DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
994 diff_setup_done(&opts
);
996 diff_tree_sha1(origin
->tree
->object
.oid
.hash
,
997 head
->tree
->object
.oid
.hash
,
1006 static const char *clean_message_id(const char *msg_id
)
1009 const char *a
, *z
, *m
;
1012 while ((ch
= *m
) && (isspace(ch
) || (ch
== '<')))
1017 if (!isspace(ch
) && (ch
!= '>'))
1022 die(_("insane in-reply-to: %s"), msg_id
);
1025 return xmemdupz(a
, z
- a
);
1028 static const char *set_outdir(const char *prefix
, const char *output_directory
)
1030 if (output_directory
&& is_absolute_path(output_directory
))
1031 return output_directory
;
1033 if (!prefix
|| !*prefix
) {
1034 if (output_directory
)
1035 return output_directory
;
1036 /* The user did not explicitly ask for "./" */
1041 outdir_offset
= strlen(prefix
);
1042 if (!output_directory
)
1045 return xstrdup(prefix_filename(prefix
, outdir_offset
,
1049 static const char * const builtin_format_patch_usage
[] = {
1050 N_("git format-patch [<options>] [<since> | <revision-range>]"),
1054 static int keep_subject
= 0;
1056 static int keep_callback(const struct option
*opt
, const char *arg
, int unset
)
1058 ((struct rev_info
*)opt
->value
)->total
= -1;
1063 static int subject_prefix
= 0;
1065 static int subject_prefix_callback(const struct option
*opt
, const char *arg
,
1069 ((struct rev_info
*)opt
->value
)->subject_prefix
= arg
;
1073 static int numbered_cmdline_opt
= 0;
1075 static int numbered_callback(const struct option
*opt
, const char *arg
,
1078 *(int *)opt
->value
= numbered_cmdline_opt
= unset
? 0 : 1;
1084 static int no_numbered_callback(const struct option
*opt
, const char *arg
,
1087 return numbered_callback(opt
, arg
, 1);
1090 static int output_directory_callback(const struct option
*opt
, const char *arg
,
1093 const char **dir
= (const char **)opt
->value
;
1095 die(_("Two output directories?"));
1100 static int thread_callback(const struct option
*opt
, const char *arg
, int unset
)
1102 int *thread
= (int *)opt
->value
;
1105 else if (!arg
|| !strcmp(arg
, "shallow"))
1106 *thread
= THREAD_SHALLOW
;
1107 else if (!strcmp(arg
, "deep"))
1108 *thread
= THREAD_DEEP
;
1114 static int attach_callback(const struct option
*opt
, const char *arg
, int unset
)
1116 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1118 rev
->mime_boundary
= NULL
;
1120 rev
->mime_boundary
= arg
;
1122 rev
->mime_boundary
= git_version_string
;
1123 rev
->no_inline
= unset
? 0 : 1;
1127 static int inline_callback(const struct option
*opt
, const char *arg
, int unset
)
1129 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1131 rev
->mime_boundary
= NULL
;
1133 rev
->mime_boundary
= arg
;
1135 rev
->mime_boundary
= git_version_string
;
1140 static int header_callback(const struct option
*opt
, const char *arg
, int unset
)
1143 string_list_clear(&extra_hdr
, 0);
1144 string_list_clear(&extra_to
, 0);
1145 string_list_clear(&extra_cc
, 0);
1152 static int to_callback(const struct option
*opt
, const char *arg
, int unset
)
1155 string_list_clear(&extra_to
, 0);
1157 string_list_append(&extra_to
, arg
);
1161 static int cc_callback(const struct option
*opt
, const char *arg
, int unset
)
1164 string_list_clear(&extra_cc
, 0);
1166 string_list_append(&extra_cc
, arg
);
1170 static int from_callback(const struct option
*opt
, const char *arg
, int unset
)
1172 char **from
= opt
->value
;
1179 *from
= xstrdup(arg
);
1181 *from
= xstrdup(git_committer_info(IDENT_NO_DATE
));
1185 int cmd_format_patch(int argc
, const char **argv
, const char *prefix
)
1187 struct commit
*commit
;
1188 struct commit
**list
= NULL
;
1189 struct rev_info rev
;
1190 struct setup_revision_opt s_r_opt
;
1191 int nr
= 0, total
, i
;
1193 int start_number
= -1;
1194 int just_numbers
= 0;
1195 int ignore_if_in_upstream
= 0;
1196 int cover_letter
= -1;
1197 int boundary_count
= 0;
1198 int no_binary_diff
= 0;
1199 struct commit
*origin
= NULL
;
1200 const char *in_reply_to
= NULL
;
1201 struct patch_ids ids
;
1202 struct strbuf buf
= STRBUF_INIT
;
1203 int use_patch_format
= 0;
1205 int reroll_count
= -1;
1206 char *branch_name
= NULL
;
1208 const struct option builtin_format_patch_options
[] = {
1209 { OPTION_CALLBACK
, 'n', "numbered", &numbered
, NULL
,
1210 N_("use [PATCH n/m] even with a single patch"),
1211 PARSE_OPT_NOARG
, numbered_callback
},
1212 { OPTION_CALLBACK
, 'N', "no-numbered", &numbered
, NULL
,
1213 N_("use [PATCH] even with multiple patches"),
1214 PARSE_OPT_NOARG
, no_numbered_callback
},
1215 OPT_BOOL('s', "signoff", &do_signoff
, N_("add Signed-off-by:")),
1216 OPT_BOOL(0, "stdout", &use_stdout
,
1217 N_("print patches to standard out")),
1218 OPT_BOOL(0, "cover-letter", &cover_letter
,
1219 N_("generate a cover letter")),
1220 OPT_BOOL(0, "numbered-files", &just_numbers
,
1221 N_("use simple number sequence for output file names")),
1222 OPT_STRING(0, "suffix", &fmt_patch_suffix
, N_("sfx"),
1223 N_("use <sfx> instead of '.patch'")),
1224 OPT_INTEGER(0, "start-number", &start_number
,
1225 N_("start numbering patches at <n> instead of 1")),
1226 OPT_INTEGER('v', "reroll-count", &reroll_count
,
1227 N_("mark the series as Nth re-roll")),
1228 { OPTION_CALLBACK
, 0, "subject-prefix", &rev
, N_("prefix"),
1229 N_("Use [<prefix>] instead of [PATCH]"),
1230 PARSE_OPT_NONEG
, subject_prefix_callback
},
1231 { OPTION_CALLBACK
, 'o', "output-directory", &output_directory
,
1232 N_("dir"), N_("store resulting files in <dir>"),
1233 PARSE_OPT_NONEG
, output_directory_callback
},
1234 { OPTION_CALLBACK
, 'k', "keep-subject", &rev
, NULL
,
1235 N_("don't strip/add [PATCH]"),
1236 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, keep_callback
},
1237 OPT_BOOL(0, "no-binary", &no_binary_diff
,
1238 N_("don't output binary diffs")),
1239 OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream
,
1240 N_("don't include a patch matching a commit upstream")),
1241 { OPTION_SET_INT
, 'p', "no-stat", &use_patch_format
, NULL
,
1242 N_("show patch format instead of default (patch + stat)"),
1243 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
, NULL
, 1},
1244 OPT_GROUP(N_("Messaging")),
1245 { OPTION_CALLBACK
, 0, "add-header", NULL
, N_("header"),
1246 N_("add email header"), 0, header_callback
},
1247 { OPTION_CALLBACK
, 0, "to", NULL
, N_("email"), N_("add To: header"),
1249 { OPTION_CALLBACK
, 0, "cc", NULL
, N_("email"), N_("add Cc: header"),
1251 { OPTION_CALLBACK
, 0, "from", &from
, N_("ident"),
1252 N_("set From address to <ident> (or committer ident if absent)"),
1253 PARSE_OPT_OPTARG
, from_callback
},
1254 OPT_STRING(0, "in-reply-to", &in_reply_to
, N_("message-id"),
1255 N_("make first mail a reply to <message-id>")),
1256 { OPTION_CALLBACK
, 0, "attach", &rev
, N_("boundary"),
1257 N_("attach the patch"), PARSE_OPT_OPTARG
,
1259 { OPTION_CALLBACK
, 0, "inline", &rev
, N_("boundary"),
1260 N_("inline the patch"),
1261 PARSE_OPT_OPTARG
| PARSE_OPT_NONEG
,
1263 { OPTION_CALLBACK
, 0, "thread", &thread
, N_("style"),
1264 N_("enable message threading, styles: shallow, deep"),
1265 PARSE_OPT_OPTARG
, thread_callback
},
1266 OPT_STRING(0, "signature", &signature
, N_("signature"),
1267 N_("add a signature")),
1268 OPT_FILENAME(0, "signature-file", &signature_file
,
1269 N_("add a signature from a file")),
1270 OPT__QUIET(&quiet
, N_("don't print the patch filenames")),
1274 extra_hdr
.strdup_strings
= 1;
1275 extra_to
.strdup_strings
= 1;
1276 extra_cc
.strdup_strings
= 1;
1277 init_grep_defaults();
1278 git_config(git_format_config
, NULL
);
1279 init_revisions(&rev
, prefix
);
1280 rev
.commit_format
= CMIT_FMT_EMAIL
;
1281 rev
.verbose_header
= 1;
1283 rev
.max_parents
= 1;
1284 DIFF_OPT_SET(&rev
.diffopt
, RECURSIVE
);
1285 rev
.subject_prefix
= fmt_patch_subject_prefix
;
1286 memset(&s_r_opt
, 0, sizeof(s_r_opt
));
1287 s_r_opt
.def
= "HEAD";
1288 s_r_opt
.revarg_opt
= REVARG_COMMITTISH
;
1290 if (default_attach
) {
1291 rev
.mime_boundary
= default_attach
;
1296 * Parse the arguments before setup_revisions(), or something
1297 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1298 * possibly a valid SHA1.
1300 argc
= parse_options(argc
, argv
, prefix
, builtin_format_patch_options
,
1301 builtin_format_patch_usage
,
1302 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN
|
1303 PARSE_OPT_KEEP_DASHDASH
);
1305 if (0 < reroll_count
) {
1306 struct strbuf sprefix
= STRBUF_INIT
;
1307 strbuf_addf(&sprefix
, "%s v%d",
1308 rev
.subject_prefix
, reroll_count
);
1309 rev
.reroll_count
= reroll_count
;
1310 rev
.subject_prefix
= strbuf_detach(&sprefix
, NULL
);
1313 for (i
= 0; i
< extra_hdr
.nr
; i
++) {
1314 strbuf_addstr(&buf
, extra_hdr
.items
[i
].string
);
1315 strbuf_addch(&buf
, '\n');
1319 strbuf_addstr(&buf
, "To: ");
1320 for (i
= 0; i
< extra_to
.nr
; i
++) {
1322 strbuf_addstr(&buf
, " ");
1323 strbuf_addstr(&buf
, extra_to
.items
[i
].string
);
1324 if (i
+ 1 < extra_to
.nr
)
1325 strbuf_addch(&buf
, ',');
1326 strbuf_addch(&buf
, '\n');
1330 strbuf_addstr(&buf
, "Cc: ");
1331 for (i
= 0; i
< extra_cc
.nr
; i
++) {
1333 strbuf_addstr(&buf
, " ");
1334 strbuf_addstr(&buf
, extra_cc
.items
[i
].string
);
1335 if (i
+ 1 < extra_cc
.nr
)
1336 strbuf_addch(&buf
, ',');
1337 strbuf_addch(&buf
, '\n');
1340 rev
.extra_headers
= strbuf_detach(&buf
, NULL
);
1343 if (split_ident_line(&rev
.from_ident
, from
, strlen(from
)))
1344 die(_("invalid ident line: %s"), from
);
1347 if (start_number
< 0)
1351 * If numbered is set solely due to format.numbered in config,
1352 * and it would conflict with --keep-subject (-k) from the
1353 * command line, reset "numbered".
1355 if (numbered
&& keep_subject
&& !numbered_cmdline_opt
)
1358 if (numbered
&& keep_subject
)
1359 die (_("-n and -k are mutually exclusive."));
1360 if (keep_subject
&& subject_prefix
)
1361 die (_("--subject-prefix and -k are mutually exclusive."));
1362 rev
.preserve_subject
= keep_subject
;
1364 argc
= setup_revisions(argc
, argv
, &rev
, &s_r_opt
);
1366 die (_("unrecognized argument: %s"), argv
[1]);
1368 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME
)
1369 die(_("--name-only does not make sense"));
1370 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME_STATUS
)
1371 die(_("--name-status does not make sense"));
1372 if (rev
.diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
)
1373 die(_("--check does not make sense"));
1375 if (!use_patch_format
&&
1376 (!rev
.diffopt
.output_format
||
1377 rev
.diffopt
.output_format
== DIFF_FORMAT_PATCH
))
1378 rev
.diffopt
.output_format
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_SUMMARY
;
1380 /* Always generate a patch */
1381 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
1383 if (!DIFF_OPT_TST(&rev
.diffopt
, TEXT
) && !no_binary_diff
)
1384 DIFF_OPT_SET(&rev
.diffopt
, BINARY
);
1387 init_display_notes(&rev
.notes_opt
);
1390 output_directory
= set_outdir(prefix
, output_directory
);
1394 if (output_directory
) {
1396 die(_("standard output, or directory, which one?"));
1397 if (mkdir(output_directory
, 0777) < 0 && errno
!= EEXIST
)
1398 die_errno(_("Could not create directory '%s'"),
1402 if (rev
.pending
.nr
== 1) {
1405 if (rev
.max_count
< 0 && !rev
.show_root_diff
) {
1407 * This is traditional behaviour of "git format-patch
1408 * origin" that prepares what the origin side still
1411 rev
.pending
.objects
[0].item
->flags
|= UNINTERESTING
;
1412 add_head_to_pending(&rev
);
1416 * Otherwise, it is "format-patch -22 HEAD", and/or
1417 * "format-patch --root HEAD". The user wants
1418 * get_revision() to do the usual traversal.
1421 if (!strcmp(rev
.pending
.objects
[0].name
, "HEAD"))
1425 unsigned char sha1
[20];
1426 const char *ref
, *v
;
1427 ref
= resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
,
1429 if (ref
&& skip_prefix(ref
, "refs/heads/", &v
))
1430 branch_name
= xstrdup(v
);
1432 branch_name
= xstrdup(""); /* no branch */
1437 * We cannot move this anywhere earlier because we do want to
1438 * know if --root was given explicitly from the command line.
1440 rev
.show_root_diff
= 1;
1442 if (ignore_if_in_upstream
) {
1443 /* Don't say anything if head and upstream are the same. */
1444 if (rev
.pending
.nr
== 2) {
1445 struct object_array_entry
*o
= rev
.pending
.objects
;
1446 if (oidcmp(&o
[0].item
->oid
, &o
[1].item
->oid
) == 0)
1449 get_patch_ids(&rev
, &ids
);
1453 realstdout
= xfdopen(xdup(1), "w");
1455 if (prepare_revision_walk(&rev
))
1456 die(_("revision walk setup failed"));
1458 while ((commit
= get_revision(&rev
)) != NULL
) {
1459 if (commit
->object
.flags
& BOUNDARY
) {
1461 origin
= (boundary_count
== 1) ? commit
: NULL
;
1465 if (ignore_if_in_upstream
&& has_commit_patch_id(commit
, &ids
))
1469 REALLOC_ARRAY(list
, nr
);
1470 list
[nr
- 1] = commit
;
1476 if (!keep_subject
&& auto_number
&& total
> 1)
1479 rev
.total
= total
+ start_number
- 1;
1480 if (cover_letter
== -1) {
1481 if (config_cover_letter
== COVER_AUTO
)
1482 cover_letter
= (total
> 1);
1484 cover_letter
= (config_cover_letter
== COVER_ON
);
1488 ; /* --no-signature inhibits all signatures */
1489 } else if (signature
&& signature
!= git_version_string
) {
1490 ; /* non-default signature already set */
1491 } else if (signature_file
) {
1492 struct strbuf buf
= STRBUF_INIT
;
1494 if (strbuf_read_file(&buf
, signature_file
, 128) < 0)
1495 die_errno(_("unable to read signature file '%s'"), signature_file
);
1496 signature
= strbuf_detach(&buf
, NULL
);
1499 if (in_reply_to
|| thread
|| cover_letter
)
1500 rev
.ref_message_ids
= xcalloc(1, sizeof(struct string_list
));
1502 const char *msgid
= clean_message_id(in_reply_to
);
1503 string_list_append(rev
.ref_message_ids
, msgid
);
1505 rev
.numbered_files
= just_numbers
;
1506 rev
.patch_suffix
= fmt_patch_suffix
;
1509 gen_message_id(&rev
, "cover");
1510 make_cover_letter(&rev
, use_stdout
,
1511 origin
, nr
, list
, branch_name
, quiet
);
1515 rev
.add_signoff
= do_signoff
;
1519 rev
.nr
= total
- nr
+ (start_number
- 1);
1520 /* Make the second and subsequent mails replies to the first */
1522 /* Have we already had a message ID? */
1523 if (rev
.message_id
) {
1525 * For deep threading: make every mail
1526 * a reply to the previous one, no
1527 * matter what other options are set.
1529 * For shallow threading:
1531 * Without --cover-letter and
1532 * --in-reply-to, make every mail a
1533 * reply to the one before.
1535 * With --in-reply-to but no
1536 * --cover-letter, make every mail a
1537 * reply to the <reply-to>.
1539 * With --cover-letter, make every
1540 * mail but the cover letter a reply
1541 * to the cover letter. The cover
1542 * letter is a reply to the
1543 * --in-reply-to, if specified.
1545 if (thread
== THREAD_SHALLOW
1546 && rev
.ref_message_ids
->nr
> 0
1547 && (!cover_letter
|| rev
.nr
> 1))
1548 free(rev
.message_id
);
1550 string_list_append(rev
.ref_message_ids
,
1553 gen_message_id(&rev
, oid_to_hex(&commit
->object
.oid
));
1557 reopen_stdout(rev
.numbered_files
? NULL
: commit
, NULL
, &rev
, quiet
))
1558 die(_("Failed to create output files"));
1559 shown
= log_tree_commit(&rev
, commit
);
1560 free_commit_buffer(commit
);
1562 /* We put one extra blank line between formatted
1563 * patches and this flag is used by log-tree code
1564 * to see if it needs to emit a LF before showing
1565 * the log; when using one file per patch, we do
1566 * not want the extra blank line.
1571 if (rev
.mime_boundary
)
1572 printf("\n--%s%s--\n\n\n",
1573 mime_boundary_leader
,
1583 string_list_clear(&extra_to
, 0);
1584 string_list_clear(&extra_cc
, 0);
1585 string_list_clear(&extra_hdr
, 0);
1586 if (ignore_if_in_upstream
)
1587 free_patch_ids(&ids
);
1591 static int add_pending_commit(const char *arg
, struct rev_info
*revs
, int flags
)
1593 unsigned char sha1
[20];
1594 if (get_sha1(arg
, sha1
) == 0) {
1595 struct commit
*commit
= lookup_commit_reference(sha1
);
1597 commit
->object
.flags
|= flags
;
1598 add_pending_object(revs
, &commit
->object
, arg
);
1605 static const char * const cherry_usage
[] = {
1606 N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"),
1610 static void print_commit(char sign
, struct commit
*commit
, int verbose
,
1614 printf("%c %s\n", sign
,
1615 find_unique_abbrev(commit
->object
.oid
.hash
, abbrev
));
1617 struct strbuf buf
= STRBUF_INIT
;
1618 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &buf
);
1619 printf("%c %s %s\n", sign
,
1620 find_unique_abbrev(commit
->object
.oid
.hash
, abbrev
),
1622 strbuf_release(&buf
);
1626 int cmd_cherry(int argc
, const char **argv
, const char *prefix
)
1628 struct rev_info revs
;
1629 struct patch_ids ids
;
1630 struct commit
*commit
;
1631 struct commit_list
*list
= NULL
;
1632 struct branch
*current_branch
;
1633 const char *upstream
;
1634 const char *head
= "HEAD";
1635 const char *limit
= NULL
;
1636 int verbose
= 0, abbrev
= 0;
1638 struct option options
[] = {
1639 OPT__ABBREV(&abbrev
),
1640 OPT__VERBOSE(&verbose
, N_("be verbose")),
1644 argc
= parse_options(argc
, argv
, prefix
, options
, cherry_usage
, 0);
1657 current_branch
= branch_get(NULL
);
1658 upstream
= branch_get_upstream(current_branch
, NULL
);
1660 fprintf(stderr
, _("Could not find a tracked"
1661 " remote branch, please"
1662 " specify <upstream> manually.\n"));
1663 usage_with_options(cherry_usage
, options
);
1667 init_revisions(&revs
, prefix
);
1668 revs
.max_parents
= 1;
1670 if (add_pending_commit(head
, &revs
, 0))
1671 die(_("Unknown commit %s"), head
);
1672 if (add_pending_commit(upstream
, &revs
, UNINTERESTING
))
1673 die(_("Unknown commit %s"), upstream
);
1675 /* Don't say anything if head and upstream are the same. */
1676 if (revs
.pending
.nr
== 2) {
1677 struct object_array_entry
*o
= revs
.pending
.objects
;
1678 if (oidcmp(&o
[0].item
->oid
, &o
[1].item
->oid
) == 0)
1682 get_patch_ids(&revs
, &ids
);
1684 if (limit
&& add_pending_commit(limit
, &revs
, UNINTERESTING
))
1685 die(_("Unknown commit %s"), limit
);
1687 /* reverse the list of commits */
1688 if (prepare_revision_walk(&revs
))
1689 die(_("revision walk setup failed"));
1690 while ((commit
= get_revision(&revs
)) != NULL
) {
1691 commit_list_insert(commit
, &list
);
1697 commit
= list
->item
;
1698 if (has_commit_patch_id(commit
, &ids
))
1700 print_commit(sign
, commit
, verbose
, abbrev
);
1704 free_patch_ids(&ids
);