2 * Builtin "git log" and related commands (show, whatchanged)
4 * (C) Copyright 2006 Linus Torvalds
15 #include "reflog-walk.h"
16 #include "patch-ids.h"
17 #include "run-command.h"
20 #include "string-list.h"
21 #include "parse-options.h"
24 #include "streaming.h"
27 #include "gpg-interface.h"
29 /* Set a default date-time format for git log ("log.date" config variable) */
30 static const char *default_date_mode
= NULL
;
32 static int default_abbrev_commit
;
33 static int default_show_root
= 1;
34 static int decoration_style
;
35 static int decoration_given
;
36 static int use_mailmap_config
;
37 static const char *fmt_patch_subject_prefix
= "PATCH";
38 static const char *fmt_pretty
;
40 static const char * const builtin_log_usage
[] = {
41 N_("git log [<options>] [<revision range>] [[--] <path>...]\n")
42 N_(" or: git show [options] <object>..."),
46 struct line_opt_callback_data
{
49 struct string_list args
;
52 static int parse_decoration_style(const char *var
, const char *value
)
54 switch (git_config_maybe_bool(var
, value
)) {
56 return DECORATE_SHORT_REFS
;
62 if (!strcmp(value
, "full"))
63 return DECORATE_FULL_REFS
;
64 else if (!strcmp(value
, "short"))
65 return DECORATE_SHORT_REFS
;
69 static int decorate_callback(const struct option
*opt
, const char *arg
, int unset
)
74 decoration_style
= parse_decoration_style("command line", arg
);
76 decoration_style
= DECORATE_SHORT_REFS
;
78 if (decoration_style
< 0)
79 die("invalid --decorate option: %s", arg
);
86 static int log_line_range_callback(const struct option
*option
, const char *arg
, int unset
)
88 struct line_opt_callback_data
*data
= option
->value
;
93 data
->rev
->line_level_traverse
= 1;
94 string_list_append(&data
->args
, arg
);
99 static void cmd_log_init_defaults(struct rev_info
*rev
)
102 get_commit_format(fmt_pretty
, rev
);
103 rev
->verbose_header
= 1;
104 DIFF_OPT_SET(&rev
->diffopt
, RECURSIVE
);
105 rev
->diffopt
.stat_width
= -1; /* use full terminal width */
106 rev
->diffopt
.stat_graph_width
= -1; /* respect statGraphWidth config */
107 rev
->abbrev_commit
= default_abbrev_commit
;
108 rev
->show_root_diff
= default_show_root
;
109 rev
->subject_prefix
= fmt_patch_subject_prefix
;
110 DIFF_OPT_SET(&rev
->diffopt
, ALLOW_TEXTCONV
);
112 if (default_date_mode
)
113 rev
->date_mode
= parse_date_format(default_date_mode
);
114 rev
->diffopt
.touched_flags
= 0;
117 static void cmd_log_init_finish(int argc
, const char **argv
, const char *prefix
,
118 struct rev_info
*rev
, struct setup_revision_opt
*opt
)
120 struct userformat_want w
;
121 int quiet
= 0, source
= 0, mailmap
= 0;
122 static struct line_opt_callback_data line_cb
= {NULL
, NULL
, STRING_LIST_INIT_DUP
};
124 const struct option builtin_log_options
[] = {
125 OPT__QUIET(&quiet
, N_("suppress diff output")),
126 OPT_BOOL(0, "source", &source
, N_("show source")),
127 OPT_BOOL(0, "use-mailmap", &mailmap
, N_("Use mail map file")),
128 { OPTION_CALLBACK
, 0, "decorate", NULL
, NULL
, N_("decorate options"),
129 PARSE_OPT_OPTARG
, decorate_callback
},
130 OPT_CALLBACK('L', NULL
, &line_cb
, "n,m:file",
131 "Process line range n,m in file, counting from 1",
132 log_line_range_callback
),
137 line_cb
.prefix
= prefix
;
139 mailmap
= use_mailmap_config
;
140 argc
= parse_options(argc
, argv
, prefix
,
141 builtin_log_options
, builtin_log_usage
,
142 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN
|
143 PARSE_OPT_KEEP_DASHDASH
);
146 rev
->diffopt
.output_format
|= DIFF_FORMAT_NO_OUTPUT
;
147 argc
= setup_revisions(argc
, argv
, rev
, opt
);
149 /* Any arguments at this point are not recognized */
151 die("unrecognized argument: %s", argv
[1]);
153 memset(&w
, 0, sizeof(w
));
154 userformat_find_requirements(NULL
, &w
);
156 if (!rev
->show_notes_given
&& (!rev
->pretty_given
|| w
.notes
))
159 init_display_notes(&rev
->notes_opt
);
161 if (rev
->diffopt
.pickaxe
|| rev
->diffopt
.filter
)
162 rev
->always_show_header
= 0;
163 if (DIFF_OPT_TST(&rev
->diffopt
, FOLLOW_RENAMES
)) {
164 rev
->always_show_header
= 0;
165 if (rev
->diffopt
.pathspec
.nr
!= 1)
166 usage("git logs can only follow renames on one pathname at a time");
170 rev
->show_source
= 1;
173 rev
->mailmap
= xcalloc(1, sizeof(struct string_list
));
174 read_mailmap(rev
->mailmap
, NULL
);
177 if (rev
->pretty_given
&& rev
->commit_format
== CMIT_FMT_RAW
) {
179 * "log --pretty=raw" is special; ignore UI oriented
180 * configuration variables such as decoration.
182 if (!decoration_given
)
183 decoration_style
= 0;
184 if (!rev
->abbrev_commit_given
)
185 rev
->abbrev_commit
= 0;
188 if (decoration_style
) {
189 rev
->show_decorations
= 1;
190 load_ref_decorations(decoration_style
);
193 if (rev
->line_level_traverse
)
194 line_log_init(rev
, line_cb
.prefix
, &line_cb
.args
);
199 static void cmd_log_init(int argc
, const char **argv
, const char *prefix
,
200 struct rev_info
*rev
, struct setup_revision_opt
*opt
)
202 cmd_log_init_defaults(rev
);
203 cmd_log_init_finish(argc
, argv
, prefix
, rev
, opt
);
207 * This gives a rough estimate for how many commits we
208 * will print out in the list.
210 static int estimate_commit_count(struct rev_info
*rev
, struct commit_list
*list
)
215 struct commit
*commit
= list
->item
;
216 unsigned int flags
= commit
->object
.flags
;
218 if (!(flags
& (TREESAME
| UNINTERESTING
)))
224 static void show_early_header(struct rev_info
*rev
, const char *stage
, int nr
)
226 if (rev
->shown_one
) {
228 if (rev
->commit_format
!= CMIT_FMT_ONELINE
)
229 putchar(rev
->diffopt
.line_termination
);
231 printf(_("Final output: %d %s\n"), nr
, stage
);
234 static struct itimerval early_output_timer
;
236 static void log_show_early(struct rev_info
*revs
, struct commit_list
*list
)
238 int i
= revs
->early_output
;
241 sort_in_topological_order(&list
, revs
->sort_order
);
243 struct commit
*commit
= list
->item
;
244 switch (simplify_commit(revs
, commit
)) {
247 int n
= estimate_commit_count(revs
, list
);
248 show_early_header(revs
, "incomplete", n
);
251 log_tree_commit(revs
, commit
);
262 /* Did we already get enough commits for the early output? */
267 * ..if no, then repeat it twice a second until we
270 * NOTE! We don't use "it_interval", because if the
271 * reader isn't listening, we want our output to be
272 * throttled by the writing, and not have the timer
273 * trigger every second even if we're blocked on a
276 early_output_timer
.it_value
.tv_sec
= 0;
277 early_output_timer
.it_value
.tv_usec
= 500000;
278 setitimer(ITIMER_REAL
, &early_output_timer
, NULL
);
281 static void early_output(int signal
)
283 show_early_output
= log_show_early
;
286 static void setup_early_output(struct rev_info
*rev
)
291 * Set up the signal handler, minimally intrusively:
292 * we only set a single volatile integer word (not
293 * using sigatomic_t - trying to avoid unnecessary
294 * system dependencies and headers), and using
297 memset(&sa
, 0, sizeof(sa
));
298 sa
.sa_handler
= early_output
;
299 sigemptyset(&sa
.sa_mask
);
300 sa
.sa_flags
= SA_RESTART
;
301 sigaction(SIGALRM
, &sa
, NULL
);
304 * If we can get the whole output in less than a
305 * tenth of a second, don't even bother doing the
306 * early-output thing..
308 * This is a one-time-only trigger.
310 early_output_timer
.it_value
.tv_sec
= 0;
311 early_output_timer
.it_value
.tv_usec
= 100000;
312 setitimer(ITIMER_REAL
, &early_output_timer
, NULL
);
315 static void finish_early_output(struct rev_info
*rev
)
317 int n
= estimate_commit_count(rev
, rev
->commits
);
318 signal(SIGALRM
, SIG_IGN
);
319 show_early_header(rev
, "done", n
);
322 static int cmd_log_walk(struct rev_info
*rev
)
324 struct commit
*commit
;
328 if (rev
->early_output
)
329 setup_early_output(rev
);
331 if (prepare_revision_walk(rev
))
332 die(_("revision walk setup failed"));
334 if (rev
->early_output
)
335 finish_early_output(rev
);
338 * For --check and --exit-code, the exit code is based on CHECK_FAILED
339 * and HAS_CHANGES being accumulated in rev->diffopt, so be careful to
340 * retain that state information if replacing rev->diffopt in this loop
342 while ((commit
= get_revision(rev
)) != NULL
) {
343 if (!log_tree_commit(rev
, commit
) &&
346 * We decremented max_count in get_revision,
347 * but we didn't actually show the commit.
350 if (!rev
->reflog_info
) {
351 /* we allow cycles in reflog ancestry */
352 free(commit
->buffer
);
353 commit
->buffer
= NULL
;
355 free_commit_list(commit
->parents
);
356 commit
->parents
= NULL
;
357 if (saved_nrl
< rev
->diffopt
.needed_rename_limit
)
358 saved_nrl
= rev
->diffopt
.needed_rename_limit
;
359 if (rev
->diffopt
.degraded_cc_to_c
)
362 rev
->diffopt
.degraded_cc_to_c
= saved_dcctc
;
363 rev
->diffopt
.needed_rename_limit
= saved_nrl
;
365 if (rev
->diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
&&
366 DIFF_OPT_TST(&rev
->diffopt
, CHECK_FAILED
)) {
369 return diff_result_code(&rev
->diffopt
, 0);
372 static int git_log_config(const char *var
, const char *value
, void *cb
)
374 if (!strcmp(var
, "format.pretty"))
375 return git_config_string(&fmt_pretty
, var
, value
);
376 if (!strcmp(var
, "format.subjectprefix"))
377 return git_config_string(&fmt_patch_subject_prefix
, var
, value
);
378 if (!strcmp(var
, "log.abbrevcommit")) {
379 default_abbrev_commit
= git_config_bool(var
, value
);
382 if (!strcmp(var
, "log.date"))
383 return git_config_string(&default_date_mode
, var
, value
);
384 if (!strcmp(var
, "log.decorate")) {
385 decoration_style
= parse_decoration_style(var
, value
);
386 if (decoration_style
< 0)
387 decoration_style
= 0; /* maybe warn? */
390 if (!strcmp(var
, "log.showroot")) {
391 default_show_root
= git_config_bool(var
, value
);
394 if (starts_with(var
, "color.decorate."))
395 return parse_decorate_color_config(var
, 15, value
);
396 if (!strcmp(var
, "log.mailmap")) {
397 use_mailmap_config
= git_config_bool(var
, value
);
401 if (grep_config(var
, value
, cb
) < 0)
403 if (git_gpg_config(var
, value
, cb
) < 0)
405 return git_diff_ui_config(var
, value
, cb
);
408 int cmd_whatchanged(int argc
, const char **argv
, const char *prefix
)
411 struct setup_revision_opt opt
;
413 init_grep_defaults();
414 git_config(git_log_config
, NULL
);
416 init_revisions(&rev
, prefix
);
418 rev
.simplify_history
= 0;
419 memset(&opt
, 0, sizeof(opt
));
421 opt
.revarg_opt
= REVARG_COMMITTISH
;
422 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
423 if (!rev
.diffopt
.output_format
)
424 rev
.diffopt
.output_format
= DIFF_FORMAT_RAW
;
425 return cmd_log_walk(&rev
);
428 static void show_tagger(char *buf
, int len
, struct rev_info
*rev
)
430 struct strbuf out
= STRBUF_INIT
;
431 struct pretty_print_context pp
= {0};
433 pp
.fmt
= rev
->commit_format
;
434 pp
.date_mode
= rev
->date_mode
;
435 pp_user_info(&pp
, "Tagger", &out
, buf
, get_log_output_encoding());
436 printf("%s", out
.buf
);
437 strbuf_release(&out
);
440 static int show_blob_object(const unsigned char *sha1
, struct rev_info
*rev
, const char *obj_name
)
442 unsigned char sha1c
[20];
443 struct object_context obj_context
;
448 if (!DIFF_OPT_TOUCHED(&rev
->diffopt
, ALLOW_TEXTCONV
) ||
449 !DIFF_OPT_TST(&rev
->diffopt
, ALLOW_TEXTCONV
))
450 return stream_blob_to_fd(1, sha1
, NULL
, 0);
452 if (get_sha1_with_context(obj_name
, 0, sha1c
, &obj_context
))
453 die("Not a valid object name %s", obj_name
);
454 if (!obj_context
.path
[0] ||
455 !textconv_object(obj_context
.path
, obj_context
.mode
, sha1c
, 1, &buf
, &size
))
456 return stream_blob_to_fd(1, sha1
, NULL
, 0);
459 die("git show %s: bad file", obj_name
);
461 write_or_die(1, buf
, size
);
465 static int show_tag_object(const unsigned char *sha1
, struct rev_info
*rev
)
468 enum object_type type
;
469 char *buf
= read_sha1_file(sha1
, &type
, &size
);
473 return error(_("Could not read object %s"), sha1_to_hex(sha1
));
475 assert(type
== OBJ_TAG
);
476 while (offset
< size
&& buf
[offset
] != '\n') {
477 int new_offset
= offset
+ 1;
478 while (new_offset
< size
&& buf
[new_offset
++] != '\n')
480 if (starts_with(buf
+ offset
, "tagger "))
481 show_tagger(buf
+ offset
+ 7,
482 new_offset
- offset
- 7, rev
);
487 fwrite(buf
+ offset
, size
- offset
, 1, stdout
);
492 static int show_tree_object(const unsigned char *sha1
,
493 const char *base
, int baselen
,
494 const char *pathname
, unsigned mode
, int stage
, void *context
)
496 printf("%s%s\n", pathname
, S_ISDIR(mode
) ? "/" : "");
500 static void show_rev_tweak_rev(struct rev_info
*rev
, struct setup_revision_opt
*opt
)
502 if (rev
->ignore_merges
) {
503 /* There was no "-m" on the command line */
504 rev
->ignore_merges
= 0;
505 if (!rev
->first_parent_only
&& !rev
->combine_merges
) {
506 /* No "--first-parent", "-c", or "--cc" */
507 rev
->combine_merges
= 1;
508 rev
->dense_combined_merges
= 1;
511 if (!rev
->diffopt
.output_format
)
512 rev
->diffopt
.output_format
= DIFF_FORMAT_PATCH
;
515 int cmd_show(int argc
, const char **argv
, const char *prefix
)
518 struct object_array_entry
*objects
;
519 struct setup_revision_opt opt
;
520 struct pathspec match_all
;
521 int i
, count
, ret
= 0;
523 init_grep_defaults();
524 git_config(git_log_config
, NULL
);
526 memset(&match_all
, 0, sizeof(match_all
));
527 init_revisions(&rev
, prefix
);
529 rev
.always_show_header
= 1;
530 rev
.no_walk
= REVISION_WALK_NO_WALK_SORTED
;
531 rev
.diffopt
.stat_width
= -1; /* Scale to real terminal size */
533 memset(&opt
, 0, sizeof(opt
));
535 opt
.tweak
= show_rev_tweak_rev
;
536 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
539 return cmd_log_walk(&rev
);
541 count
= rev
.pending
.nr
;
542 objects
= rev
.pending
.objects
;
543 for (i
= 0; i
< count
&& !ret
; i
++) {
544 struct object
*o
= objects
[i
].item
;
545 const char *name
= objects
[i
].name
;
548 ret
= show_blob_object(o
->sha1
, &rev
, name
);
551 struct tag
*t
= (struct tag
*)o
;
555 printf("%stag %s%s\n",
556 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
558 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
559 ret
= show_tag_object(o
->sha1
, &rev
);
563 o
= parse_object(t
->tagged
->sha1
);
565 ret
= error(_("Could not read object %s"),
566 sha1_to_hex(t
->tagged
->sha1
));
574 printf("%stree %s%s\n\n",
575 diff_get_color_opt(&rev
.diffopt
, DIFF_COMMIT
),
577 diff_get_color_opt(&rev
.diffopt
, DIFF_RESET
));
578 read_tree_recursive((struct tree
*)o
, "", 0, 0, &match_all
,
579 show_tree_object
, NULL
);
583 rev
.pending
.nr
= rev
.pending
.alloc
= 0;
584 rev
.pending
.objects
= NULL
;
585 add_object_array(o
, name
, &rev
.pending
);
586 ret
= cmd_log_walk(&rev
);
589 ret
= error(_("Unknown type: %d"), o
->type
);
597 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
599 int cmd_log_reflog(int argc
, const char **argv
, const char *prefix
)
602 struct setup_revision_opt opt
;
604 init_grep_defaults();
605 git_config(git_log_config
, NULL
);
607 init_revisions(&rev
, prefix
);
608 init_reflog_walk(&rev
.reflog_info
);
609 rev
.verbose_header
= 1;
610 memset(&opt
, 0, sizeof(opt
));
612 cmd_log_init_defaults(&rev
);
613 rev
.abbrev_commit
= 1;
614 rev
.commit_format
= CMIT_FMT_ONELINE
;
615 rev
.use_terminator
= 1;
616 rev
.always_show_header
= 1;
617 cmd_log_init_finish(argc
, argv
, prefix
, &rev
, &opt
);
619 return cmd_log_walk(&rev
);
622 int cmd_log(int argc
, const char **argv
, const char *prefix
)
625 struct setup_revision_opt opt
;
627 init_grep_defaults();
628 git_config(git_log_config
, NULL
);
630 init_revisions(&rev
, prefix
);
631 rev
.always_show_header
= 1;
632 memset(&opt
, 0, sizeof(opt
));
634 opt
.revarg_opt
= REVARG_COMMITTISH
;
635 cmd_log_init(argc
, argv
, prefix
, &rev
, &opt
);
636 return cmd_log_walk(&rev
);
641 static const char *fmt_patch_suffix
= ".patch";
642 static int numbered
= 0;
643 static int auto_number
= 1;
645 static char *default_attach
= NULL
;
647 static struct string_list extra_hdr
;
648 static struct string_list extra_to
;
649 static struct string_list extra_cc
;
651 static void add_header(const char *value
)
653 struct string_list_item
*item
;
654 int len
= strlen(value
);
655 while (len
&& value
[len
- 1] == '\n')
658 if (!strncasecmp(value
, "to: ", 4)) {
659 item
= string_list_append(&extra_to
, value
+ 4);
661 } else if (!strncasecmp(value
, "cc: ", 4)) {
662 item
= string_list_append(&extra_cc
, value
+ 4);
665 item
= string_list_append(&extra_hdr
, value
);
668 item
->string
[len
] = '\0';
671 #define THREAD_SHALLOW 1
672 #define THREAD_DEEP 2
674 static int do_signoff
;
675 static const char *signature
= git_version_string
;
676 static int config_cover_letter
;
685 static int git_format_config(const char *var
, const char *value
, void *cb
)
687 if (!strcmp(var
, "format.headers")) {
689 die(_("format.headers without value"));
693 if (!strcmp(var
, "format.suffix"))
694 return git_config_string(&fmt_patch_suffix
, var
, value
);
695 if (!strcmp(var
, "format.to")) {
697 return config_error_nonbool(var
);
698 string_list_append(&extra_to
, value
);
701 if (!strcmp(var
, "format.cc")) {
703 return config_error_nonbool(var
);
704 string_list_append(&extra_cc
, value
);
707 if (!strcmp(var
, "diff.color") || !strcmp(var
, "color.diff") ||
708 !strcmp(var
, "color.ui")) {
711 if (!strcmp(var
, "format.numbered")) {
712 if (value
&& !strcasecmp(value
, "auto")) {
716 numbered
= git_config_bool(var
, value
);
717 auto_number
= auto_number
&& numbered
;
720 if (!strcmp(var
, "format.attach")) {
722 default_attach
= xstrdup(value
);
724 default_attach
= xstrdup(git_version_string
);
727 if (!strcmp(var
, "format.thread")) {
728 if (value
&& !strcasecmp(value
, "deep")) {
729 thread
= THREAD_DEEP
;
732 if (value
&& !strcasecmp(value
, "shallow")) {
733 thread
= THREAD_SHALLOW
;
736 thread
= git_config_bool(var
, value
) && THREAD_SHALLOW
;
739 if (!strcmp(var
, "format.signoff")) {
740 do_signoff
= git_config_bool(var
, value
);
743 if (!strcmp(var
, "format.signature"))
744 return git_config_string(&signature
, var
, value
);
745 if (!strcmp(var
, "format.coverletter")) {
746 if (value
&& !strcasecmp(value
, "auto")) {
747 config_cover_letter
= COVER_AUTO
;
750 config_cover_letter
= git_config_bool(var
, value
) ? COVER_ON
: COVER_OFF
;
754 return git_log_config(var
, value
, cb
);
757 static FILE *realstdout
= NULL
;
758 static const char *output_directory
= NULL
;
759 static int outdir_offset
;
761 static int reopen_stdout(struct commit
*commit
, const char *subject
,
762 struct rev_info
*rev
, int quiet
)
764 struct strbuf filename
= STRBUF_INIT
;
765 int suffix_len
= strlen(rev
->patch_suffix
) + 1;
767 if (output_directory
) {
768 strbuf_addstr(&filename
, output_directory
);
770 PATH_MAX
- FORMAT_PATCH_NAME_MAX
- suffix_len
)
771 return error(_("name of output directory is too long"));
772 if (filename
.buf
[filename
.len
- 1] != '/')
773 strbuf_addch(&filename
, '/');
776 if (rev
->numbered_files
)
777 strbuf_addf(&filename
, "%d", rev
->nr
);
779 fmt_output_commit(&filename
, commit
, rev
);
781 fmt_output_subject(&filename
, subject
, rev
);
784 fprintf(realstdout
, "%s\n", filename
.buf
+ outdir_offset
);
786 if (freopen(filename
.buf
, "w", stdout
) == NULL
)
787 return error(_("Cannot open patch file %s"), filename
.buf
);
789 strbuf_release(&filename
);
793 static void get_patch_ids(struct rev_info
*rev
, struct patch_ids
*ids
)
795 struct rev_info check_rev
;
796 struct commit
*commit
;
797 struct object
*o1
, *o2
;
798 unsigned flags1
, flags2
;
800 if (rev
->pending
.nr
!= 2)
801 die(_("Need exactly one range."));
803 o1
= rev
->pending
.objects
[0].item
;
805 o2
= rev
->pending
.objects
[1].item
;
808 if ((flags1
& UNINTERESTING
) == (flags2
& UNINTERESTING
))
809 die(_("Not a range."));
813 /* given a range a..b get all patch ids for b..a */
814 init_revisions(&check_rev
, rev
->prefix
);
815 check_rev
.max_parents
= 1;
816 o1
->flags
^= UNINTERESTING
;
817 o2
->flags
^= UNINTERESTING
;
818 add_pending_object(&check_rev
, o1
, "o1");
819 add_pending_object(&check_rev
, o2
, "o2");
820 if (prepare_revision_walk(&check_rev
))
821 die(_("revision walk setup failed"));
823 while ((commit
= get_revision(&check_rev
)) != NULL
) {
824 add_commit_patch_id(commit
, ids
);
827 /* reset for next revision walk */
828 clear_commit_marks((struct commit
*)o1
,
829 SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
830 clear_commit_marks((struct commit
*)o2
,
831 SEEN
| UNINTERESTING
| SHOWN
| ADDED
);
836 static void gen_message_id(struct rev_info
*info
, char *base
)
838 struct strbuf buf
= STRBUF_INIT
;
839 strbuf_addf(&buf
, "%s.%lu.git.%s", base
,
840 (unsigned long) time(NULL
),
841 git_committer_info(IDENT_NO_NAME
|IDENT_NO_DATE
|IDENT_STRICT
));
842 info
->message_id
= strbuf_detach(&buf
, NULL
);
845 static void print_signature(void)
847 if (signature
&& *signature
)
848 printf("-- \n%s\n\n", signature
);
851 static void add_branch_description(struct strbuf
*buf
, const char *branch_name
)
853 struct strbuf desc
= STRBUF_INIT
;
854 if (!branch_name
|| !*branch_name
)
856 read_branch_desc(&desc
, branch_name
);
858 strbuf_addch(buf
, '\n');
859 strbuf_add(buf
, desc
.buf
, desc
.len
);
860 strbuf_addch(buf
, '\n');
862 strbuf_release(&desc
);
865 static char *find_branch_name(struct rev_info
*rev
)
867 int i
, positive
= -1;
868 unsigned char branch_sha1
[20];
869 const unsigned char *tip_sha1
;
871 char *full_ref
, *branch
= NULL
;
873 for (i
= 0; i
< rev
->cmdline
.nr
; i
++) {
874 if (rev
->cmdline
.rev
[i
].flags
& UNINTERESTING
)
883 ref
= rev
->cmdline
.rev
[positive
].name
;
884 tip_sha1
= rev
->cmdline
.rev
[positive
].item
->sha1
;
885 if (dwim_ref(ref
, strlen(ref
), branch_sha1
, &full_ref
) &&
886 starts_with(full_ref
, "refs/heads/") &&
887 !hashcmp(tip_sha1
, branch_sha1
))
888 branch
= xstrdup(full_ref
+ strlen("refs/heads/"));
893 static void make_cover_letter(struct rev_info
*rev
, int use_stdout
,
894 struct commit
*origin
,
895 int nr
, struct commit
**list
,
896 const char *branch_name
,
899 const char *committer
;
900 const char *body
= "*** SUBJECT HERE ***\n\n*** BLURB HERE ***\n";
903 struct strbuf sb
= STRBUF_INIT
;
905 const char *encoding
= "UTF-8";
906 struct diff_options opts
;
907 int need_8bit_cte
= 0;
908 struct pretty_print_context pp
= {0};
909 struct commit
*head
= list
[0];
911 if (rev
->commit_format
!= CMIT_FMT_EMAIL
)
912 die(_("Cover letter needs email format"));
914 committer
= git_committer_info(0);
917 reopen_stdout(NULL
, rev
->numbered_files
? NULL
: "cover-letter", rev
, quiet
))
920 log_write_email_headers(rev
, head
, &pp
.subject
, &pp
.after_subject
,
923 for (i
= 0; !need_8bit_cte
&& i
< nr
; i
++)
924 if (has_non_ascii(list
[i
]->buffer
))
928 branch_name
= find_branch_name(rev
);
931 pp
.fmt
= CMIT_FMT_EMAIL
;
932 pp
.date_mode
= DATE_RFC2822
;
933 pp_user_info(&pp
, NULL
, &sb
, committer
, encoding
);
934 pp_title_line(&pp
, &msg
, &sb
, encoding
, need_8bit_cte
);
935 pp_remainder(&pp
, &msg
, &sb
, 0);
936 add_branch_description(&sb
, branch_name
);
937 printf("%s\n", sb
.buf
);
946 for (i
= 0; i
< nr
; i
++)
947 shortlog_add_commit(&log
, list
[i
]);
949 shortlog_output(&log
);
952 * We can only do diffstat with a unique reference point
957 memcpy(&opts
, &rev
->diffopt
, sizeof(opts
));
958 opts
.output_format
= DIFF_FORMAT_SUMMARY
| DIFF_FORMAT_DIFFSTAT
;
960 diff_setup_done(&opts
);
962 diff_tree_sha1(origin
->tree
->object
.sha1
,
963 head
->tree
->object
.sha1
,
972 static const char *clean_message_id(const char *msg_id
)
975 const char *a
, *z
, *m
;
978 while ((ch
= *m
) && (isspace(ch
) || (ch
== '<')))
983 if (!isspace(ch
) && (ch
!= '>'))
988 die(_("insane in-reply-to: %s"), msg_id
);
991 return xmemdupz(a
, z
- a
);
994 static const char *set_outdir(const char *prefix
, const char *output_directory
)
996 if (output_directory
&& is_absolute_path(output_directory
))
997 return output_directory
;
999 if (!prefix
|| !*prefix
) {
1000 if (output_directory
)
1001 return output_directory
;
1002 /* The user did not explicitly ask for "./" */
1007 outdir_offset
= strlen(prefix
);
1008 if (!output_directory
)
1011 return xstrdup(prefix_filename(prefix
, outdir_offset
,
1015 static const char * const builtin_format_patch_usage
[] = {
1016 N_("git format-patch [options] [<since> | <revision range>]"),
1020 static int keep_subject
= 0;
1022 static int keep_callback(const struct option
*opt
, const char *arg
, int unset
)
1024 ((struct rev_info
*)opt
->value
)->total
= -1;
1029 static int subject_prefix
= 0;
1031 static int subject_prefix_callback(const struct option
*opt
, const char *arg
,
1035 ((struct rev_info
*)opt
->value
)->subject_prefix
= arg
;
1039 static int numbered_cmdline_opt
= 0;
1041 static int numbered_callback(const struct option
*opt
, const char *arg
,
1044 *(int *)opt
->value
= numbered_cmdline_opt
= unset
? 0 : 1;
1050 static int no_numbered_callback(const struct option
*opt
, const char *arg
,
1053 return numbered_callback(opt
, arg
, 1);
1056 static int output_directory_callback(const struct option
*opt
, const char *arg
,
1059 const char **dir
= (const char **)opt
->value
;
1061 die(_("Two output directories?"));
1066 static int thread_callback(const struct option
*opt
, const char *arg
, int unset
)
1068 int *thread
= (int *)opt
->value
;
1071 else if (!arg
|| !strcmp(arg
, "shallow"))
1072 *thread
= THREAD_SHALLOW
;
1073 else if (!strcmp(arg
, "deep"))
1074 *thread
= THREAD_DEEP
;
1080 static int attach_callback(const struct option
*opt
, const char *arg
, int unset
)
1082 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1084 rev
->mime_boundary
= NULL
;
1086 rev
->mime_boundary
= arg
;
1088 rev
->mime_boundary
= git_version_string
;
1089 rev
->no_inline
= unset
? 0 : 1;
1093 static int inline_callback(const struct option
*opt
, const char *arg
, int unset
)
1095 struct rev_info
*rev
= (struct rev_info
*)opt
->value
;
1097 rev
->mime_boundary
= NULL
;
1099 rev
->mime_boundary
= arg
;
1101 rev
->mime_boundary
= git_version_string
;
1106 static int header_callback(const struct option
*opt
, const char *arg
, int unset
)
1109 string_list_clear(&extra_hdr
, 0);
1110 string_list_clear(&extra_to
, 0);
1111 string_list_clear(&extra_cc
, 0);
1118 static int to_callback(const struct option
*opt
, const char *arg
, int unset
)
1121 string_list_clear(&extra_to
, 0);
1123 string_list_append(&extra_to
, arg
);
1127 static int cc_callback(const struct option
*opt
, const char *arg
, int unset
)
1130 string_list_clear(&extra_cc
, 0);
1132 string_list_append(&extra_cc
, arg
);
1136 static int from_callback(const struct option
*opt
, const char *arg
, int unset
)
1138 char **from
= opt
->value
;
1145 *from
= xstrdup(arg
);
1147 *from
= xstrdup(git_committer_info(IDENT_NO_DATE
));
1151 int cmd_format_patch(int argc
, const char **argv
, const char *prefix
)
1153 struct commit
*commit
;
1154 struct commit
**list
= NULL
;
1155 struct rev_info rev
;
1156 struct setup_revision_opt s_r_opt
;
1157 int nr
= 0, total
, i
;
1159 int start_number
= -1;
1160 int just_numbers
= 0;
1161 int ignore_if_in_upstream
= 0;
1162 int cover_letter
= -1;
1163 int boundary_count
= 0;
1164 int no_binary_diff
= 0;
1165 struct commit
*origin
= NULL
;
1166 const char *in_reply_to
= NULL
;
1167 struct patch_ids ids
;
1168 struct strbuf buf
= STRBUF_INIT
;
1169 int use_patch_format
= 0;
1171 int reroll_count
= -1;
1172 char *branch_name
= NULL
;
1174 const struct option builtin_format_patch_options
[] = {
1175 { OPTION_CALLBACK
, 'n', "numbered", &numbered
, NULL
,
1176 N_("use [PATCH n/m] even with a single patch"),
1177 PARSE_OPT_NOARG
, numbered_callback
},
1178 { OPTION_CALLBACK
, 'N', "no-numbered", &numbered
, NULL
,
1179 N_("use [PATCH] even with multiple patches"),
1180 PARSE_OPT_NOARG
, no_numbered_callback
},
1181 OPT_BOOL('s', "signoff", &do_signoff
, N_("add Signed-off-by:")),
1182 OPT_BOOL(0, "stdout", &use_stdout
,
1183 N_("print patches to standard out")),
1184 OPT_BOOL(0, "cover-letter", &cover_letter
,
1185 N_("generate a cover letter")),
1186 OPT_BOOL(0, "numbered-files", &just_numbers
,
1187 N_("use simple number sequence for output file names")),
1188 OPT_STRING(0, "suffix", &fmt_patch_suffix
, N_("sfx"),
1189 N_("use <sfx> instead of '.patch'")),
1190 OPT_INTEGER(0, "start-number", &start_number
,
1191 N_("start numbering patches at <n> instead of 1")),
1192 OPT_INTEGER('v', "reroll-count", &reroll_count
,
1193 N_("mark the series as Nth re-roll")),
1194 { OPTION_CALLBACK
, 0, "subject-prefix", &rev
, N_("prefix"),
1195 N_("Use [<prefix>] instead of [PATCH]"),
1196 PARSE_OPT_NONEG
, subject_prefix_callback
},
1197 { OPTION_CALLBACK
, 'o', "output-directory", &output_directory
,
1198 N_("dir"), N_("store resulting files in <dir>"),
1199 PARSE_OPT_NONEG
, output_directory_callback
},
1200 { OPTION_CALLBACK
, 'k', "keep-subject", &rev
, NULL
,
1201 N_("don't strip/add [PATCH]"),
1202 PARSE_OPT_NOARG
| PARSE_OPT_NONEG
, keep_callback
},
1203 OPT_BOOL(0, "no-binary", &no_binary_diff
,
1204 N_("don't output binary diffs")),
1205 OPT_BOOL(0, "ignore-if-in-upstream", &ignore_if_in_upstream
,
1206 N_("don't include a patch matching a commit upstream")),
1207 { OPTION_SET_INT
, 'p', "no-stat", &use_patch_format
, NULL
,
1208 N_("show patch format instead of default (patch + stat)"),
1209 PARSE_OPT_NONEG
| PARSE_OPT_NOARG
, NULL
, 1},
1210 OPT_GROUP(N_("Messaging")),
1211 { OPTION_CALLBACK
, 0, "add-header", NULL
, N_("header"),
1212 N_("add email header"), 0, header_callback
},
1213 { OPTION_CALLBACK
, 0, "to", NULL
, N_("email"), N_("add To: header"),
1215 { OPTION_CALLBACK
, 0, "cc", NULL
, N_("email"), N_("add Cc: header"),
1217 { OPTION_CALLBACK
, 0, "from", &from
, N_("ident"),
1218 N_("set From address to <ident> (or committer ident if absent)"),
1219 PARSE_OPT_OPTARG
, from_callback
},
1220 OPT_STRING(0, "in-reply-to", &in_reply_to
, N_("message-id"),
1221 N_("make first mail a reply to <message-id>")),
1222 { OPTION_CALLBACK
, 0, "attach", &rev
, N_("boundary"),
1223 N_("attach the patch"), PARSE_OPT_OPTARG
,
1225 { OPTION_CALLBACK
, 0, "inline", &rev
, N_("boundary"),
1226 N_("inline the patch"),
1227 PARSE_OPT_OPTARG
| PARSE_OPT_NONEG
,
1229 { OPTION_CALLBACK
, 0, "thread", &thread
, N_("style"),
1230 N_("enable message threading, styles: shallow, deep"),
1231 PARSE_OPT_OPTARG
, thread_callback
},
1232 OPT_STRING(0, "signature", &signature
, N_("signature"),
1233 N_("add a signature")),
1234 OPT__QUIET(&quiet
, N_("don't print the patch filenames")),
1238 extra_hdr
.strdup_strings
= 1;
1239 extra_to
.strdup_strings
= 1;
1240 extra_cc
.strdup_strings
= 1;
1241 init_grep_defaults();
1242 git_config(git_format_config
, NULL
);
1243 init_revisions(&rev
, prefix
);
1244 rev
.commit_format
= CMIT_FMT_EMAIL
;
1245 rev
.verbose_header
= 1;
1247 rev
.max_parents
= 1;
1248 DIFF_OPT_SET(&rev
.diffopt
, RECURSIVE
);
1249 rev
.subject_prefix
= fmt_patch_subject_prefix
;
1250 memset(&s_r_opt
, 0, sizeof(s_r_opt
));
1251 s_r_opt
.def
= "HEAD";
1252 s_r_opt
.revarg_opt
= REVARG_COMMITTISH
;
1254 if (default_attach
) {
1255 rev
.mime_boundary
= default_attach
;
1260 * Parse the arguments before setup_revisions(), or something
1261 * like "git format-patch -o a123 HEAD^.." may fail; a123 is
1262 * possibly a valid SHA1.
1264 argc
= parse_options(argc
, argv
, prefix
, builtin_format_patch_options
,
1265 builtin_format_patch_usage
,
1266 PARSE_OPT_KEEP_ARGV0
| PARSE_OPT_KEEP_UNKNOWN
|
1267 PARSE_OPT_KEEP_DASHDASH
);
1269 if (0 < reroll_count
) {
1270 struct strbuf sprefix
= STRBUF_INIT
;
1271 strbuf_addf(&sprefix
, "%s v%d",
1272 rev
.subject_prefix
, reroll_count
);
1273 rev
.reroll_count
= reroll_count
;
1274 rev
.subject_prefix
= strbuf_detach(&sprefix
, NULL
);
1277 for (i
= 0; i
< extra_hdr
.nr
; i
++) {
1278 strbuf_addstr(&buf
, extra_hdr
.items
[i
].string
);
1279 strbuf_addch(&buf
, '\n');
1283 strbuf_addstr(&buf
, "To: ");
1284 for (i
= 0; i
< extra_to
.nr
; i
++) {
1286 strbuf_addstr(&buf
, " ");
1287 strbuf_addstr(&buf
, extra_to
.items
[i
].string
);
1288 if (i
+ 1 < extra_to
.nr
)
1289 strbuf_addch(&buf
, ',');
1290 strbuf_addch(&buf
, '\n');
1294 strbuf_addstr(&buf
, "Cc: ");
1295 for (i
= 0; i
< extra_cc
.nr
; i
++) {
1297 strbuf_addstr(&buf
, " ");
1298 strbuf_addstr(&buf
, extra_cc
.items
[i
].string
);
1299 if (i
+ 1 < extra_cc
.nr
)
1300 strbuf_addch(&buf
, ',');
1301 strbuf_addch(&buf
, '\n');
1304 rev
.extra_headers
= strbuf_detach(&buf
, NULL
);
1307 if (split_ident_line(&rev
.from_ident
, from
, strlen(from
)))
1308 die(_("invalid ident line: %s"), from
);
1311 if (start_number
< 0)
1315 * If numbered is set solely due to format.numbered in config,
1316 * and it would conflict with --keep-subject (-k) from the
1317 * command line, reset "numbered".
1319 if (numbered
&& keep_subject
&& !numbered_cmdline_opt
)
1322 if (numbered
&& keep_subject
)
1323 die (_("-n and -k are mutually exclusive."));
1324 if (keep_subject
&& subject_prefix
)
1325 die (_("--subject-prefix and -k are mutually exclusive."));
1326 rev
.preserve_subject
= keep_subject
;
1328 argc
= setup_revisions(argc
, argv
, &rev
, &s_r_opt
);
1330 die (_("unrecognized argument: %s"), argv
[1]);
1332 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME
)
1333 die(_("--name-only does not make sense"));
1334 if (rev
.diffopt
.output_format
& DIFF_FORMAT_NAME_STATUS
)
1335 die(_("--name-status does not make sense"));
1336 if (rev
.diffopt
.output_format
& DIFF_FORMAT_CHECKDIFF
)
1337 die(_("--check does not make sense"));
1339 if (!use_patch_format
&&
1340 (!rev
.diffopt
.output_format
||
1341 rev
.diffopt
.output_format
== DIFF_FORMAT_PATCH
))
1342 rev
.diffopt
.output_format
= DIFF_FORMAT_DIFFSTAT
| DIFF_FORMAT_SUMMARY
;
1344 /* Always generate a patch */
1345 rev
.diffopt
.output_format
|= DIFF_FORMAT_PATCH
;
1347 if (!DIFF_OPT_TST(&rev
.diffopt
, TEXT
) && !no_binary_diff
)
1348 DIFF_OPT_SET(&rev
.diffopt
, BINARY
);
1351 init_display_notes(&rev
.notes_opt
);
1354 output_directory
= set_outdir(prefix
, output_directory
);
1358 if (output_directory
) {
1360 die(_("standard output, or directory, which one?"));
1361 if (mkdir(output_directory
, 0777) < 0 && errno
!= EEXIST
)
1362 die_errno(_("Could not create directory '%s'"),
1366 if (rev
.pending
.nr
== 1) {
1369 if (rev
.max_count
< 0 && !rev
.show_root_diff
) {
1371 * This is traditional behaviour of "git format-patch
1372 * origin" that prepares what the origin side still
1375 rev
.pending
.objects
[0].item
->flags
|= UNINTERESTING
;
1376 add_head_to_pending(&rev
);
1380 * Otherwise, it is "format-patch -22 HEAD", and/or
1381 * "format-patch --root HEAD". The user wants
1382 * get_revision() to do the usual traversal.
1385 if (!strcmp(rev
.pending
.objects
[0].name
, "HEAD"))
1389 unsigned char sha1
[20];
1391 ref
= resolve_ref_unsafe("HEAD", sha1
, 1, NULL
);
1392 if (ref
&& starts_with(ref
, "refs/heads/"))
1393 branch_name
= xstrdup(ref
+ strlen("refs/heads/"));
1395 branch_name
= xstrdup(""); /* no branch */
1400 * We cannot move this anywhere earlier because we do want to
1401 * know if --root was given explicitly from the command line.
1403 rev
.show_root_diff
= 1;
1405 if (ignore_if_in_upstream
) {
1406 /* Don't say anything if head and upstream are the same. */
1407 if (rev
.pending
.nr
== 2) {
1408 struct object_array_entry
*o
= rev
.pending
.objects
;
1409 if (hashcmp(o
[0].item
->sha1
, o
[1].item
->sha1
) == 0)
1412 get_patch_ids(&rev
, &ids
);
1416 realstdout
= xfdopen(xdup(1), "w");
1418 if (prepare_revision_walk(&rev
))
1419 die(_("revision walk setup failed"));
1421 while ((commit
= get_revision(&rev
)) != NULL
) {
1422 if (commit
->object
.flags
& BOUNDARY
) {
1424 origin
= (boundary_count
== 1) ? commit
: NULL
;
1428 if (ignore_if_in_upstream
&&
1429 has_commit_patch_id(commit
, &ids
))
1433 list
= xrealloc(list
, nr
* sizeof(list
[0]));
1434 list
[nr
- 1] = commit
;
1440 if (!keep_subject
&& auto_number
&& total
> 1)
1443 rev
.total
= total
+ start_number
- 1;
1444 if (cover_letter
== -1) {
1445 if (config_cover_letter
== COVER_AUTO
)
1446 cover_letter
= (total
> 1);
1448 cover_letter
= (config_cover_letter
== COVER_ON
);
1451 if (in_reply_to
|| thread
|| cover_letter
)
1452 rev
.ref_message_ids
= xcalloc(1, sizeof(struct string_list
));
1454 const char *msgid
= clean_message_id(in_reply_to
);
1455 string_list_append(rev
.ref_message_ids
, msgid
);
1457 rev
.numbered_files
= just_numbers
;
1458 rev
.patch_suffix
= fmt_patch_suffix
;
1461 gen_message_id(&rev
, "cover");
1462 make_cover_letter(&rev
, use_stdout
,
1463 origin
, nr
, list
, branch_name
, quiet
);
1467 rev
.add_signoff
= do_signoff
;
1471 rev
.nr
= total
- nr
+ (start_number
- 1);
1472 /* Make the second and subsequent mails replies to the first */
1474 /* Have we already had a message ID? */
1475 if (rev
.message_id
) {
1477 * For deep threading: make every mail
1478 * a reply to the previous one, no
1479 * matter what other options are set.
1481 * For shallow threading:
1483 * Without --cover-letter and
1484 * --in-reply-to, make every mail a
1485 * reply to the one before.
1487 * With --in-reply-to but no
1488 * --cover-letter, make every mail a
1489 * reply to the <reply-to>.
1491 * With --cover-letter, make every
1492 * mail but the cover letter a reply
1493 * to the cover letter. The cover
1494 * letter is a reply to the
1495 * --in-reply-to, if specified.
1497 if (thread
== THREAD_SHALLOW
1498 && rev
.ref_message_ids
->nr
> 0
1499 && (!cover_letter
|| rev
.nr
> 1))
1500 free(rev
.message_id
);
1502 string_list_append(rev
.ref_message_ids
,
1505 gen_message_id(&rev
, sha1_to_hex(commit
->object
.sha1
));
1509 reopen_stdout(rev
.numbered_files
? NULL
: commit
, NULL
, &rev
, quiet
))
1510 die(_("Failed to create output files"));
1511 shown
= log_tree_commit(&rev
, commit
);
1512 free(commit
->buffer
);
1513 commit
->buffer
= NULL
;
1515 /* We put one extra blank line between formatted
1516 * patches and this flag is used by log-tree code
1517 * to see if it needs to emit a LF before showing
1518 * the log; when using one file per patch, we do
1519 * not want the extra blank line.
1524 if (rev
.mime_boundary
)
1525 printf("\n--%s%s--\n\n\n",
1526 mime_boundary_leader
,
1536 string_list_clear(&extra_to
, 0);
1537 string_list_clear(&extra_cc
, 0);
1538 string_list_clear(&extra_hdr
, 0);
1539 if (ignore_if_in_upstream
)
1540 free_patch_ids(&ids
);
1544 static int add_pending_commit(const char *arg
, struct rev_info
*revs
, int flags
)
1546 unsigned char sha1
[20];
1547 if (get_sha1(arg
, sha1
) == 0) {
1548 struct commit
*commit
= lookup_commit_reference(sha1
);
1550 commit
->object
.flags
|= flags
;
1551 add_pending_object(revs
, &commit
->object
, arg
);
1558 static const char * const cherry_usage
[] = {
1559 N_("git cherry [-v] [<upstream> [<head> [<limit>]]]"),
1563 static void print_commit(char sign
, struct commit
*commit
, int verbose
,
1567 printf("%c %s\n", sign
,
1568 find_unique_abbrev(commit
->object
.sha1
, abbrev
));
1570 struct strbuf buf
= STRBUF_INIT
;
1571 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &buf
);
1572 printf("%c %s %s\n", sign
,
1573 find_unique_abbrev(commit
->object
.sha1
, abbrev
),
1575 strbuf_release(&buf
);
1579 int cmd_cherry(int argc
, const char **argv
, const char *prefix
)
1581 struct rev_info revs
;
1582 struct patch_ids ids
;
1583 struct commit
*commit
;
1584 struct commit_list
*list
= NULL
;
1585 struct branch
*current_branch
;
1586 const char *upstream
;
1587 const char *head
= "HEAD";
1588 const char *limit
= NULL
;
1589 int verbose
= 0, abbrev
= 0;
1591 struct option options
[] = {
1592 OPT__ABBREV(&abbrev
),
1593 OPT__VERBOSE(&verbose
, N_("be verbose")),
1597 argc
= parse_options(argc
, argv
, prefix
, options
, cherry_usage
, 0);
1610 current_branch
= branch_get(NULL
);
1611 if (!current_branch
|| !current_branch
->merge
1612 || !current_branch
->merge
[0]
1613 || !current_branch
->merge
[0]->dst
) {
1614 fprintf(stderr
, _("Could not find a tracked"
1615 " remote branch, please"
1616 " specify <upstream> manually.\n"));
1617 usage_with_options(cherry_usage
, options
);
1620 upstream
= current_branch
->merge
[0]->dst
;
1623 init_revisions(&revs
, prefix
);
1624 revs
.max_parents
= 1;
1626 if (add_pending_commit(head
, &revs
, 0))
1627 die(_("Unknown commit %s"), head
);
1628 if (add_pending_commit(upstream
, &revs
, UNINTERESTING
))
1629 die(_("Unknown commit %s"), upstream
);
1631 /* Don't say anything if head and upstream are the same. */
1632 if (revs
.pending
.nr
== 2) {
1633 struct object_array_entry
*o
= revs
.pending
.objects
;
1634 if (hashcmp(o
[0].item
->sha1
, o
[1].item
->sha1
) == 0)
1638 get_patch_ids(&revs
, &ids
);
1640 if (limit
&& add_pending_commit(limit
, &revs
, UNINTERESTING
))
1641 die(_("Unknown commit %s"), limit
);
1643 /* reverse the list of commits */
1644 if (prepare_revision_walk(&revs
))
1645 die(_("revision walk setup failed"));
1646 while ((commit
= get_revision(&revs
)) != NULL
) {
1647 commit_list_insert(commit
, &list
);
1653 commit
= list
->item
;
1654 if (has_commit_patch_id(commit
, &ids
))
1656 print_commit(sign
, commit
, verbose
, abbrev
);
1660 free_patch_ids(&ids
);