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
) &&
348 * We decremented max_count in get_revision,
349 * but we didn't actually show the commit.
352 if (!rev
->reflog_info
) {
353 /* we allow cycles in reflog ancestry */
354 free_commit_buffer(commit
);
356 free_commit_list(commit
->parents
);
357 commit
->parents
= NULL
;
358 if (saved_nrl
< rev
->diffopt
.needed_rename_limit
)
359 saved_nrl
= rev
->diffopt
.needed_rename_limit
;
360 if (rev
->diffopt
.degraded_cc_to_c
)
363 rev
->diffopt
.degraded_cc_to_c
= saved_dcctc
;
364 rev
->diffopt
.needed_rename_limit
= saved_nrl
;
366 if (rev
->diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
&&
367 DIFF_OPT_TST(&rev
->diffopt
, CHECK_FAILED
)) {
370 return diff_result_code(&rev
->diffopt
, 0);
373 static int git_log_config(const char *var
, const char *value
, void *cb
)
375 const char *slot_name
;
377 if (!strcmp(var
, "format.pretty"))
378 return git_config_string(&fmt_pretty
, var
, value
);
379 if (!strcmp(var
, "format.subjectprefix"))
380 return git_config_string(&fmt_patch_subject_prefix
, var
, value
);
381 if (!strcmp(var
, "log.abbrevcommit")) {
382 default_abbrev_commit
= git_config_bool(var
, value
);
385 if (!strcmp(var
, "log.date"))
386 return git_config_string(&default_date_mode
, var
, value
);
387 if (!strcmp(var
, "log.decorate")) {
388 decoration_style
= parse_decoration_style(var
, value
);
389 if (decoration_style
< 0)
390 decoration_style
= 0; /* maybe warn? */
393 if (!strcmp(var
, "log.showroot")) {
394 default_show_root
= git_config_bool(var
, value
);
397 if (!strcmp(var
, "log.follow")) {
398 default_follow
= git_config_bool(var
, value
);
401 if (skip_prefix(var
, "color.decorate.", &slot_name
))
402 return parse_decorate_color_config(var
, slot_name
, value
);
403 if (!strcmp(var
, "log.mailmap")) {
404 use_mailmap_config
= git_config_bool(var
, value
);
408 if (grep_config(var
, value
, cb
) < 0)
410 if (git_gpg_config(var
, value
, cb
) < 0)
412 return git_diff_ui_config(var
, value
, cb
);
415 int cmd_whatchanged(int argc
, const char **argv
, const char *prefix
)
418 struct setup_revision_opt opt
;
420 init_grep_defaults();
421 git_config(git_log_config
, NULL
);
423 init_revisions(&rev
, prefix
);
425 rev
.simplify_history
= 0;
426 memset(&opt
, 0, sizeof(opt
));
428 opt
.revarg_opt
= REVARG_COMMITTISH
;
429 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
430 if (!rev
.diffopt
.output_format
)
431 rev
.diffopt
.output_format
= DIFF_FORMAT_RAW
;
432 return cmd_log_walk(&rev
);
435 static void show_tagger(char *buf
, int len
, struct rev_info
*rev
)
437 struct strbuf out
= STRBUF_INIT
;
438 struct pretty_print_context pp
= {0};
440 pp
.fmt
= rev
->commit_format
;
441 pp
.date_mode
= rev
->date_mode
;
442 pp_user_info(&pp
, "Tagger", &out
, buf
, get_log_output_encoding());
443 printf("%s", out
.buf
);
444 strbuf_release(&out
);
447 static int show_blob_object(const unsigned char *sha1
, struct rev_info
*rev
, const char *obj_name
)
449 unsigned char sha1c
[20];
450 struct object_context obj_context
;
455 if (!DIFF_OPT_TOUCHED(&rev
->diffopt
, ALLOW_TEXTCONV
) ||
456 !DIFF_OPT_TST(&rev
->diffopt
, ALLOW_TEXTCONV
))
457 return stream_blob_to_fd(1, sha1
, NULL
, 0);
459 if (get_sha1_with_context(obj_name
, 0, sha1c
, &obj_context
))
460 die(_("Not a valid object name %s"), obj_name
);
461 if (!obj_context
.path
[0] ||
462 !textconv_object(obj_context
.path
, obj_context
.mode
, sha1c
, 1, &buf
, &size
))
463 return stream_blob_to_fd(1, sha1
, NULL
, 0);
466 die(_("git show %s: bad file"), obj_name
);
468 write_or_die(1, buf
, size
);
472 static int show_tag_object(const unsigned char *sha1
, struct rev_info
*rev
)
475 enum object_type type
;
476 char *buf
= read_sha1_file(sha1
, &type
, &size
);
480 return error(_("Could not read object %s"), sha1_to_hex(sha1
));
482 assert(type
== OBJ_TAG
);
483 while (offset
< size
&& buf
[offset
] != '\n') {
484 int new_offset
= offset
+ 1;
485 while (new_offset
< size
&& buf
[new_offset
++] != '\n')
487 if (starts_with(buf
+ offset
, "tagger "))
488 show_tagger(buf
+ offset
+ 7,
489 new_offset
- offset
- 7, rev
);
494 fwrite(buf
+ offset
, size
- offset
, 1, stdout
);
499 static int show_tree_object(const unsigned char *sha1
,
501 const char *pathname
, unsigned mode
, int stage
, void *context
)
503 printf("%s%s\n", pathname
, S_ISDIR(mode
) ? "/" : "");
507 static void show_setup_revisions_tweak(struct rev_info
*rev
,
508 struct setup_revision_opt
*opt
)
510 if (rev
->ignore_merges
) {
511 /* There was no "-m" on the command line */
512 rev
->ignore_merges
= 0;
513 if (!rev
->first_parent_only
&& !rev
->combine_merges
) {
514 /* No "--first-parent", "-c", or "--cc" */
515 rev
->combine_merges
= 1;
516 rev
->dense_combined_merges
= 1;
519 if (!rev
->diffopt
.output_format
)
520 rev
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
523 int cmd_show(int argc
, const char **argv
, const char *prefix
)
526 struct object_array_entry
*objects
;
527 struct setup_revision_opt opt
;
528 struct pathspec match_all
;
529 int i
, count
, ret
= 0;
531 init_grep_defaults();
532 git_config(git_log_config
, NULL
);
534 memset(&match_all
, 0, sizeof(match_all
));
535 init_revisions(&rev
, prefix
);
537 rev
.always_show_header
= 1;
538 rev
.no_walk
= REVISION_WALK_NO_WALK_SORTED
;
539 rev
.diffopt
.stat_width
= -1; /* Scale to real terminal size */
541 memset(&opt
, 0, sizeof(opt
));
543 opt
.tweak
= show_setup_revisions_tweak
;
544 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
547 return cmd_log_walk(&rev
);
549 count
= rev
.pending
.nr
;
550 objects
= rev
.pending
.objects
;
551 for (i
= 0; i
< count
&& !ret
; i
++) {
552 struct object
*o
= objects
[i
].item
;
553 const char *name
= objects
[i
].name
;
556 ret
= show_blob_object(o
->sha1
, &rev
, name
);
559 struct tag
*t
= (struct tag
*)o
;
563 printf("%stag %s%s\n",
564 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
566 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
567 ret
= show_tag_object(o
->sha1
, &rev
);
571 o
= parse_object(t
->tagged
->sha1
);
573 ret
= error(_("Could not read object %s"),
574 sha1_to_hex(t
->tagged
->sha1
));
582 printf("%stree %s%s\n\n",
583 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
585 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
586 read_tree_recursive((struct tree
*)o
, "", 0, 0, &match_all
,
587 show_tree_object
, NULL
);
591 rev
.pending
.nr
= rev
.pending
.alloc
= 0;
592 rev
.pending
.objects
= NULL
;
593 add_object_array(o
, name
, &rev
.pending
);
594 ret
= cmd_log_walk(&rev
);
597 ret
= error(_("Unknown type: %d"), o
->type
);
605 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
607 int cmd_log_reflog(int argc
, const char **argv
, const char *prefix
)
610 struct setup_revision_opt opt
;
612 init_grep_defaults();
613 git_config(git_log_config
, NULL
);
615 init_revisions(&rev
, prefix
);
616 init_reflog_walk(&rev
.reflog_info
);
617 rev
.verbose_header
= 1;
618 memset(&opt
, 0, sizeof(opt
));
620 cmd_log_init_defaults(&rev
);
621 rev
.abbrev_commit
= 1;
622 rev
.commit_format
= CMIT_FMT_ONELINE
;
623 rev
.use_terminator
= 1;
624 rev
.always_show_header
= 1;
625 cmd_log_init_finish(argc
, argv
, prefix
, &rev
, &opt
);
627 return cmd_log_walk(&rev
);
630 static void log_setup_revisions_tweak(struct rev_info
*rev
,
631 struct setup_revision_opt
*opt
)
633 if (DIFF_OPT_TST(&rev
->diffopt
, DEFAULT_FOLLOW_RENAMES
) &&
634 rev
->prune_data
.nr
== 1)
635 DIFF_OPT_SET(&rev
->diffopt
, FOLLOW_RENAMES
);
638 int cmd_log(int argc
, const char **argv
, const char *prefix
)
641 struct setup_revision_opt opt
;
643 init_grep_defaults();
644 git_config(git_log_config
, NULL
);
646 init_revisions(&rev
, prefix
);
647 rev
.always_show_header
= 1;
648 memset(&opt
, 0, sizeof(opt
));
650 opt
.revarg_opt
= REVARG_COMMITTISH
;
651 opt
.tweak
= log_setup_revisions_tweak
;
652 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
653 return cmd_log_walk(&rev
);
658 static const char *fmt_patch_suffix
= ".patch";
659 static int numbered
= 0;
660 static int auto_number
= 1;
662 static char *default_attach
= NULL
;
664 static struct string_list extra_hdr
;
665 static struct string_list extra_to
;
666 static struct string_list extra_cc
;
668 static void add_header(const char *value
)
670 struct string_list_item
*item
;
671 int len
= strlen(value
);
672 while (len
&& value
[len
- 1] == '\n')
675 if (!strncasecmp(value
, "to: ", 4)) {
676 item
= string_list_append(&extra_to
, value
+ 4);
678 } else if (!strncasecmp(value
, "cc: ", 4)) {
679 item
= string_list_append(&extra_cc
, value
+ 4);
682 item
= string_list_append(&extra_hdr
, value
);
685 item
->string
[len
] = '\0';
688 #define THREAD_SHALLOW 1
689 #define THREAD_DEEP 2
691 static int do_signoff
;
692 static const char *signature
= git_version_string
;
693 static const char *signature_file
;
694 static int config_cover_letter
;
703 static int git_format_config(const char *var
, const char *value
, void *cb
)
705 if (!strcmp(var
, "format.headers")) {
707 die(_("format.headers without value"));
711 if (!strcmp(var
, "format.suffix"))
712 return git_config_string(&fmt_patch_suffix
, var
, value
);
713 if (!strcmp(var
, "format.to")) {
715 return config_error_nonbool(var
);
716 string_list_append(&extra_to
, value
);
719 if (!strcmp(var
, "format.cc")) {
721 return config_error_nonbool(var
);
722 string_list_append(&extra_cc
, value
);
725 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff") ||
726 !strcmp(var
, "color.ui") || !strcmp(var
, "diff.submodule")) {
729 if (!strcmp(var
, "format.numbered")) {
730 if (value
&& !strcasecmp(value
, "auto")) {
734 numbered
= git_config_bool(var
, value
);
735 auto_number
= auto_number
&& numbered
;
738 if (!strcmp(var
, "format.attach")) {
740 default_attach
= xstrdup(value
);
742 default_attach
= xstrdup(git_version_string
);
745 if (!strcmp(var
, "format.thread")) {
746 if (value
&& !strcasecmp(value
, "deep")) {
747 thread
= THREAD_DEEP
;
750 if (value
&& !strcasecmp(value
, "shallow")) {
751 thread
= THREAD_SHALLOW
;
754 thread
= git_config_bool(var
, value
) && THREAD_SHALLOW
;
757 if (!strcmp(var
, "format.signoff")) {
758 do_signoff
= git_config_bool(var
, value
);
761 if (!strcmp(var
, "format.signature"))
762 return git_config_string(&signature
, var
, value
);
763 if (!strcmp(var
, "format.signaturefile"))
764 return git_config_pathname(&signature_file
, var
, value
);
765 if (!strcmp(var
, "format.coverletter")) {
766 if (value
&& !strcasecmp(value
, "auto")) {
767 config_cover_letter
= COVER_AUTO
;
770 config_cover_letter
= git_config_bool(var
, value
) ? COVER_ON
: COVER_OFF
;
774 return git_log_config(var
, value
, cb
);
777 static FILE *realstdout
= NULL
;
778 static const char *output_directory
= NULL
;
779 static int outdir_offset
;
781 static int reopen_stdout(struct commit
*commit
, const char *subject
,
782 struct rev_info
*rev
, int quiet
)
784 struct strbuf filename
= STRBUF_INIT
;
785 int suffix_len
= strlen(rev
->patch_suffix
) + 1;
787 if (output_directory
) {
788 strbuf_addstr(&filename
, output_directory
);
790 PATH_MAX
- FORMAT_PATCH_NAME_MAX
- suffix_len
)
791 return error(_("name of output directory is too long"));
792 if (filename
.buf
[filename
.len
- 1] != '/')
793 strbuf_addch(&filename
, '/');
796 if (rev
->numbered_files
)
797 strbuf_addf(&filename
, "%d", rev
->nr
);
799 fmt_output_commit(&filename
, commit
, rev
);
801 fmt_output_subject(&filename
, subject
, rev
);
804 fprintf(realstdout
, "%s\n", filename
.buf
+ outdir_offset
);
806 if (freopen(filename
.buf
, "w", stdout
) == NULL
)
807 return error(_("Cannot open patch file %s"), filename
.buf
);
809 strbuf_release(&filename
);
813 static void get_patch_ids(struct rev_info
*rev
, struct patch_ids
*ids
)
815 struct rev_info check_rev
;
816 struct commit
*commit
, *c1
, *c2
;
817 struct object
*o1
, *o2
;
818 unsigned flags1
, flags2
;
820 if (rev
->pending
.nr
!= 2)
821 die(_("Need exactly one range."));
823 o1
= rev
->pending
.objects
[0].item
;
824 o2
= rev
->pending
.objects
[1].item
;
827 c1
= lookup_commit_reference(o1
->sha1
);
828 c2
= lookup_commit_reference(o2
->sha1
);
830 if ((flags1
& UNINTERESTING
) == (flags2
& UNINTERESTING
))
831 die(_("Not a range."));
835 /* given a range a..b get all patch ids for b..a */
836 init_revisions(&check_rev
, rev
->prefix
);
837 check_rev
.max_parents
= 1;
838 o1
->flags
^= UNINTERESTING
;
839 o2
->flags
^= UNINTERESTING
;
840 add_pending_object(&check_rev
, o1
, "o1");
841 add_pending_object(&check_rev
, o2
, "o2");
842 if (prepare_revision_walk(&check_rev
))
843 die(_("revision walk setup failed"));
845 while ((commit
= get_revision(&check_rev
)) != NULL
) {
846 add_commit_patch_id(commit
, ids
);
849 /* reset for next revision walk */
850 clear_commit_marks(c1
, SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
851 clear_commit_marks(c2
, SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
856 static void gen_message_id(struct rev_info
*info
, char *base
)
858 struct strbuf buf
= STRBUF_INIT
;
859 strbuf_addf(&buf
, "%s.%lu.git.%s", base
,
860 (unsigned long) time(NULL
),
861 git_committer_info(IDENT_NO_NAME
|IDENT_NO_DATE
|IDENT_STRICT
));
862 info
->message_id
= strbuf_detach(&buf
, NULL
);
865 static void print_signature(void)
867 if (!signature
|| !*signature
)
870 printf("-- \n%s", signature
);
871 if (signature
[strlen(signature
)-1] != '\n')
876 static void add_branch_description(struct strbuf
*buf
, const char *branch_name
)
878 struct strbuf desc
= STRBUF_INIT
;
879 if (!branch_name
|| !*branch_name
)
881 read_branch_desc(&desc
, branch_name
);
883 strbuf_addch(buf
, '\n');
884 strbuf_addbuf(buf
, &desc
);
885 strbuf_addch(buf
, '\n');
887 strbuf_release(&desc
);
890 static char *find_branch_name(struct rev_info
*rev
)
892 int i
, positive
= -1;
893 unsigned char branch_sha1
[20];
894 const unsigned char *tip_sha1
;
896 char *full_ref
, *branch
= NULL
;
898 for (i
= 0; i
< rev
->cmdline
.nr
; i
++) {
899 if (rev
->cmdline
.rev
[i
].flags
& UNINTERESTING
)
908 ref
= rev
->cmdline
.rev
[positive
].name
;
909 tip_sha1
= rev
->cmdline
.rev
[positive
].item
->sha1
;
910 if (dwim_ref(ref
, strlen(ref
), branch_sha1
, &full_ref
) &&
911 skip_prefix(full_ref
, "refs/heads/", &v
) &&
912 !hashcmp(tip_sha1
, branch_sha1
))
918 static void make_cover_letter(struct rev_info
*rev
, int use_stdout
,
919 struct commit
*origin
,
920 int nr
, struct commit
**list
,
921 const char *branch_name
,
924 const char *committer
;
925 const char *body
= "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
928 struct strbuf sb
= STRBUF_INIT
;
930 const char *encoding
= "UTF-8";
931 struct diff_options opts
;
932 int need_8bit_cte
= 0;
933 struct pretty_print_context pp
= {0};
934 struct commit
*head
= list
[0];
936 if (rev
->commit_format
!= CMIT_FMT_EMAIL
)
937 die(_("Cover letter needs email format"));
939 committer
= git_committer_info(0);
942 reopen_stdout(NULL
, rev
->numbered_files
? NULL
: "cover-letter", rev
, quiet
))
945 log_write_email_headers(rev
, head
, &pp
.subject
, &pp
.after_subject
,
948 for (i
= 0; !need_8bit_cte
&& i
< nr
; i
++) {
949 const char *buf
= get_commit_buffer(list
[i
], NULL
);
950 if (has_non_ascii(buf
))
952 unuse_commit_buffer(list
[i
], buf
);
956 branch_name
= find_branch_name(rev
);
959 pp
.fmt
= CMIT_FMT_EMAIL
;
960 pp
.date_mode
.type
= DATE_RFC2822
;
961 pp_user_info(&pp
, NULL
, &sb
, committer
, encoding
);
962 pp_title_line(&pp
, &msg
, &sb
, encoding
, need_8bit_cte
);
963 pp_remainder(&pp
, &msg
, &sb
, 0);
964 add_branch_description(&sb
, branch_name
);
965 printf("%s\n", sb
.buf
);
974 for (i
= 0; i
< nr
; i
++)
975 shortlog_add_commit(&log
, list
[i
]);
977 shortlog_output(&log
);
980 * We can only do diffstat with a unique reference point
985 memcpy(&opts
, &rev
->diffopt
, sizeof(opts
));
986 opts
.output_format
= DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
988 diff_setup_done(&opts
);
990 diff_tree_sha1(origin
->tree
->object
.sha1
,
991 head
->tree
->object
.sha1
,
1000 static const char *clean_message_id(const char *msg_id
)
1003 const char *a
, *z
, *m
;
1006 while ((ch
= *m
) && (isspace(ch
) || (ch
== '<')))
1011 if (!isspace(ch
) && (ch
!= '>'))
1016 die(_("insane in-reply-to: %s"), msg_id
);
1019 return xmemdupz(a
, z
- a
);
1022 static const char *set_outdir(const char *prefix
, const char *output_directory
)
1024 if (output_directory
&& is_absolute_path(output_directory
))
1025 return output_directory
;
1027 if (!prefix
|| !*prefix
) {
1028 if (output_directory
)
1029 return output_directory
;
1030 /* The user did not explicitly ask for "./" */
1035 outdir_offset
= strlen(prefix
);
1036 if (!output_directory
)
1039 return xstrdup(prefix_filename(prefix
, outdir_offset
,
1043 static const char * const builtin_format_patch_usage
[] = {
1044 N_("git format-patch [<options>] [<since> | <revision-range>]"),
1048 static int keep_subject
= 0;
1050 static int keep_callback(const struct option
*opt
, const char *arg
, int unset
)
1052 ((struct rev_info
*)opt
->value
)->total
= -1;
1057 static int subject_prefix
= 0;
1059 static int subject_prefix_callback(const struct option
*opt
, const char *arg
,
1063 ((struct rev_info
*)opt
->value
)->subject_prefix
= arg
;
1067 static int numbered_cmdline_opt
= 0;
1069 static int numbered_callback(const struct option
*opt
, const char *arg
,
1072 *(int *)opt
->value
= numbered_cmdline_opt
= unset
? 0 : 1;
1078 static int no_numbered_callback(const struct option
*opt
, const char *arg
,
1081 return numbered_callback(opt
, arg
, 1);
1084 static int output_directory_callback(const struct option
*opt
, const char *arg
,
1087 const char **dir
= (const char **)opt
->value
;
1089 die(_("Two output directories?"));
1094 static int thread_callback(const struct option
*opt
, const char *arg
, int unset
)
1096 int *thread
= (int *)opt
->value
;
1099 else if (!arg
|| !strcmp(arg
, "shallow"))
1100 *thread
= THREAD_SHALLOW
;
1101 else if (!strcmp(arg
, "deep"))
1102 *thread
= THREAD_DEEP
;
1108 static int attach_callback(const struct option
*opt
, const char *arg
, int unset
)
1110 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1112 rev
->mime_boundary
= NULL
;
1114 rev
->mime_boundary
= arg
;
1116 rev
->mime_boundary
= git_version_string
;
1117 rev
->no_inline
= unset
? 0 : 1;
1121 static int inline_callback(const struct option
*opt
, const char *arg
, int unset
)
1123 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1125 rev
->mime_boundary
= NULL
;
1127 rev
->mime_boundary
= arg
;
1129 rev
->mime_boundary
= git_version_string
;
1134 static int header_callback(const struct option
*opt
, const char *arg
, int unset
)
1137 string_list_clear(&extra_hdr
, 0);
1138 string_list_clear(&extra_to
, 0);
1139 string_list_clear(&extra_cc
, 0);
1146 static int to_callback(const struct option
*opt
, const char *arg
, int unset
)
1149 string_list_clear(&extra_to
, 0);
1151 string_list_append(&extra_to
, arg
);
1155 static int cc_callback(const struct option
*opt
, const char *arg
, int unset
)
1158 string_list_clear(&extra_cc
, 0);
1160 string_list_append(&extra_cc
, arg
);
1164 static int from_callback(const struct option
*opt
, const char *arg
, int unset
)
1166 char **from
= opt
->value
;
1173 *from
= xstrdup(arg
);
1175 *from
= xstrdup(git_committer_info(IDENT_NO_DATE
));
1179 int cmd_format_patch(int argc
, const char **argv
, const char *prefix
)
1181 struct commit
*commit
;
1182 struct commit
**list
= NULL
;
1183 struct rev_info rev
;
1184 struct setup_revision_opt s_r_opt
;
1185 int nr
= 0, total
, i
;
1187 int start_number
= -1;
1188 int just_numbers
= 0;
1189 int ignore_if_in_upstream
= 0;
1190 int cover_letter
= -1;
1191 int boundary_count
= 0;
1192 int no_binary_diff
= 0;
1193 struct commit
*origin
= NULL
;
1194 const char *in_reply_to
= NULL
;
1195 struct patch_ids ids
;
1196 struct strbuf buf
= STRBUF_INIT
;
1197 int use_patch_format
= 0;
1199 int reroll_count
= -1;
1200 char *branch_name
= NULL
;
1202 const struct option builtin_format_patch_options
[] = {
1203 { OPTION_CALLBACK
, 'n', "numbered", &numbered
, NULL
,
1204 N_("use [PATCH n/m] even with a single patch"),
1205 PARSE_OPT_NOARG
, numbered_callback
},
1206 { OPTION_CALLBACK
, 'N', "no-numbered", &numbered
, NULL
,
1207 N_("use [PATCH] even with multiple patches"),
1208 PARSE_OPT_NOARG
, no_numbered_callback
},
1209 OPT_BOOL('s', "signoff", &do_signoff
, N_("add Signed-off-by:")),
1210 OPT_BOOL(0, "stdout", &use_stdout
,
1211 N_("print patches to standard out")),
1212 OPT_BOOL(0, "cover-letter", &cover_letter
,
1213 N_("generate a cover letter")),
1214 OPT_BOOL(0, "numbered-files", &just_numbers
,
1215 N_("use simple number sequence for output file names")),
1216 OPT_STRING(0, "suffix", &fmt_patch_suffix
, N_("sfx"),
1217 N_("use <sfx> instead of '.patch'")),
1218 OPT_INTEGER(0, "start-number", &start_number
,
1219 N_("start numbering patches at <n> instead of 1")),
1220 OPT_INTEGER('v', "reroll-count", &reroll_count
,
1221 N_("mark the series as Nth re-roll")),
1222 { OPTION_CALLBACK
, 0, "subject-prefix", &rev
, N_("prefix"),
1223 N_("Use [<prefix>] instead of [PATCH]"),
1224 PARSE_OPT_NONEG
, subject_prefix_callback
},
1225 { OPTION_CALLBACK
, 'o', "output-directory", &output_directory
,
1226 N_("dir"), N_("store resulting files in <dir>"),
1227 PARSE_OPT_NONEG
, output_directory_callback
},
1228 { OPTION_CALLBACK
, 'k', "keep-subject", &rev
, NULL
,
1229 N_("don't strip/add [PATCH]"),
1230 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, keep_callback
},
1231 OPT_BOOL(0, "no-binary", &no_binary_diff
,
1232 N_("don't output binary diffs")),
1233 OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream
,
1234 N_("don't include a patch matching a commit upstream")),
1235 { OPTION_SET_INT
, 'p', "no-stat", &use_patch_format
, NULL
,
1236 N_("show patch format instead of default (patch + stat)"),
1237 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
, NULL
, 1},
1238 OPT_GROUP(N_("Messaging")),
1239 { OPTION_CALLBACK
, 0, "add-header", NULL
, N_("header"),
1240 N_("add email header"), 0, header_callback
},
1241 { OPTION_CALLBACK
, 0, "to", NULL
, N_("email"), N_("add To: header"),
1243 { OPTION_CALLBACK
, 0, "cc", NULL
, N_("email"), N_("add Cc: header"),
1245 { OPTION_CALLBACK
, 0, "from", &from
, N_("ident"),
1246 N_("set From address to <ident> (or committer ident if absent)"),
1247 PARSE_OPT_OPTARG
, from_callback
},
1248 OPT_STRING(0, "in-reply-to", &in_reply_to
, N_("message-id"),
1249 N_("make first mail a reply to <message-id>")),
1250 { OPTION_CALLBACK
, 0, "attach", &rev
, N_("boundary"),
1251 N_("attach the patch"), PARSE_OPT_OPTARG
,
1253 { OPTION_CALLBACK
, 0, "inline", &rev
, N_("boundary"),
1254 N_("inline the patch"),
1255 PARSE_OPT_OPTARG
| PARSE_OPT_NONEG
,
1257 { OPTION_CALLBACK
, 0, "thread", &thread
, N_("style"),
1258 N_("enable message threading, styles: shallow, deep"),
1259 PARSE_OPT_OPTARG
, thread_callback
},
1260 OPT_STRING(0, "signature", &signature
, N_("signature"),
1261 N_("add a signature")),
1262 OPT_FILENAME(0, "signature-file", &signature_file
,
1263 N_("add a signature from a file")),
1264 OPT__QUIET(&quiet
, N_("don't print the patch filenames")),
1268 extra_hdr
.strdup_strings
= 1;
1269 extra_to
.strdup_strings
= 1;
1270 extra_cc
.strdup_strings
= 1;
1271 init_grep_defaults();
1272 git_config(git_format_config
, NULL
);
1273 init_revisions(&rev
, prefix
);
1274 rev
.commit_format
= CMIT_FMT_EMAIL
;
1275 rev
.verbose_header
= 1;
1277 rev
.max_parents
= 1;
1278 DIFF_OPT_SET(&rev
.diffopt
, RECURSIVE
);
1279 rev
.subject_prefix
= fmt_patch_subject_prefix
;
1280 memset(&s_r_opt
, 0, sizeof(s_r_opt
));
1281 s_r_opt
.def
= "HEAD";
1282 s_r_opt
.revarg_opt
= REVARG_COMMITTISH
;
1284 if (default_attach
) {
1285 rev
.mime_boundary
= default_attach
;
1290 * Parse the arguments before setup_revisions(), or something
1291 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1292 * possibly a valid SHA1.
1294 argc
= parse_options(argc
, argv
, prefix
, builtin_format_patch_options
,
1295 builtin_format_patch_usage
,
1296 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN
|
1297 PARSE_OPT_KEEP_DASHDASH
);
1299 if (0 < reroll_count
) {
1300 struct strbuf sprefix
= STRBUF_INIT
;
1301 strbuf_addf(&sprefix
, "%s v%d",
1302 rev
.subject_prefix
, reroll_count
);
1303 rev
.reroll_count
= reroll_count
;
1304 rev
.subject_prefix
= strbuf_detach(&sprefix
, NULL
);
1307 for (i
= 0; i
< extra_hdr
.nr
; i
++) {
1308 strbuf_addstr(&buf
, extra_hdr
.items
[i
].string
);
1309 strbuf_addch(&buf
, '\n');
1313 strbuf_addstr(&buf
, "To: ");
1314 for (i
= 0; i
< extra_to
.nr
; i
++) {
1316 strbuf_addstr(&buf
, " ");
1317 strbuf_addstr(&buf
, extra_to
.items
[i
].string
);
1318 if (i
+ 1 < extra_to
.nr
)
1319 strbuf_addch(&buf
, ',');
1320 strbuf_addch(&buf
, '\n');
1324 strbuf_addstr(&buf
, "Cc: ");
1325 for (i
= 0; i
< extra_cc
.nr
; i
++) {
1327 strbuf_addstr(&buf
, " ");
1328 strbuf_addstr(&buf
, extra_cc
.items
[i
].string
);
1329 if (i
+ 1 < extra_cc
.nr
)
1330 strbuf_addch(&buf
, ',');
1331 strbuf_addch(&buf
, '\n');
1334 rev
.extra_headers
= strbuf_detach(&buf
, NULL
);
1337 if (split_ident_line(&rev
.from_ident
, from
, strlen(from
)))
1338 die(_("invalid ident line: %s"), from
);
1341 if (start_number
< 0)
1345 * If numbered is set solely due to format.numbered in config,
1346 * and it would conflict with --keep-subject (-k) from the
1347 * command line, reset "numbered".
1349 if (numbered
&& keep_subject
&& !numbered_cmdline_opt
)
1352 if (numbered
&& keep_subject
)
1353 die (_("-n and -k are mutually exclusive."));
1354 if (keep_subject
&& subject_prefix
)
1355 die (_("--subject-prefix and -k are mutually exclusive."));
1356 rev
.preserve_subject
= keep_subject
;
1358 argc
= setup_revisions(argc
, argv
, &rev
, &s_r_opt
);
1360 die (_("unrecognized argument: %s"), argv
[1]);
1362 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME
)
1363 die(_("--name-only does not make sense"));
1364 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME_STATUS
)
1365 die(_("--name-status does not make sense"));
1366 if (rev
.diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
)
1367 die(_("--check does not make sense"));
1369 if (!use_patch_format
&&
1370 (!rev
.diffopt
.output_format
||
1371 rev
.diffopt
.output_format
== DIFF_FORMAT_PATCH
))
1372 rev
.diffopt
.output_format
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_SUMMARY
;
1374 /* Always generate a patch */
1375 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
1377 if (!DIFF_OPT_TST(&rev
.diffopt
, TEXT
) && !no_binary_diff
)
1378 DIFF_OPT_SET(&rev
.diffopt
, BINARY
);
1381 init_display_notes(&rev
.notes_opt
);
1384 output_directory
= set_outdir(prefix
, output_directory
);
1388 if (output_directory
) {
1390 die(_("standard output, or directory, which one?"));
1391 if (mkdir(output_directory
, 0777) < 0 && errno
!= EEXIST
)
1392 die_errno(_("Could not create directory '%s'"),
1396 if (rev
.pending
.nr
== 1) {
1399 if (rev
.max_count
< 0 && !rev
.show_root_diff
) {
1401 * This is traditional behaviour of "git format-patch
1402 * origin" that prepares what the origin side still
1405 rev
.pending
.objects
[0].item
->flags
|= UNINTERESTING
;
1406 add_head_to_pending(&rev
);
1410 * Otherwise, it is "format-patch -22 HEAD", and/or
1411 * "format-patch --root HEAD". The user wants
1412 * get_revision() to do the usual traversal.
1415 if (!strcmp(rev
.pending
.objects
[0].name
, "HEAD"))
1419 unsigned char sha1
[20];
1420 const char *ref
, *v
;
1421 ref
= resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
,
1423 if (ref
&& skip_prefix(ref
, "refs/heads/", &v
))
1424 branch_name
= xstrdup(v
);
1426 branch_name
= xstrdup(""); /* no branch */
1431 * We cannot move this anywhere earlier because we do want to
1432 * know if --root was given explicitly from the command line.
1434 rev
.show_root_diff
= 1;
1436 if (ignore_if_in_upstream
) {
1437 /* Don't say anything if head and upstream are the same. */
1438 if (rev
.pending
.nr
== 2) {
1439 struct object_array_entry
*o
= rev
.pending
.objects
;
1440 if (hashcmp(o
[0].item
->sha1
, o
[1].item
->sha1
) == 0)
1443 get_patch_ids(&rev
, &ids
);
1447 realstdout
= xfdopen(xdup(1), "w");
1449 if (prepare_revision_walk(&rev
))
1450 die(_("revision walk setup failed"));
1452 while ((commit
= get_revision(&rev
)) != NULL
) {
1453 if (commit
->object
.flags
& BOUNDARY
) {
1455 origin
= (boundary_count
== 1) ? commit
: NULL
;
1459 if (ignore_if_in_upstream
&&
1460 has_commit_patch_id(commit
, &ids
))
1464 REALLOC_ARRAY(list
, nr
);
1465 list
[nr
- 1] = commit
;
1471 if (!keep_subject
&& auto_number
&& total
> 1)
1474 rev
.total
= total
+ start_number
- 1;
1475 if (cover_letter
== -1) {
1476 if (config_cover_letter
== COVER_AUTO
)
1477 cover_letter
= (total
> 1);
1479 cover_letter
= (config_cover_letter
== COVER_ON
);
1483 ; /* --no-signature inhibits all signatures */
1484 } else if (signature
&& signature
!= git_version_string
) {
1485 ; /* non-default signature already set */
1486 } else if (signature_file
) {
1487 struct strbuf buf
= STRBUF_INIT
;
1489 if (strbuf_read_file(&buf
, signature_file
, 128) < 0)
1490 die_errno(_("unable to read signature file '%s'"), signature_file
);
1491 signature
= strbuf_detach(&buf
, NULL
);
1494 if (in_reply_to
|| thread
|| cover_letter
)
1495 rev
.ref_message_ids
= xcalloc(1, sizeof(struct string_list
));
1497 const char *msgid
= clean_message_id(in_reply_to
);
1498 string_list_append(rev
.ref_message_ids
, msgid
);
1500 rev
.numbered_files
= just_numbers
;
1501 rev
.patch_suffix
= fmt_patch_suffix
;
1504 gen_message_id(&rev
, "cover");
1505 make_cover_letter(&rev
, use_stdout
,
1506 origin
, nr
, list
, branch_name
, quiet
);
1510 rev
.add_signoff
= do_signoff
;
1514 rev
.nr
= total
- nr
+ (start_number
- 1);
1515 /* Make the second and subsequent mails replies to the first */
1517 /* Have we already had a message ID? */
1518 if (rev
.message_id
) {
1520 * For deep threading: make every mail
1521 * a reply to the previous one, no
1522 * matter what other options are set.
1524 * For shallow threading:
1526 * Without --cover-letter and
1527 * --in-reply-to, make every mail a
1528 * reply to the one before.
1530 * With --in-reply-to but no
1531 * --cover-letter, make every mail a
1532 * reply to the <reply-to>.
1534 * With --cover-letter, make every
1535 * mail but the cover letter a reply
1536 * to the cover letter. The cover
1537 * letter is a reply to the
1538 * --in-reply-to, if specified.
1540 if (thread
== THREAD_SHALLOW
1541 && rev
.ref_message_ids
->nr
> 0
1542 && (!cover_letter
|| rev
.nr
> 1))
1543 free(rev
.message_id
);
1545 string_list_append(rev
.ref_message_ids
,
1548 gen_message_id(&rev
, sha1_to_hex(commit
->object
.sha1
));
1552 reopen_stdout(rev
.numbered_files
? NULL
: commit
, NULL
, &rev
, quiet
))
1553 die(_("Failed to create output files"));
1554 shown
= log_tree_commit(&rev
, commit
);
1555 free_commit_buffer(commit
);
1557 /* We put one extra blank line between formatted
1558 * patches and this flag is used by log-tree code
1559 * to see if it needs to emit a LF before showing
1560 * the log; when using one file per patch, we do
1561 * not want the extra blank line.
1566 if (rev
.mime_boundary
)
1567 printf("\n--%s%s--\n\n\n",
1568 mime_boundary_leader
,
1578 string_list_clear(&extra_to
, 0);
1579 string_list_clear(&extra_cc
, 0);
1580 string_list_clear(&extra_hdr
, 0);
1581 if (ignore_if_in_upstream
)
1582 free_patch_ids(&ids
);
1586 static int add_pending_commit(const char *arg
, struct rev_info
*revs
, int flags
)
1588 unsigned char sha1
[20];
1589 if (get_sha1(arg
, sha1
) == 0) {
1590 struct commit
*commit
= lookup_commit_reference(sha1
);
1592 commit
->object
.flags
|= flags
;
1593 add_pending_object(revs
, &commit
->object
, arg
);
1600 static const char * const cherry_usage
[] = {
1601 N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"),
1605 static void print_commit(char sign
, struct commit
*commit
, int verbose
,
1609 printf("%c %s\n", sign
,
1610 find_unique_abbrev(commit
->object
.sha1
, abbrev
));
1612 struct strbuf buf
= STRBUF_INIT
;
1613 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &buf
);
1614 printf("%c %s %s\n", sign
,
1615 find_unique_abbrev(commit
->object
.sha1
, abbrev
),
1617 strbuf_release(&buf
);
1621 int cmd_cherry(int argc
, const char **argv
, const char *prefix
)
1623 struct rev_info revs
;
1624 struct patch_ids ids
;
1625 struct commit
*commit
;
1626 struct commit_list
*list
= NULL
;
1627 struct branch
*current_branch
;
1628 const char *upstream
;
1629 const char *head
= "HEAD";
1630 const char *limit
= NULL
;
1631 int verbose
= 0, abbrev
= 0;
1633 struct option options
[] = {
1634 OPT__ABBREV(&abbrev
),
1635 OPT__VERBOSE(&verbose
, N_("be verbose")),
1639 argc
= parse_options(argc
, argv
, prefix
, options
, cherry_usage
, 0);
1652 current_branch
= branch_get(NULL
);
1653 upstream
= branch_get_upstream(current_branch
, NULL
);
1655 fprintf(stderr
, _("Could not find a tracked"
1656 " remote branch, please"
1657 " specify <upstream> manually.\n"));
1658 usage_with_options(cherry_usage
, options
);
1662 init_revisions(&revs
, prefix
);
1663 revs
.max_parents
= 1;
1665 if (add_pending_commit(head
, &revs
, 0))
1666 die(_("Unknown commit %s"), head
);
1667 if (add_pending_commit(upstream
, &revs
, UNINTERESTING
))
1668 die(_("Unknown commit %s"), upstream
);
1670 /* Don't say anything if head and upstream are the same. */
1671 if (revs
.pending
.nr
== 2) {
1672 struct object_array_entry
*o
= revs
.pending
.objects
;
1673 if (hashcmp(o
[0].item
->sha1
, o
[1].item
->sha1
) == 0)
1677 get_patch_ids(&revs
, &ids
);
1679 if (limit
&& add_pending_commit(limit
, &revs
, UNINTERESTING
))
1680 die(_("Unknown commit %s"), limit
);
1682 /* reverse the list of commits */
1683 if (prepare_revision_walk(&revs
))
1684 die(_("revision walk setup failed"));
1685 while ((commit
= get_revision(&revs
)) != NULL
) {
1686 commit_list_insert(commit
, &list
);
1692 commit
= list
->item
;
1693 if (has_commit_patch_id(commit
, &ids
))
1695 print_commit(sign
, commit
, verbose
, abbrev
);
1699 free_patch_ids(&ids
);