2 * Builtin "git log" and related commands (show, whatchanged)
4 * (C) Copyright 2006 Linus Torvalds
7 #define USE_THE_INDEX_COMPATIBILITY_MACROS
11 #include "object-store.h"
19 #include "reflog-walk.h"
20 #include "patch-ids.h"
21 #include "run-command.h"
24 #include "string-list.h"
25 #include "parse-options.h"
28 #include "streaming.h"
31 #include "gpg-interface.h"
33 #include "commit-slab.h"
34 #include "repository.h"
35 #include "commit-reach.h"
36 #include "interdiff.h"
37 #include "range-diff.h"
39 #define MAIL_DEFAULT_WRAP 72
41 /* Set a default date-time format for git log ("log.date" config variable) */
42 static const char *default_date_mode
= NULL
;
44 static int default_abbrev_commit
;
45 static int default_show_root
= 1;
46 static int default_follow
;
47 static int default_show_signature
;
48 static int decoration_style
;
49 static int decoration_given
;
50 static int use_mailmap_config
;
51 static const char *fmt_patch_subject_prefix
= "PATCH";
52 static const char *fmt_pretty
;
54 static const char * const builtin_log_usage
[] = {
55 N_("git log [<options>] [<revision-range>] [[--] <path>...]"),
56 N_("git show [<options>] <object>..."),
60 struct line_opt_callback_data
{
63 struct string_list args
;
66 static int auto_decoration_style(void)
68 return (isatty(1) || pager_in_use()) ? DECORATE_SHORT_REFS
: 0;
71 static int parse_decoration_style(const char *value
)
73 switch (git_parse_maybe_bool(value
)) {
75 return DECORATE_SHORT_REFS
;
81 if (!strcmp(value
, "full"))
82 return DECORATE_FULL_REFS
;
83 else if (!strcmp(value
, "short"))
84 return DECORATE_SHORT_REFS
;
85 else if (!strcmp(value
, "auto"))
86 return auto_decoration_style();
88 * Please update _git_log() in git-completion.bash when you
89 * add new decoration styles.
94 static int decorate_callback(const struct option
*opt
, const char *arg
, int unset
)
99 decoration_style
= parse_decoration_style(arg
);
101 decoration_style
= DECORATE_SHORT_REFS
;
103 if (decoration_style
< 0)
104 die(_("invalid --decorate option: %s"), arg
);
106 decoration_given
= 1;
111 static int log_line_range_callback(const struct option
*option
, const char *arg
, int unset
)
113 struct line_opt_callback_data
*data
= option
->value
;
115 BUG_ON_OPT_NEG(unset
);
120 data
->rev
->line_level_traverse
= 1;
121 string_list_append(&data
->args
, arg
);
126 static void init_log_defaults(void)
128 init_grep_defaults(the_repository
);
129 init_diff_ui_defaults();
131 decoration_style
= auto_decoration_style();
134 static void cmd_log_init_defaults(struct rev_info
*rev
)
137 get_commit_format(fmt_pretty
, rev
);
139 rev
->diffopt
.flags
.default_follow_renames
= 1;
140 rev
->verbose_header
= 1;
141 rev
->diffopt
.flags
.recursive
= 1;
142 rev
->diffopt
.stat_width
= -1; /* use full terminal width */
143 rev
->diffopt
.stat_graph_width
= -1; /* respect statGraphWidth config */
144 rev
->abbrev_commit
= default_abbrev_commit
;
145 rev
->show_root_diff
= default_show_root
;
146 rev
->subject_prefix
= fmt_patch_subject_prefix
;
147 rev
->show_signature
= default_show_signature
;
148 rev
->diffopt
.flags
.allow_textconv
= 1;
150 if (default_date_mode
)
151 parse_date_format(default_date_mode
, &rev
->date_mode
);
154 static void cmd_log_init_finish(int argc
, const char **argv
, const char *prefix
,
155 struct rev_info
*rev
, struct setup_revision_opt
*opt
)
157 struct userformat_want w
;
158 int quiet
= 0, source
= 0, mailmap
= 0;
159 static struct line_opt_callback_data line_cb
= {NULL
, NULL
, STRING_LIST_INIT_DUP
};
160 static struct string_list decorate_refs_exclude
= STRING_LIST_INIT_NODUP
;
161 static struct string_list decorate_refs_include
= STRING_LIST_INIT_NODUP
;
162 struct decoration_filter decoration_filter
= {&decorate_refs_include
,
163 &decorate_refs_exclude
};
164 static struct revision_sources revision_sources
;
166 const struct option builtin_log_options
[] = {
167 OPT__QUIET(&quiet
, N_("suppress diff output")),
168 OPT_BOOL(0, "source", &source
, N_("show source")),
169 OPT_BOOL(0, "use-mailmap", &mailmap
, N_("Use mail map file")),
170 OPT_STRING_LIST(0, "decorate-refs", &decorate_refs_include
,
171 N_("pattern"), N_("only decorate refs that match <pattern>")),
172 OPT_STRING_LIST(0, "decorate-refs-exclude", &decorate_refs_exclude
,
173 N_("pattern"), N_("do not decorate refs that match <pattern>")),
174 { OPTION_CALLBACK
, 0, "decorate", NULL
, NULL
, N_("decorate options"),
175 PARSE_OPT_OPTARG
, decorate_callback
},
176 OPT_CALLBACK('L', NULL
, &line_cb
, "n,m:file",
177 N_("Process line range n,m in file, counting from 1"),
178 log_line_range_callback
),
183 line_cb
.prefix
= prefix
;
185 mailmap
= use_mailmap_config
;
186 argc
= parse_options(argc
, argv
, prefix
,
187 builtin_log_options
, builtin_log_usage
,
188 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN
|
189 PARSE_OPT_KEEP_DASHDASH
);
192 rev
->diffopt
.output_format
|= DIFF_FORMAT_NO_OUTPUT
;
193 argc
= setup_revisions(argc
, argv
, rev
, opt
);
195 /* Any arguments at this point are not recognized */
197 die(_("unrecognized argument: %s"), argv
[1]);
199 memset(&w
, 0, sizeof(w
));
200 userformat_find_requirements(NULL
, &w
);
202 if (!rev
->show_notes_given
&& (!rev
->pretty_given
|| w
.notes
))
205 load_display_notes(&rev
->notes_opt
);
207 if ((rev
->diffopt
.pickaxe_opts
& DIFF_PICKAXE_KINDS_MASK
) ||
208 rev
->diffopt
.filter
|| rev
->diffopt
.flags
.follow_renames
)
209 rev
->always_show_header
= 0;
211 if (source
|| w
.source
) {
212 init_revision_sources(&revision_sources
);
213 rev
->sources
= &revision_sources
;
217 rev
->mailmap
= xcalloc(1, sizeof(struct string_list
));
218 read_mailmap(rev
->mailmap
, NULL
);
221 if (rev
->pretty_given
&& rev
->commit_format
== CMIT_FMT_RAW
) {
223 * "log --pretty=raw" is special; ignore UI oriented
224 * configuration variables such as decoration.
226 if (!decoration_given
)
227 decoration_style
= 0;
228 if (!rev
->abbrev_commit_given
)
229 rev
->abbrev_commit
= 0;
232 if (decoration_style
) {
233 rev
->show_decorations
= 1;
234 load_ref_decorations(&decoration_filter
, decoration_style
);
237 if (rev
->line_level_traverse
)
238 line_log_init(rev
, line_cb
.prefix
, &line_cb
.args
);
243 static void cmd_log_init(int argc
, const char **argv
, const char *prefix
,
244 struct rev_info
*rev
, struct setup_revision_opt
*opt
)
246 cmd_log_init_defaults(rev
);
247 cmd_log_init_finish(argc
, argv
, prefix
, rev
, opt
);
251 * This gives a rough estimate for how many commits we
252 * will print out in the list.
254 static int estimate_commit_count(struct commit_list
*list
)
259 struct commit
*commit
= list
->item
;
260 unsigned int flags
= commit
->object
.flags
;
262 if (!(flags
& (TREESAME
| UNINTERESTING
)))
268 static void show_early_header(struct rev_info
*rev
, const char *stage
, int nr
)
270 if (rev
->shown_one
) {
272 if (rev
->commit_format
!= CMIT_FMT_ONELINE
)
273 putchar(rev
->diffopt
.line_termination
);
275 fprintf(rev
->diffopt
.file
, _("Final output: %d %s\n"), nr
, stage
);
278 static struct itimerval early_output_timer
;
280 static void log_show_early(struct rev_info
*revs
, struct commit_list
*list
)
282 int i
= revs
->early_output
, close_file
= revs
->diffopt
.close_file
;
285 revs
->diffopt
.close_file
= 0;
286 sort_in_topological_order(&list
, revs
->sort_order
);
288 struct commit
*commit
= list
->item
;
289 switch (simplify_commit(revs
, commit
)) {
292 int n
= estimate_commit_count(list
);
293 show_early_header(revs
, "incomplete", n
);
296 log_tree_commit(revs
, commit
);
303 fclose(revs
->diffopt
.file
);
309 /* Did we already get enough commits for the early output? */
312 fclose(revs
->diffopt
.file
);
317 * ..if no, then repeat it twice a second until we
320 * NOTE! We don't use "it_interval", because if the
321 * reader isn't listening, we want our output to be
322 * throttled by the writing, and not have the timer
323 * trigger every second even if we're blocked on a
326 early_output_timer
.it_value
.tv_sec
= 0;
327 early_output_timer
.it_value
.tv_usec
= 500000;
328 setitimer(ITIMER_REAL
, &early_output_timer
, NULL
);
331 static void early_output(int signal
)
333 show_early_output
= log_show_early
;
336 static void setup_early_output(void)
341 * Set up the signal handler, minimally intrusively:
342 * we only set a single volatile integer word (not
343 * using sigatomic_t - trying to avoid unnecessary
344 * system dependencies and headers), and using
347 memset(&sa
, 0, sizeof(sa
));
348 sa
.sa_handler
= early_output
;
349 sigemptyset(&sa
.sa_mask
);
350 sa
.sa_flags
= SA_RESTART
;
351 sigaction(SIGALRM
, &sa
, NULL
);
354 * If we can get the whole output in less than a
355 * tenth of a second, don't even bother doing the
356 * early-output thing..
358 * This is a one-time-only trigger.
360 early_output_timer
.it_value
.tv_sec
= 0;
361 early_output_timer
.it_value
.tv_usec
= 100000;
362 setitimer(ITIMER_REAL
, &early_output_timer
, NULL
);
365 static void finish_early_output(struct rev_info
*rev
)
367 int n
= estimate_commit_count(rev
->commits
);
368 signal(SIGALRM
, SIG_IGN
);
369 show_early_header(rev
, "done", n
);
372 static int cmd_log_walk(struct rev_info
*rev
)
374 struct commit
*commit
;
376 int saved_dcctc
= 0, close_file
= rev
->diffopt
.close_file
;
378 if (rev
->early_output
)
379 setup_early_output();
381 if (prepare_revision_walk(rev
))
382 die(_("revision walk setup failed"));
384 if (rev
->early_output
)
385 finish_early_output(rev
);
388 * For --check and --exit-code, the exit code is based on CHECK_FAILED
389 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
390 * retain that state information if replacing rev->diffopt in this loop
392 rev
->diffopt
.close_file
= 0;
393 while ((commit
= get_revision(rev
)) != NULL
) {
394 if (!log_tree_commit(rev
, commit
) && rev
->max_count
>= 0)
396 * We decremented max_count in get_revision,
397 * but we didn't actually show the commit.
400 if (!rev
->reflog_info
) {
402 * We may show a given commit multiple times when
403 * walking the reflogs.
405 free_commit_buffer(the_repository
->parsed_objects
,
407 free_commit_list(commit
->parents
);
408 commit
->parents
= NULL
;
410 if (saved_nrl
< rev
->diffopt
.needed_rename_limit
)
411 saved_nrl
= rev
->diffopt
.needed_rename_limit
;
412 if (rev
->diffopt
.degraded_cc_to_c
)
415 rev
->diffopt
.degraded_cc_to_c
= saved_dcctc
;
416 rev
->diffopt
.needed_rename_limit
= saved_nrl
;
418 fclose(rev
->diffopt
.file
);
420 if (rev
->diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
&&
421 rev
->diffopt
.flags
.check_failed
) {
424 return diff_result_code(&rev
->diffopt
, 0);
427 static int git_log_config(const char *var
, const char *value
, void *cb
)
429 const char *slot_name
;
431 if (!strcmp(var
, "format.pretty"))
432 return git_config_string(&fmt_pretty
, var
, value
);
433 if (!strcmp(var
, "format.subjectprefix"))
434 return git_config_string(&fmt_patch_subject_prefix
, var
, value
);
435 if (!strcmp(var
, "log.abbrevcommit")) {
436 default_abbrev_commit
= git_config_bool(var
, value
);
439 if (!strcmp(var
, "log.date"))
440 return git_config_string(&default_date_mode
, var
, value
);
441 if (!strcmp(var
, "log.decorate")) {
442 decoration_style
= parse_decoration_style(value
);
443 if (decoration_style
< 0)
444 decoration_style
= 0; /* maybe warn? */
447 if (!strcmp(var
, "log.showroot")) {
448 default_show_root
= git_config_bool(var
, value
);
451 if (!strcmp(var
, "log.follow")) {
452 default_follow
= git_config_bool(var
, value
);
455 if (skip_prefix(var
, "color.decorate.", &slot_name
))
456 return parse_decorate_color_config(var
, slot_name
, value
);
457 if (!strcmp(var
, "log.mailmap")) {
458 use_mailmap_config
= git_config_bool(var
, value
);
461 if (!strcmp(var
, "log.showsignature")) {
462 default_show_signature
= git_config_bool(var
, value
);
466 if (grep_config(var
, value
, cb
) < 0)
468 if (git_gpg_config(var
, value
, cb
) < 0)
470 return git_diff_ui_config(var
, value
, cb
);
473 int cmd_whatchanged(int argc
, const char **argv
, const char *prefix
)
476 struct setup_revision_opt opt
;
479 git_config(git_log_config
, NULL
);
481 repo_init_revisions(the_repository
, &rev
, prefix
);
483 rev
.simplify_history
= 0;
484 memset(&opt
, 0, sizeof(opt
));
486 opt
.revarg_opt
= REVARG_COMMITTISH
;
487 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
488 if (!rev
.diffopt
.output_format
)
489 rev
.diffopt
.output_format
= DIFF_FORMAT_RAW
;
490 return cmd_log_walk(&rev
);
493 static void show_tagger(const char *buf
, struct rev_info
*rev
)
495 struct strbuf out
= STRBUF_INIT
;
496 struct pretty_print_context pp
= {0};
498 pp
.fmt
= rev
->commit_format
;
499 pp
.date_mode
= rev
->date_mode
;
500 pp_user_info(&pp
, "Tagger", &out
, buf
, get_log_output_encoding());
501 fprintf(rev
->diffopt
.file
, "%s", out
.buf
);
502 strbuf_release(&out
);
505 static int show_blob_object(const struct object_id
*oid
, struct rev_info
*rev
, const char *obj_name
)
507 struct object_id oidc
;
508 struct object_context obj_context
;
512 fflush(rev
->diffopt
.file
);
513 if (!rev
->diffopt
.flags
.textconv_set_via_cmdline
||
514 !rev
->diffopt
.flags
.allow_textconv
)
515 return stream_blob_to_fd(1, oid
, NULL
, 0);
517 if (get_oid_with_context(the_repository
, obj_name
,
519 &oidc
, &obj_context
))
520 die(_("not a valid object name %s"), obj_name
);
521 if (!obj_context
.path
||
522 !textconv_object(the_repository
, obj_context
.path
,
523 obj_context
.mode
, &oidc
, 1, &buf
, &size
)) {
524 free(obj_context
.path
);
525 return stream_blob_to_fd(1, oid
, NULL
, 0);
529 die(_("git show %s: bad file"), obj_name
);
531 write_or_die(1, buf
, size
);
532 free(obj_context
.path
);
536 static int show_tag_object(const struct object_id
*oid
, struct rev_info
*rev
)
539 enum object_type type
;
540 char *buf
= read_object_file(oid
, &type
, &size
);
544 return error(_("could not read object %s"), oid_to_hex(oid
));
546 assert(type
== OBJ_TAG
);
547 while (offset
< size
&& buf
[offset
] != '\n') {
548 int new_offset
= offset
+ 1;
550 while (new_offset
< size
&& buf
[new_offset
++] != '\n')
552 if (skip_prefix(buf
+ offset
, "tagger ", &ident
))
553 show_tagger(ident
, rev
);
558 fwrite(buf
+ offset
, size
- offset
, 1, rev
->diffopt
.file
);
563 static int show_tree_object(const struct object_id
*oid
,
565 const char *pathname
, unsigned mode
, int stage
, void *context
)
567 FILE *file
= context
;
568 fprintf(file
, "%s%s\n", pathname
, S_ISDIR(mode
) ? "/" : "");
572 static void show_setup_revisions_tweak(struct rev_info
*rev
,
573 struct setup_revision_opt
*opt
)
575 if (rev
->ignore_merges
) {
576 /* There was no "-m" on the command line */
577 rev
->ignore_merges
= 0;
578 if (!rev
->first_parent_only
&& !rev
->combine_merges
) {
579 /* No "--first-parent", "-c", or "--cc" */
580 rev
->combine_merges
= 1;
581 rev
->dense_combined_merges
= 1;
584 if (!rev
->diffopt
.output_format
)
585 rev
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
588 int cmd_show(int argc
, const char **argv
, const char *prefix
)
591 struct object_array_entry
*objects
;
592 struct setup_revision_opt opt
;
593 struct pathspec match_all
;
594 int i
, count
, ret
= 0;
597 git_config(git_log_config
, NULL
);
599 memset(&match_all
, 0, sizeof(match_all
));
600 repo_init_revisions(the_repository
, &rev
, prefix
);
602 rev
.always_show_header
= 1;
603 rev
.no_walk
= REVISION_WALK_NO_WALK_SORTED
;
604 rev
.diffopt
.stat_width
= -1; /* Scale to real terminal size */
606 memset(&opt
, 0, sizeof(opt
));
608 opt
.tweak
= show_setup_revisions_tweak
;
609 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
612 return cmd_log_walk(&rev
);
614 count
= rev
.pending
.nr
;
615 objects
= rev
.pending
.objects
;
616 for (i
= 0; i
< count
&& !ret
; i
++) {
617 struct object
*o
= objects
[i
].item
;
618 const char *name
= objects
[i
].name
;
621 ret
= show_blob_object(&o
->oid
, &rev
, name
);
624 struct tag
*t
= (struct tag
*)o
;
628 fprintf(rev
.diffopt
.file
, "%stag %s%s\n",
629 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
631 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
632 ret
= show_tag_object(&o
->oid
, &rev
);
636 o
= parse_object(the_repository
, &t
->tagged
->oid
);
638 ret
= error(_("could not read object %s"),
639 oid_to_hex(&t
->tagged
->oid
));
647 fprintf(rev
.diffopt
.file
, "%stree %s%s\n\n",
648 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
650 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
651 read_tree_recursive(the_repository
, (struct tree
*)o
, "",
652 0, 0, &match_all
, show_tree_object
,
657 rev
.pending
.nr
= rev
.pending
.alloc
= 0;
658 rev
.pending
.objects
= NULL
;
659 add_object_array(o
, name
, &rev
.pending
);
660 ret
= cmd_log_walk(&rev
);
663 ret
= error(_("unknown type: %d"), o
->type
);
671 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
673 int cmd_log_reflog(int argc
, const char **argv
, const char *prefix
)
676 struct setup_revision_opt opt
;
679 git_config(git_log_config
, NULL
);
681 repo_init_revisions(the_repository
, &rev
, prefix
);
682 init_reflog_walk(&rev
.reflog_info
);
683 rev
.verbose_header
= 1;
684 memset(&opt
, 0, sizeof(opt
));
686 cmd_log_init_defaults(&rev
);
687 rev
.abbrev_commit
= 1;
688 rev
.commit_format
= CMIT_FMT_ONELINE
;
689 rev
.use_terminator
= 1;
690 rev
.always_show_header
= 1;
691 cmd_log_init_finish(argc
, argv
, prefix
, &rev
, &opt
);
693 return cmd_log_walk(&rev
);
696 static void log_setup_revisions_tweak(struct rev_info
*rev
,
697 struct setup_revision_opt
*opt
)
699 if (rev
->diffopt
.flags
.default_follow_renames
&&
700 rev
->prune_data
.nr
== 1)
701 rev
->diffopt
.flags
.follow_renames
= 1;
703 /* Turn --cc/-c into -p --cc/-c when -p was not given */
704 if (!rev
->diffopt
.output_format
&& rev
->combine_merges
)
705 rev
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
707 /* Turn -m on when --cc/-c was given */
708 if (rev
->combine_merges
)
709 rev
->ignore_merges
= 0;
712 int cmd_log(int argc
, const char **argv
, const char *prefix
)
715 struct setup_revision_opt opt
;
718 git_config(git_log_config
, NULL
);
720 repo_init_revisions(the_repository
, &rev
, prefix
);
721 rev
.always_show_header
= 1;
722 memset(&opt
, 0, sizeof(opt
));
724 opt
.revarg_opt
= REVARG_COMMITTISH
;
725 opt
.tweak
= log_setup_revisions_tweak
;
726 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
727 return cmd_log_walk(&rev
);
732 static const char *fmt_patch_suffix
= ".patch";
733 static int numbered
= 0;
734 static int auto_number
= 1;
736 static char *default_attach
= NULL
;
738 static struct string_list extra_hdr
= STRING_LIST_INIT_NODUP
;
739 static struct string_list extra_to
= STRING_LIST_INIT_NODUP
;
740 static struct string_list extra_cc
= STRING_LIST_INIT_NODUP
;
742 static void add_header(const char *value
)
744 struct string_list_item
*item
;
745 int len
= strlen(value
);
746 while (len
&& value
[len
- 1] == '\n')
749 if (!strncasecmp(value
, "to: ", 4)) {
750 item
= string_list_append(&extra_to
, value
+ 4);
752 } else if (!strncasecmp(value
, "cc: ", 4)) {
753 item
= string_list_append(&extra_cc
, value
+ 4);
756 item
= string_list_append(&extra_hdr
, value
);
759 item
->string
[len
] = '\0';
762 #define THREAD_SHALLOW 1
763 #define THREAD_DEEP 2
765 static int do_signoff
;
766 static int base_auto
;
768 static const char *signature
= git_version_string
;
769 static const char *signature_file
;
770 static int config_cover_letter
;
771 static const char *config_output_directory
;
780 static int git_format_config(const char *var
, const char *value
, void *cb
)
782 struct rev_info
*rev
= cb
;
784 if (!strcmp(var
, "format.headers")) {
786 die(_("format.headers without value"));
790 if (!strcmp(var
, "format.suffix"))
791 return git_config_string(&fmt_patch_suffix
, var
, value
);
792 if (!strcmp(var
, "format.to")) {
794 return config_error_nonbool(var
);
795 string_list_append(&extra_to
, value
);
798 if (!strcmp(var
, "format.cc")) {
800 return config_error_nonbool(var
);
801 string_list_append(&extra_cc
, value
);
804 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff") ||
805 !strcmp(var
, "color.ui") || !strcmp(var
, "diff.submodule")) {
808 if (!strcmp(var
, "format.numbered")) {
809 if (value
&& !strcasecmp(value
, "auto")) {
813 numbered
= git_config_bool(var
, value
);
814 auto_number
= auto_number
&& numbered
;
817 if (!strcmp(var
, "format.attach")) {
819 default_attach
= xstrdup(value
);
821 default_attach
= xstrdup(git_version_string
);
824 if (!strcmp(var
, "format.thread")) {
825 if (value
&& !strcasecmp(value
, "deep")) {
826 thread
= THREAD_DEEP
;
829 if (value
&& !strcasecmp(value
, "shallow")) {
830 thread
= THREAD_SHALLOW
;
833 thread
= git_config_bool(var
, value
) && THREAD_SHALLOW
;
836 if (!strcmp(var
, "format.signoff")) {
837 do_signoff
= git_config_bool(var
, value
);
840 if (!strcmp(var
, "format.signature"))
841 return git_config_string(&signature
, var
, value
);
842 if (!strcmp(var
, "format.signaturefile"))
843 return git_config_pathname(&signature_file
, var
, value
);
844 if (!strcmp(var
, "format.coverletter")) {
845 if (value
&& !strcasecmp(value
, "auto")) {
846 config_cover_letter
= COVER_AUTO
;
849 config_cover_letter
= git_config_bool(var
, value
) ? COVER_ON
: COVER_OFF
;
852 if (!strcmp(var
, "format.outputdirectory"))
853 return git_config_string(&config_output_directory
, var
, value
);
854 if (!strcmp(var
, "format.useautobase")) {
855 base_auto
= git_config_bool(var
, value
);
858 if (!strcmp(var
, "format.from")) {
859 int b
= git_parse_maybe_bool(value
);
862 from
= xstrdup(value
);
864 from
= xstrdup(git_committer_info(IDENT_NO_DATE
));
869 if (!strcmp(var
, "format.notes")) {
870 struct strbuf buf
= STRBUF_INIT
;
871 int b
= git_parse_maybe_bool(value
);
876 strbuf_addstr(&buf
, value
);
877 expand_notes_ref(&buf
);
878 string_list_append(&rev
->notes_opt
.extra_notes_refs
,
879 strbuf_detach(&buf
, NULL
));
881 rev
->notes_opt
.use_default_notes
= 1;
886 return git_log_config(var
, value
, cb
);
889 static const char *output_directory
= NULL
;
890 static int outdir_offset
;
892 static int open_next_file(struct commit
*commit
, const char *subject
,
893 struct rev_info
*rev
, int quiet
)
895 struct strbuf filename
= STRBUF_INIT
;
896 int suffix_len
= strlen(rev
->patch_suffix
) + 1;
898 if (output_directory
) {
899 strbuf_addstr(&filename
, output_directory
);
901 PATH_MAX
- FORMAT_PATCH_NAME_MAX
- suffix_len
) {
902 strbuf_release(&filename
);
903 return error(_("name of output directory is too long"));
905 strbuf_complete(&filename
, '/');
908 if (rev
->numbered_files
)
909 strbuf_addf(&filename
, "%d", rev
->nr
);
911 fmt_output_commit(&filename
, commit
, rev
);
913 fmt_output_subject(&filename
, subject
, rev
);
916 printf("%s\n", filename
.buf
+ outdir_offset
);
918 if ((rev
->diffopt
.file
= fopen(filename
.buf
, "w")) == NULL
) {
919 error_errno(_("cannot open patch file %s"), filename
.buf
);
920 strbuf_release(&filename
);
924 strbuf_release(&filename
);
928 static void get_patch_ids(struct rev_info
*rev
, struct patch_ids
*ids
)
930 struct rev_info check_rev
;
931 struct commit
*commit
, *c1
, *c2
;
932 struct object
*o1
, *o2
;
933 unsigned flags1
, flags2
;
935 if (rev
->pending
.nr
!= 2)
936 die(_("need exactly one range"));
938 o1
= rev
->pending
.objects
[0].item
;
939 o2
= rev
->pending
.objects
[1].item
;
942 c1
= lookup_commit_reference(the_repository
, &o1
->oid
);
943 c2
= lookup_commit_reference(the_repository
, &o2
->oid
);
945 if ((flags1
& UNINTERESTING
) == (flags2
& UNINTERESTING
))
946 die(_("not a range"));
948 init_patch_ids(the_repository
, ids
);
950 /* given a range a..b get all patch ids for b..a */
951 repo_init_revisions(the_repository
, &check_rev
, rev
->prefix
);
952 check_rev
.max_parents
= 1;
953 o1
->flags
^= UNINTERESTING
;
954 o2
->flags
^= UNINTERESTING
;
955 add_pending_object(&check_rev
, o1
, "o1");
956 add_pending_object(&check_rev
, o2
, "o2");
957 if (prepare_revision_walk(&check_rev
))
958 die(_("revision walk setup failed"));
960 while ((commit
= get_revision(&check_rev
)) != NULL
) {
961 add_commit_patch_id(commit
, ids
);
964 /* reset for next revision walk */
965 clear_commit_marks(c1
, SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
966 clear_commit_marks(c2
, SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
971 static void gen_message_id(struct rev_info
*info
, char *base
)
973 struct strbuf buf
= STRBUF_INIT
;
974 strbuf_addf(&buf
, "%s.%"PRItime
".git.%s", base
,
975 (timestamp_t
) time(NULL
),
976 git_committer_info(IDENT_NO_NAME
|IDENT_NO_DATE
|IDENT_STRICT
));
977 info
->message_id
= strbuf_detach(&buf
, NULL
);
980 static void print_signature(FILE *file
)
982 if (!signature
|| !*signature
)
985 fprintf(file
, "-- \n%s", signature
);
986 if (signature
[strlen(signature
)-1] != '\n')
991 static void add_branch_description(struct strbuf
*buf
, const char *branch_name
)
993 struct strbuf desc
= STRBUF_INIT
;
994 if (!branch_name
|| !*branch_name
)
996 read_branch_desc(&desc
, branch_name
);
998 strbuf_addch(buf
, '\n');
999 strbuf_addbuf(buf
, &desc
);
1000 strbuf_addch(buf
, '\n');
1002 strbuf_release(&desc
);
1005 static char *find_branch_name(struct rev_info
*rev
)
1007 int i
, positive
= -1;
1008 struct object_id branch_oid
;
1009 const struct object_id
*tip_oid
;
1010 const char *ref
, *v
;
1011 char *full_ref
, *branch
= NULL
;
1013 for (i
= 0; i
< rev
->cmdline
.nr
; i
++) {
1014 if (rev
->cmdline
.rev
[i
].flags
& UNINTERESTING
)
1023 ref
= rev
->cmdline
.rev
[positive
].name
;
1024 tip_oid
= &rev
->cmdline
.rev
[positive
].item
->oid
;
1025 if (dwim_ref(ref
, strlen(ref
), &branch_oid
, &full_ref
) &&
1026 skip_prefix(full_ref
, "refs/heads/", &v
) &&
1027 oideq(tip_oid
, &branch_oid
))
1028 branch
= xstrdup(v
);
1033 static void show_diffstat(struct rev_info
*rev
,
1034 struct commit
*origin
, struct commit
*head
)
1036 struct diff_options opts
;
1038 memcpy(&opts
, &rev
->diffopt
, sizeof(opts
));
1039 opts
.output_format
= DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
1040 diff_setup_done(&opts
);
1042 diff_tree_oid(get_commit_tree_oid(origin
),
1043 get_commit_tree_oid(head
),
1045 diffcore_std(&opts
);
1048 fprintf(rev
->diffopt
.file
, "\n");
1051 static void make_cover_letter(struct rev_info
*rev
, int use_stdout
,
1052 struct commit
*origin
,
1053 int nr
, struct commit
**list
,
1054 const char *branch_name
,
1057 const char *committer
;
1058 const char *body
= "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
1060 struct shortlog log
;
1061 struct strbuf sb
= STRBUF_INIT
;
1063 const char *encoding
= "UTF-8";
1064 int need_8bit_cte
= 0;
1065 struct pretty_print_context pp
= {0};
1066 struct commit
*head
= list
[0];
1068 if (!cmit_fmt_is_mail(rev
->commit_format
))
1069 die(_("cover letter needs email format"));
1071 committer
= git_committer_info(0);
1074 open_next_file(NULL
, rev
->numbered_files
? NULL
: "cover-letter", rev
, quiet
))
1075 die(_("failed to create cover-letter file"));
1077 log_write_email_headers(rev
, head
, &pp
.after_subject
, &need_8bit_cte
, 0);
1079 for (i
= 0; !need_8bit_cte
&& i
< nr
; i
++) {
1080 const char *buf
= get_commit_buffer(list
[i
], NULL
);
1081 if (has_non_ascii(buf
))
1083 unuse_commit_buffer(list
[i
], buf
);
1087 branch_name
= find_branch_name(rev
);
1090 pp
.fmt
= CMIT_FMT_EMAIL
;
1091 pp
.date_mode
.type
= DATE_RFC2822
;
1093 pp
.print_email_subject
= 1;
1094 pp_user_info(&pp
, NULL
, &sb
, committer
, encoding
);
1095 pp_title_line(&pp
, &msg
, &sb
, encoding
, need_8bit_cte
);
1096 pp_remainder(&pp
, &msg
, &sb
, 0);
1097 add_branch_description(&sb
, branch_name
);
1098 fprintf(rev
->diffopt
.file
, "%s\n", sb
.buf
);
1100 strbuf_release(&sb
);
1102 shortlog_init(&log
);
1104 log
.wrap
= MAIL_DEFAULT_WRAP
;
1107 log
.file
= rev
->diffopt
.file
;
1108 for (i
= 0; i
< nr
; i
++)
1109 shortlog_add_commit(&log
, list
[i
]);
1111 shortlog_output(&log
);
1113 /* We can only do diffstat with a unique reference point */
1115 show_diffstat(rev
, origin
, head
);
1117 if (rev
->idiff_oid1
) {
1118 fprintf_ln(rev
->diffopt
.file
, "%s", rev
->idiff_title
);
1119 show_interdiff(rev
, 0);
1124 * Pass minimum required diff-options to range-diff; others
1125 * can be added later if deemed desirable.
1127 struct diff_options opts
;
1129 opts
.file
= rev
->diffopt
.file
;
1130 opts
.use_color
= rev
->diffopt
.use_color
;
1131 diff_setup_done(&opts
);
1132 fprintf_ln(rev
->diffopt
.file
, "%s", rev
->rdiff_title
);
1133 show_range_diff(rev
->rdiff1
, rev
->rdiff2
,
1134 rev
->creation_factor
, 1, &opts
);
1138 static const char *clean_message_id(const char *msg_id
)
1141 const char *a
, *z
, *m
;
1144 while ((ch
= *m
) && (isspace(ch
) || (ch
== '<')))
1149 if (!isspace(ch
) && (ch
!= '>'))
1154 die(_("insane in-reply-to: %s"), msg_id
);
1157 return xmemdupz(a
, z
- a
);
1160 static const char *set_outdir(const char *prefix
, const char *output_directory
)
1162 if (output_directory
&& is_absolute_path(output_directory
))
1163 return output_directory
;
1165 if (!prefix
|| !*prefix
) {
1166 if (output_directory
)
1167 return output_directory
;
1168 /* The user did not explicitly ask for "./" */
1173 outdir_offset
= strlen(prefix
);
1174 if (!output_directory
)
1177 return prefix_filename(prefix
, output_directory
);
1180 static const char * const builtin_format_patch_usage
[] = {
1181 N_("git format-patch [<options>] [<since> | <revision-range>]"),
1185 static int keep_subject
= 0;
1187 static int keep_callback(const struct option
*opt
, const char *arg
, int unset
)
1189 BUG_ON_OPT_NEG(unset
);
1190 BUG_ON_OPT_ARG(arg
);
1191 ((struct rev_info
*)opt
->value
)->total
= -1;
1196 static int subject_prefix
= 0;
1198 static int subject_prefix_callback(const struct option
*opt
, const char *arg
,
1201 BUG_ON_OPT_NEG(unset
);
1203 ((struct rev_info
*)opt
->value
)->subject_prefix
= arg
;
1207 static int rfc_callback(const struct option
*opt
, const char *arg
, int unset
)
1209 BUG_ON_OPT_NEG(unset
);
1210 BUG_ON_OPT_ARG(arg
);
1211 return subject_prefix_callback(opt
, "RFC PATCH", unset
);
1214 static int numbered_cmdline_opt
= 0;
1216 static int numbered_callback(const struct option
*opt
, const char *arg
,
1219 BUG_ON_OPT_ARG(arg
);
1220 *(int *)opt
->value
= numbered_cmdline_opt
= unset
? 0 : 1;
1226 static int no_numbered_callback(const struct option
*opt
, const char *arg
,
1229 BUG_ON_OPT_NEG(unset
);
1230 return numbered_callback(opt
, arg
, 1);
1233 static int output_directory_callback(const struct option
*opt
, const char *arg
,
1236 const char **dir
= (const char **)opt
->value
;
1237 BUG_ON_OPT_NEG(unset
);
1239 die(_("two output directories?"));
1244 static int thread_callback(const struct option
*opt
, const char *arg
, int unset
)
1246 int *thread
= (int *)opt
->value
;
1249 else if (!arg
|| !strcmp(arg
, "shallow"))
1250 *thread
= THREAD_SHALLOW
;
1251 else if (!strcmp(arg
, "deep"))
1252 *thread
= THREAD_DEEP
;
1254 * Please update _git_formatpatch() in git-completion.bash
1255 * when you add new options.
1262 static int attach_callback(const struct option
*opt
, const char *arg
, int unset
)
1264 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1266 rev
->mime_boundary
= NULL
;
1268 rev
->mime_boundary
= arg
;
1270 rev
->mime_boundary
= git_version_string
;
1271 rev
->no_inline
= unset
? 0 : 1;
1275 static int inline_callback(const struct option
*opt
, const char *arg
, int unset
)
1277 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1279 rev
->mime_boundary
= NULL
;
1281 rev
->mime_boundary
= arg
;
1283 rev
->mime_boundary
= git_version_string
;
1288 static int header_callback(const struct option
*opt
, const char *arg
, int unset
)
1291 string_list_clear(&extra_hdr
, 0);
1292 string_list_clear(&extra_to
, 0);
1293 string_list_clear(&extra_cc
, 0);
1300 static int to_callback(const struct option
*opt
, const char *arg
, int unset
)
1303 string_list_clear(&extra_to
, 0);
1305 string_list_append(&extra_to
, arg
);
1309 static int cc_callback(const struct option
*opt
, const char *arg
, int unset
)
1312 string_list_clear(&extra_cc
, 0);
1314 string_list_append(&extra_cc
, arg
);
1318 static int from_callback(const struct option
*opt
, const char *arg
, int unset
)
1320 char **from
= opt
->value
;
1327 *from
= xstrdup(arg
);
1329 *from
= xstrdup(git_committer_info(IDENT_NO_DATE
));
1333 struct base_tree_info
{
1334 struct object_id base_commit
;
1335 int nr_patch_id
, alloc_patch_id
;
1336 struct object_id
*patch_id
;
1339 static struct commit
*get_base_commit(const char *base_commit
,
1340 struct commit
**list
,
1343 struct commit
*base
= NULL
;
1344 struct commit
**rev
;
1345 int i
= 0, rev_nr
= 0;
1347 if (base_commit
&& strcmp(base_commit
, "auto")) {
1348 base
= lookup_commit_reference_by_name(base_commit
);
1350 die(_("unknown commit %s"), base_commit
);
1351 } else if ((base_commit
&& !strcmp(base_commit
, "auto")) || base_auto
) {
1352 struct branch
*curr_branch
= branch_get(NULL
);
1353 const char *upstream
= branch_get_upstream(curr_branch
, NULL
);
1355 struct commit_list
*base_list
;
1356 struct commit
*commit
;
1357 struct object_id oid
;
1359 if (get_oid(upstream
, &oid
))
1360 die(_("failed to resolve '%s' as a valid ref"), upstream
);
1361 commit
= lookup_commit_or_die(&oid
, "upstream base");
1362 base_list
= get_merge_bases_many(commit
, total
, list
);
1363 /* There should be one and only one merge base. */
1364 if (!base_list
|| base_list
->next
)
1365 die(_("could not find exact merge base"));
1366 base
= base_list
->item
;
1367 free_commit_list(base_list
);
1369 die(_("failed to get upstream, if you want to record base commit automatically,\n"
1370 "please use git branch --set-upstream-to to track a remote branch.\n"
1371 "Or you could specify base commit by --base=<base-commit-id> manually"));
1375 ALLOC_ARRAY(rev
, total
);
1376 for (i
= 0; i
< total
; i
++)
1381 * Get merge base through pair-wise computations
1382 * and store it in rev[0].
1384 while (rev_nr
> 1) {
1385 for (i
= 0; i
< rev_nr
/ 2; i
++) {
1386 struct commit_list
*merge_base
;
1387 merge_base
= get_merge_bases(rev
[2 * i
], rev
[2 * i
+ 1]);
1388 if (!merge_base
|| merge_base
->next
)
1389 die(_("failed to find exact merge base"));
1391 rev
[i
] = merge_base
->item
;
1395 rev
[i
] = rev
[2 * i
];
1396 rev_nr
= DIV_ROUND_UP(rev_nr
, 2);
1399 if (!in_merge_bases(base
, rev
[0]))
1400 die(_("base commit should be the ancestor of revision list"));
1402 for (i
= 0; i
< total
; i
++) {
1403 if (base
== list
[i
])
1404 die(_("base commit shouldn't be in revision list"));
1411 define_commit_slab(commit_base
, int);
1413 static void prepare_bases(struct base_tree_info
*bases
,
1414 struct commit
*base
,
1415 struct commit
**list
,
1418 struct commit
*commit
;
1419 struct rev_info revs
;
1420 struct diff_options diffopt
;
1421 struct commit_base commit_base
;
1427 init_commit_base(&commit_base
);
1428 repo_diff_setup(the_repository
, &diffopt
);
1429 diffopt
.flags
.recursive
= 1;
1430 diff_setup_done(&diffopt
);
1432 oidcpy(&bases
->base_commit
, &base
->object
.oid
);
1434 repo_init_revisions(the_repository
, &revs
, NULL
);
1435 revs
.max_parents
= 1;
1436 revs
.topo_order
= 1;
1437 for (i
= 0; i
< total
; i
++) {
1438 list
[i
]->object
.flags
&= ~UNINTERESTING
;
1439 add_pending_object(&revs
, &list
[i
]->object
, "rev_list");
1440 *commit_base_at(&commit_base
, list
[i
]) = 1;
1442 base
->object
.flags
|= UNINTERESTING
;
1443 add_pending_object(&revs
, &base
->object
, "base");
1445 if (prepare_revision_walk(&revs
))
1446 die(_("revision walk setup failed"));
1448 * Traverse the commits list, get prerequisite patch ids
1449 * and stuff them in bases structure.
1451 while ((commit
= get_revision(&revs
)) != NULL
) {
1452 struct object_id oid
;
1453 struct object_id
*patch_id
;
1454 if (*commit_base_at(&commit_base
, commit
))
1456 if (commit_patch_id(commit
, &diffopt
, &oid
, 0))
1457 die(_("cannot get patch id"));
1458 ALLOC_GROW(bases
->patch_id
, bases
->nr_patch_id
+ 1, bases
->alloc_patch_id
);
1459 patch_id
= bases
->patch_id
+ bases
->nr_patch_id
;
1460 oidcpy(patch_id
, &oid
);
1461 bases
->nr_patch_id
++;
1463 clear_commit_base(&commit_base
);
1466 static void print_bases(struct base_tree_info
*bases
, FILE *file
)
1470 /* Only do this once, either for the cover or for the first one */
1471 if (is_null_oid(&bases
->base_commit
))
1474 /* Show the base commit */
1475 fprintf(file
, "\nbase-commit: %s\n", oid_to_hex(&bases
->base_commit
));
1477 /* Show the prerequisite patches */
1478 for (i
= bases
->nr_patch_id
- 1; i
>= 0; i
--)
1479 fprintf(file
, "prerequisite-patch-id: %s\n", oid_to_hex(&bases
->patch_id
[i
]));
1481 free(bases
->patch_id
);
1482 bases
->nr_patch_id
= 0;
1483 bases
->alloc_patch_id
= 0;
1484 oidclr(&bases
->base_commit
);
1487 static const char *diff_title(struct strbuf
*sb
, int reroll_count
,
1488 const char *generic
, const char *rerolled
)
1490 if (reroll_count
<= 0)
1491 strbuf_addstr(sb
, generic
);
1492 else /* RFC may be v0, so allow -v1 to diff against v0 */
1493 strbuf_addf(sb
, rerolled
, reroll_count
- 1);
1497 static void infer_range_diff_ranges(struct strbuf
*r1
,
1500 struct commit
*origin
,
1501 struct commit
*head
)
1503 const char *head_oid
= oid_to_hex(&head
->object
.oid
);
1505 if (!strstr(prev
, "..")) {
1506 strbuf_addf(r1
, "%s..%s", head_oid
, prev
);
1507 strbuf_addf(r2
, "%s..%s", prev
, head_oid
);
1508 } else if (!origin
) {
1509 die(_("failed to infer range-diff ranges"));
1511 strbuf_addstr(r1
, prev
);
1512 strbuf_addf(r2
, "%s..%s",
1513 oid_to_hex(&origin
->object
.oid
), head_oid
);
1517 int cmd_format_patch(int argc
, const char **argv
, const char *prefix
)
1519 struct commit
*commit
;
1520 struct commit
**list
= NULL
;
1521 struct rev_info rev
;
1522 struct setup_revision_opt s_r_opt
;
1523 int nr
= 0, total
, i
;
1525 int start_number
= -1;
1526 int just_numbers
= 0;
1527 int ignore_if_in_upstream
= 0;
1528 int cover_letter
= -1;
1529 int boundary_count
= 0;
1530 int no_binary_diff
= 0;
1531 int zero_commit
= 0;
1532 struct commit
*origin
= NULL
;
1533 const char *in_reply_to
= NULL
;
1534 struct patch_ids ids
;
1535 struct strbuf buf
= STRBUF_INIT
;
1536 int use_patch_format
= 0;
1538 int reroll_count
= -1;
1539 char *branch_name
= NULL
;
1540 char *base_commit
= NULL
;
1541 struct base_tree_info bases
;
1542 int show_progress
= 0;
1543 struct progress
*progress
= NULL
;
1544 struct oid_array idiff_prev
= OID_ARRAY_INIT
;
1545 struct strbuf idiff_title
= STRBUF_INIT
;
1546 const char *rdiff_prev
= NULL
;
1547 struct strbuf rdiff1
= STRBUF_INIT
;
1548 struct strbuf rdiff2
= STRBUF_INIT
;
1549 struct strbuf rdiff_title
= STRBUF_INIT
;
1550 int creation_factor
= -1;
1552 const struct option builtin_format_patch_options
[] = {
1553 { OPTION_CALLBACK
, 'n', "numbered", &numbered
, NULL
,
1554 N_("use [PATCH n/m] even with a single patch"),
1555 PARSE_OPT_NOARG
, numbered_callback
},
1556 { OPTION_CALLBACK
, 'N', "no-numbered", &numbered
, NULL
,
1557 N_("use [PATCH] even with multiple patches"),
1558 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, no_numbered_callback
},
1559 OPT_BOOL('s', "signoff", &do_signoff
, N_("add Signed-off-by:")),
1560 OPT_BOOL(0, "stdout", &use_stdout
,
1561 N_("print patches to standard out")),
1562 OPT_BOOL(0, "cover-letter", &cover_letter
,
1563 N_("generate a cover letter")),
1564 OPT_BOOL(0, "numbered-files", &just_numbers
,
1565 N_("use simple number sequence for output file names")),
1566 OPT_STRING(0, "suffix", &fmt_patch_suffix
, N_("sfx"),
1567 N_("use <sfx> instead of '.patch'")),
1568 OPT_INTEGER(0, "start-number", &start_number
,
1569 N_("start numbering patches at <n> instead of 1")),
1570 OPT_INTEGER('v', "reroll-count", &reroll_count
,
1571 N_("mark the series as Nth re-roll")),
1572 { OPTION_CALLBACK
, 0, "rfc", &rev
, NULL
,
1573 N_("Use [RFC PATCH] instead of [PATCH]"),
1574 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, rfc_callback
},
1575 { OPTION_CALLBACK
, 0, "subject-prefix", &rev
, N_("prefix"),
1576 N_("Use [<prefix>] instead of [PATCH]"),
1577 PARSE_OPT_NONEG
, subject_prefix_callback
},
1578 { OPTION_CALLBACK
, 'o', "output-directory", &output_directory
,
1579 N_("dir"), N_("store resulting files in <dir>"),
1580 PARSE_OPT_NONEG
, output_directory_callback
},
1581 { OPTION_CALLBACK
, 'k', "keep-subject", &rev
, NULL
,
1582 N_("don't strip/add [PATCH]"),
1583 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, keep_callback
},
1584 OPT_BOOL(0, "no-binary", &no_binary_diff
,
1585 N_("don't output binary diffs")),
1586 OPT_BOOL(0, "zero-commit", &zero_commit
,
1587 N_("output all-zero hash in From header")),
1588 OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream
,
1589 N_("don't include a patch matching a commit upstream")),
1590 OPT_SET_INT_F('p', "no-stat", &use_patch_format
,
1591 N_("show patch format instead of default (patch + stat)"),
1592 1, PARSE_OPT_NONEG
),
1593 OPT_GROUP(N_("Messaging")),
1594 { OPTION_CALLBACK
, 0, "add-header", NULL
, N_("header"),
1595 N_("add email header"), 0, header_callback
},
1596 { OPTION_CALLBACK
, 0, "to", NULL
, N_("email"), N_("add To: header"),
1598 { OPTION_CALLBACK
, 0, "cc", NULL
, N_("email"), N_("add Cc: header"),
1600 { OPTION_CALLBACK
, 0, "from", &from
, N_("ident"),
1601 N_("set From address to <ident> (or committer ident if absent)"),
1602 PARSE_OPT_OPTARG
, from_callback
},
1603 OPT_STRING(0, "in-reply-to", &in_reply_to
, N_("message-id"),
1604 N_("make first mail a reply to <message-id>")),
1605 { OPTION_CALLBACK
, 0, "attach", &rev
, N_("boundary"),
1606 N_("attach the patch"), PARSE_OPT_OPTARG
,
1608 { OPTION_CALLBACK
, 0, "inline", &rev
, N_("boundary"),
1609 N_("inline the patch"),
1610 PARSE_OPT_OPTARG
| PARSE_OPT_NONEG
,
1612 { OPTION_CALLBACK
, 0, "thread", &thread
, N_("style"),
1613 N_("enable message threading, styles: shallow, deep"),
1614 PARSE_OPT_OPTARG
, thread_callback
},
1615 OPT_STRING(0, "signature", &signature
, N_("signature"),
1616 N_("add a signature")),
1617 OPT_STRING(0, "base", &base_commit
, N_("base-commit"),
1618 N_("add prerequisite tree info to the patch series")),
1619 OPT_FILENAME(0, "signature-file", &signature_file
,
1620 N_("add a signature from a file")),
1621 OPT__QUIET(&quiet
, N_("don't print the patch filenames")),
1622 OPT_BOOL(0, "progress", &show_progress
,
1623 N_("show progress while generating patches")),
1624 OPT_CALLBACK(0, "interdiff", &idiff_prev
, N_("rev"),
1625 N_("show changes against <rev> in cover letter or single patch"),
1626 parse_opt_object_name
),
1627 OPT_STRING(0, "range-diff", &rdiff_prev
, N_("refspec"),
1628 N_("show changes against <refspec> in cover letter or single patch")),
1629 OPT_INTEGER(0, "creation-factor", &creation_factor
,
1630 N_("percentage by which creation is weighted")),
1634 extra_hdr
.strdup_strings
= 1;
1635 extra_to
.strdup_strings
= 1;
1636 extra_cc
.strdup_strings
= 1;
1637 init_log_defaults();
1638 repo_init_revisions(the_repository
, &rev
, prefix
);
1639 git_config(git_format_config
, &rev
);
1640 rev
.commit_format
= CMIT_FMT_EMAIL
;
1641 rev
.expand_tabs_in_log_default
= 0;
1642 rev
.verbose_header
= 1;
1644 rev
.max_parents
= 1;
1645 rev
.diffopt
.flags
.recursive
= 1;
1646 rev
.subject_prefix
= fmt_patch_subject_prefix
;
1647 memset(&s_r_opt
, 0, sizeof(s_r_opt
));
1648 s_r_opt
.def
= "HEAD";
1649 s_r_opt
.revarg_opt
= REVARG_COMMITTISH
;
1651 if (default_attach
) {
1652 rev
.mime_boundary
= default_attach
;
1657 * Parse the arguments before setup_revisions(), or something
1658 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1659 * possibly a valid SHA1.
1661 argc
= parse_options(argc
, argv
, prefix
, builtin_format_patch_options
,
1662 builtin_format_patch_usage
,
1663 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN
|
1664 PARSE_OPT_KEEP_DASHDASH
);
1666 if (0 < reroll_count
) {
1667 struct strbuf sprefix
= STRBUF_INIT
;
1668 strbuf_addf(&sprefix
, "%s v%d",
1669 rev
.subject_prefix
, reroll_count
);
1670 rev
.reroll_count
= reroll_count
;
1671 rev
.subject_prefix
= strbuf_detach(&sprefix
, NULL
);
1674 for (i
= 0; i
< extra_hdr
.nr
; i
++) {
1675 strbuf_addstr(&buf
, extra_hdr
.items
[i
].string
);
1676 strbuf_addch(&buf
, '\n');
1680 strbuf_addstr(&buf
, "To: ");
1681 for (i
= 0; i
< extra_to
.nr
; i
++) {
1683 strbuf_addstr(&buf
, " ");
1684 strbuf_addstr(&buf
, extra_to
.items
[i
].string
);
1685 if (i
+ 1 < extra_to
.nr
)
1686 strbuf_addch(&buf
, ',');
1687 strbuf_addch(&buf
, '\n');
1691 strbuf_addstr(&buf
, "Cc: ");
1692 for (i
= 0; i
< extra_cc
.nr
; i
++) {
1694 strbuf_addstr(&buf
, " ");
1695 strbuf_addstr(&buf
, extra_cc
.items
[i
].string
);
1696 if (i
+ 1 < extra_cc
.nr
)
1697 strbuf_addch(&buf
, ',');
1698 strbuf_addch(&buf
, '\n');
1701 rev
.extra_headers
= strbuf_detach(&buf
, NULL
);
1704 if (split_ident_line(&rev
.from_ident
, from
, strlen(from
)))
1705 die(_("invalid ident line: %s"), from
);
1708 if (start_number
< 0)
1712 * If numbered is set solely due to format.numbered in config,
1713 * and it would conflict with --keep-subject (-k) from the
1714 * command line, reset "numbered".
1716 if (numbered
&& keep_subject
&& !numbered_cmdline_opt
)
1719 if (numbered
&& keep_subject
)
1720 die(_("-n and -k are mutually exclusive"));
1721 if (keep_subject
&& subject_prefix
)
1722 die(_("--subject-prefix/--rfc and -k are mutually exclusive"));
1723 rev
.preserve_subject
= keep_subject
;
1725 argc
= setup_revisions(argc
, argv
, &rev
, &s_r_opt
);
1727 die(_("unrecognized argument: %s"), argv
[1]);
1729 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME
)
1730 die(_("--name-only does not make sense"));
1731 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME_STATUS
)
1732 die(_("--name-status does not make sense"));
1733 if (rev
.diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
)
1734 die(_("--check does not make sense"));
1736 if (!use_patch_format
&&
1737 (!rev
.diffopt
.output_format
||
1738 rev
.diffopt
.output_format
== DIFF_FORMAT_PATCH
))
1739 rev
.diffopt
.output_format
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_SUMMARY
;
1740 if (!rev
.diffopt
.stat_width
)
1741 rev
.diffopt
.stat_width
= MAIL_DEFAULT_WRAP
;
1743 /* Always generate a patch */
1744 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
1746 rev
.zero_commit
= zero_commit
;
1748 if (!rev
.diffopt
.flags
.text
&& !no_binary_diff
)
1749 rev
.diffopt
.flags
.binary
= 1;
1752 load_display_notes(&rev
.notes_opt
);
1754 if (!output_directory
&& !use_stdout
)
1755 output_directory
= config_output_directory
;
1758 output_directory
= set_outdir(prefix
, output_directory
);
1762 if (output_directory
) {
1763 if (rev
.diffopt
.use_color
!= GIT_COLOR_ALWAYS
)
1764 rev
.diffopt
.use_color
= GIT_COLOR_NEVER
;
1766 die(_("standard output, or directory, which one?"));
1767 if (mkdir(output_directory
, 0777) < 0 && errno
!= EEXIST
)
1768 die_errno(_("could not create directory '%s'"),
1772 if (rev
.pending
.nr
== 1) {
1775 if (rev
.max_count
< 0 && !rev
.show_root_diff
) {
1777 * This is traditional behaviour of "git format-patch
1778 * origin" that prepares what the origin side still
1781 rev
.pending
.objects
[0].item
->flags
|= UNINTERESTING
;
1782 add_head_to_pending(&rev
);
1786 * Otherwise, it is "format-patch -22 HEAD", and/or
1787 * "format-patch --root HEAD". The user wants
1788 * get_revision() to do the usual traversal.
1791 if (!strcmp(rev
.pending
.objects
[0].name
, "HEAD"))
1795 const char *ref
, *v
;
1796 ref
= resolve_ref_unsafe("HEAD", RESOLVE_REF_READING
,
1798 if (ref
&& skip_prefix(ref
, "refs/heads/", &v
))
1799 branch_name
= xstrdup(v
);
1801 branch_name
= xstrdup(""); /* no branch */
1806 * We cannot move this anywhere earlier because we do want to
1807 * know if --root was given explicitly from the command line.
1809 rev
.show_root_diff
= 1;
1811 if (ignore_if_in_upstream
) {
1812 /* Don't say anything if head and upstream are the same. */
1813 if (rev
.pending
.nr
== 2) {
1814 struct object_array_entry
*o
= rev
.pending
.objects
;
1815 if (oideq(&o
[0].item
->oid
, &o
[1].item
->oid
))
1818 get_patch_ids(&rev
, &ids
);
1821 if (prepare_revision_walk(&rev
))
1822 die(_("revision walk setup failed"));
1824 while ((commit
= get_revision(&rev
)) != NULL
) {
1825 if (commit
->object
.flags
& BOUNDARY
) {
1827 origin
= (boundary_count
== 1) ? commit
: NULL
;
1831 if (ignore_if_in_upstream
&& has_commit_patch_id(commit
, &ids
))
1835 REALLOC_ARRAY(list
, nr
);
1836 list
[nr
- 1] = commit
;
1842 if (cover_letter
== -1) {
1843 if (config_cover_letter
== COVER_AUTO
)
1844 cover_letter
= (total
> 1);
1846 cover_letter
= (config_cover_letter
== COVER_ON
);
1848 if (!keep_subject
&& auto_number
&& (total
> 1 || cover_letter
))
1851 rev
.total
= total
+ start_number
- 1;
1853 if (idiff_prev
.nr
) {
1854 if (!cover_letter
&& total
!= 1)
1855 die(_("--interdiff requires --cover-letter or single patch"));
1856 rev
.idiff_oid1
= &idiff_prev
.oid
[idiff_prev
.nr
- 1];
1857 rev
.idiff_oid2
= get_commit_tree_oid(list
[0]);
1858 rev
.idiff_title
= diff_title(&idiff_title
, reroll_count
,
1860 _("Interdiff against v%d:"));
1863 if (creation_factor
< 0)
1864 creation_factor
= RANGE_DIFF_CREATION_FACTOR_DEFAULT
;
1865 else if (!rdiff_prev
)
1866 die(_("--creation-factor requires --range-diff"));
1869 if (!cover_letter
&& total
!= 1)
1870 die(_("--range-diff requires --cover-letter or single patch"));
1872 infer_range_diff_ranges(&rdiff1
, &rdiff2
, rdiff_prev
,
1874 rev
.rdiff1
= rdiff1
.buf
;
1875 rev
.rdiff2
= rdiff2
.buf
;
1876 rev
.creation_factor
= creation_factor
;
1877 rev
.rdiff_title
= diff_title(&rdiff_title
, reroll_count
,
1879 _("Range-diff against v%d:"));
1883 ; /* --no-signature inhibits all signatures */
1884 } else if (signature
&& signature
!= git_version_string
) {
1885 ; /* non-default signature already set */
1886 } else if (signature_file
) {
1887 struct strbuf buf
= STRBUF_INIT
;
1889 if (strbuf_read_file(&buf
, signature_file
, 128) < 0)
1890 die_errno(_("unable to read signature file '%s'"), signature_file
);
1891 signature
= strbuf_detach(&buf
, NULL
);
1894 memset(&bases
, 0, sizeof(bases
));
1895 if (base_commit
|| base_auto
) {
1896 struct commit
*base
= get_base_commit(base_commit
, list
, nr
);
1897 reset_revision_walk();
1898 clear_object_flags(UNINTERESTING
);
1899 prepare_bases(&bases
, base
, list
, nr
);
1902 if (in_reply_to
|| thread
|| cover_letter
)
1903 rev
.ref_message_ids
= xcalloc(1, sizeof(struct string_list
));
1905 const char *msgid
= clean_message_id(in_reply_to
);
1906 string_list_append(rev
.ref_message_ids
, msgid
);
1908 rev
.numbered_files
= just_numbers
;
1909 rev
.patch_suffix
= fmt_patch_suffix
;
1912 gen_message_id(&rev
, "cover");
1913 make_cover_letter(&rev
, use_stdout
,
1914 origin
, nr
, list
, branch_name
, quiet
);
1915 print_bases(&bases
, rev
.diffopt
.file
);
1916 print_signature(rev
.diffopt
.file
);
1919 /* interdiff/range-diff in cover-letter; omit from patches */
1920 rev
.idiff_oid1
= NULL
;
1923 rev
.add_signoff
= do_signoff
;
1926 progress
= start_delayed_progress(_("Generating patches"), total
);
1929 display_progress(progress
, total
- nr
);
1931 rev
.nr
= total
- nr
+ (start_number
- 1);
1932 /* Make the second and subsequent mails replies to the first */
1934 /* Have we already had a message ID? */
1935 if (rev
.message_id
) {
1937 * For deep threading: make every mail
1938 * a reply to the previous one, no
1939 * matter what other options are set.
1941 * For shallow threading:
1943 * Without --cover-letter and
1944 * --in-reply-to, make every mail a
1945 * reply to the one before.
1947 * With --in-reply-to but no
1948 * --cover-letter, make every mail a
1949 * reply to the <reply-to>.
1951 * With --cover-letter, make every
1952 * mail but the cover letter a reply
1953 * to the cover letter. The cover
1954 * letter is a reply to the
1955 * --in-reply-to, if specified.
1957 if (thread
== THREAD_SHALLOW
1958 && rev
.ref_message_ids
->nr
> 0
1959 && (!cover_letter
|| rev
.nr
> 1))
1960 free(rev
.message_id
);
1962 string_list_append(rev
.ref_message_ids
,
1965 gen_message_id(&rev
, oid_to_hex(&commit
->object
.oid
));
1969 open_next_file(rev
.numbered_files
? NULL
: commit
, NULL
, &rev
, quiet
))
1970 die(_("failed to create output files"));
1971 shown
= log_tree_commit(&rev
, commit
);
1972 free_commit_buffer(the_repository
->parsed_objects
,
1975 /* We put one extra blank line between formatted
1976 * patches and this flag is used by log-tree code
1977 * to see if it needs to emit a LF before showing
1978 * the log; when using one file per patch, we do
1979 * not want the extra blank line.
1984 print_bases(&bases
, rev
.diffopt
.file
);
1985 if (rev
.mime_boundary
)
1986 fprintf(rev
.diffopt
.file
, "\n--%s%s--\n\n\n",
1987 mime_boundary_leader
,
1990 print_signature(rev
.diffopt
.file
);
1993 fclose(rev
.diffopt
.file
);
1995 stop_progress(&progress
);
1998 string_list_clear(&extra_to
, 0);
1999 string_list_clear(&extra_cc
, 0);
2000 string_list_clear(&extra_hdr
, 0);
2001 if (ignore_if_in_upstream
)
2002 free_patch_ids(&ids
);
2005 oid_array_clear(&idiff_prev
);
2006 strbuf_release(&idiff_title
);
2007 strbuf_release(&rdiff1
);
2008 strbuf_release(&rdiff2
);
2009 strbuf_release(&rdiff_title
);
2013 static int add_pending_commit(const char *arg
, struct rev_info
*revs
, int flags
)
2015 struct object_id oid
;
2016 if (get_oid(arg
, &oid
) == 0) {
2017 struct commit
*commit
= lookup_commit_reference(the_repository
,
2020 commit
->object
.flags
|= flags
;
2021 add_pending_object(revs
, &commit
->object
, arg
);
2028 static const char * const cherry_usage
[] = {
2029 N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"),
2033 static void print_commit(char sign
, struct commit
*commit
, int verbose
,
2034 int abbrev
, FILE *file
)
2037 fprintf(file
, "%c %s\n", sign
,
2038 find_unique_abbrev(&commit
->object
.oid
, abbrev
));
2040 struct strbuf buf
= STRBUF_INIT
;
2041 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &buf
);
2042 fprintf(file
, "%c %s %s\n", sign
,
2043 find_unique_abbrev(&commit
->object
.oid
, abbrev
),
2045 strbuf_release(&buf
);
2049 int cmd_cherry(int argc
, const char **argv
, const char *prefix
)
2051 struct rev_info revs
;
2052 struct patch_ids ids
;
2053 struct commit
*commit
;
2054 struct commit_list
*list
= NULL
;
2055 struct branch
*current_branch
;
2056 const char *upstream
;
2057 const char *head
= "HEAD";
2058 const char *limit
= NULL
;
2059 int verbose
= 0, abbrev
= 0;
2061 struct option options
[] = {
2062 OPT__ABBREV(&abbrev
),
2063 OPT__VERBOSE(&verbose
, N_("be verbose")),
2067 argc
= parse_options(argc
, argv
, prefix
, options
, cherry_usage
, 0);
2080 current_branch
= branch_get(NULL
);
2081 upstream
= branch_get_upstream(current_branch
, NULL
);
2083 fprintf(stderr
, _("Could not find a tracked"
2084 " remote branch, please"
2085 " specify <upstream> manually.\n"));
2086 usage_with_options(cherry_usage
, options
);
2090 repo_init_revisions(the_repository
, &revs
, prefix
);
2091 revs
.max_parents
= 1;
2093 if (add_pending_commit(head
, &revs
, 0))
2094 die(_("unknown commit %s"), head
);
2095 if (add_pending_commit(upstream
, &revs
, UNINTERESTING
))
2096 die(_("unknown commit %s"), upstream
);
2098 /* Don't say anything if head and upstream are the same. */
2099 if (revs
.pending
.nr
== 2) {
2100 struct object_array_entry
*o
= revs
.pending
.objects
;
2101 if (oideq(&o
[0].item
->oid
, &o
[1].item
->oid
))
2105 get_patch_ids(&revs
, &ids
);
2107 if (limit
&& add_pending_commit(limit
, &revs
, UNINTERESTING
))
2108 die(_("unknown commit %s"), limit
);
2110 /* reverse the list of commits */
2111 if (prepare_revision_walk(&revs
))
2112 die(_("revision walk setup failed"));
2113 while ((commit
= get_revision(&revs
)) != NULL
) {
2114 commit_list_insert(commit
, &list
);
2120 commit
= list
->item
;
2121 if (has_commit_patch_id(commit
, &ids
))
2123 print_commit(sign
, commit
, verbose
, abbrev
, revs
.diffopt
.file
);
2127 free_patch_ids(&ids
);