core.legacyheaders: Use the description used in RelNotes-1.5.0
[git/git.git] / builtin-log.c
CommitLineData
70827b15
LT
1/*
2 * Builtin "git log" and related commands (show, whatchanged)
3 *
4 * (C) Copyright 2006 Linus Torvalds
5 * 2006 Junio Hamano
6 */
7#include "cache.h"
8#include "commit.h"
9#include "diff.h"
10#include "revision.h"
11#include "log-tree.h"
91efcf60 12#include "builtin.h"
5d7eeee2 13#include "tag.h"
cf39f54e 14#include "reflog-walk.h"
70827b15 15
0f03ca94
PB
16static int default_show_root = 1;
17
e686eb98
JS
18/* this is in builtin-diff.c */
19void add_head(struct rev_info *revs);
20
a633fca0 21static void cmd_log_init(int argc, const char **argv, const char *prefix,
70827b15
LT
22 struct rev_info *rev)
23{
52883fbd
JH
24 int i;
25
70827b15
LT
26 rev->abbrev = DEFAULT_ABBREV;
27 rev->commit_format = CMIT_FMT_DEFAULT;
28 rev->verbose_header = 1;
0f03ca94 29 rev->show_root_diff = default_show_root;
70827b15 30 argc = setup_revisions(argc, argv, rev, "HEAD");
9dafea26
TH
31 if (rev->diffopt.pickaxe || rev->diffopt.filter)
32 rev->always_show_header = 0;
52883fbd
JH
33 for (i = 1; i < argc; i++) {
34 const char *arg = argv[i];
35 if (!strncmp(arg, "--encoding=", 11)) {
36 arg += 11;
52883fbd 37 if (strcmp(arg, "none"))
d2c11a38 38 git_log_output_encoding = strdup(arg);
52883fbd 39 else
d2c11a38 40 git_log_output_encoding = "";
52883fbd
JH
41 }
42 else
43 die("unrecognized argument: %s", arg);
44 }
9dafea26
TH
45}
46
47static int cmd_log_walk(struct rev_info *rev)
48{
49 struct commit *commit;
70827b15
LT
50
51 prepare_revision_walk(rev);
70827b15
LT
52 while ((commit = get_revision(rev)) != NULL) {
53 log_tree_commit(rev, commit);
a6c73064
JS
54 if (!rev->reflog_info) {
55 /* we allow cycles in reflog ancestry */
56 free(commit->buffer);
57 commit->buffer = NULL;
58 }
cb115748
LT
59 free_commit_list(commit->parents);
60 commit->parents = NULL;
70827b15
LT
61 }
62 return 0;
63}
64
0f03ca94
PB
65static int git_log_config(const char *var, const char *value)
66{
67 if (!strcmp(var, "log.showroot")) {
68 default_show_root = git_config_bool(var, value);
69 return 0;
70 }
71 return git_diff_ui_config(var, value);
72}
73
a633fca0 74int cmd_whatchanged(int argc, const char **argv, const char *prefix)
70827b15
LT
75{
76 struct rev_info rev;
77
0f03ca94 78 git_config(git_log_config);
db6296a5 79 init_revisions(&rev, prefix);
70827b15
LT
80 rev.diff = 1;
81 rev.diffopt.recursive = 1;
9202434c 82 rev.simplify_history = 0;
a633fca0 83 cmd_log_init(argc, argv, prefix, &rev);
9dafea26
TH
84 if (!rev.diffopt.output_format)
85 rev.diffopt.output_format = DIFF_FORMAT_RAW;
86 return cmd_log_walk(&rev);
70827b15
LT
87}
88
5d7eeee2
JS
89static int show_object(const unsigned char *sha1, int suppress_header)
90{
91 unsigned long size;
92 char type[20];
93 char *buf = read_sha1_file(sha1, type, &size);
94 int offset = 0;
95
96 if (!buf)
97 return error("Could not read object %s", sha1_to_hex(sha1));
98
99 if (suppress_header)
100 while (offset < size && buf[offset++] != '\n') {
101 int new_offset = offset;
102 while (new_offset < size && buf[new_offset++] != '\n')
103 ; /* do nothing */
104 offset = new_offset;
105 }
106
107 if (offset < size)
108 fwrite(buf + offset, size - offset, 1, stdout);
109 free(buf);
110 return 0;
111}
112
113static int show_tree_object(const unsigned char *sha1,
114 const char *base, int baselen,
115 const char *pathname, unsigned mode, int stage)
116{
117 printf("%s%s\n", pathname, S_ISDIR(mode) ? "/" : "");
118 return 0;
119}
120
a633fca0 121int cmd_show(int argc, const char **argv, const char *prefix)
70827b15
LT
122{
123 struct rev_info rev;
5d7eeee2
JS
124 struct object_array_entry *objects;
125 int i, count, ret = 0;
70827b15 126
0f03ca94 127 git_config(git_log_config);
db6296a5 128 init_revisions(&rev, prefix);
70827b15
LT
129 rev.diff = 1;
130 rev.diffopt.recursive = 1;
131 rev.combine_merges = 1;
132 rev.dense_combined_merges = 1;
133 rev.always_show_header = 1;
134 rev.ignore_merges = 0;
135 rev.no_walk = 1;
a633fca0 136 cmd_log_init(argc, argv, prefix, &rev);
5d7eeee2
JS
137
138 count = rev.pending.nr;
139 objects = rev.pending.objects;
140 for (i = 0; i < count && !ret; i++) {
141 struct object *o = objects[i].item;
142 const char *name = objects[i].name;
143 switch (o->type) {
144 case OBJ_BLOB:
145 ret = show_object(o->sha1, 0);
146 break;
147 case OBJ_TAG: {
148 struct tag *t = (struct tag *)o;
149
150 printf("%stag %s%s\n\n",
151 diff_get_color(rev.diffopt.color_diff,
152 DIFF_COMMIT),
153 t->tag,
154 diff_get_color(rev.diffopt.color_diff,
155 DIFF_RESET));
156 ret = show_object(o->sha1, 1);
157 objects[i].item = (struct object *)t->tagged;
158 i--;
159 break;
160 }
161 case OBJ_TREE:
162 printf("%stree %s%s\n\n",
163 diff_get_color(rev.diffopt.color_diff,
164 DIFF_COMMIT),
165 name,
166 diff_get_color(rev.diffopt.color_diff,
167 DIFF_RESET));
168 read_tree_recursive((struct tree *)o, "", 0, 0, NULL,
169 show_tree_object);
170 break;
171 case OBJ_COMMIT:
172 rev.pending.nr = rev.pending.alloc = 0;
173 rev.pending.objects = NULL;
174 add_object_array(o, name, &rev.pending);
175 ret = cmd_log_walk(&rev);
176 break;
177 default:
178 ret = error("Unknown type: %d", o->type);
179 }
180 }
181 free(objects);
182 return ret;
70827b15
LT
183}
184
cf39f54e
LT
185/*
186 * This is equivalent to "git log -g --abbrev-commit --pretty=oneline"
187 */
188int cmd_log_reflog(int argc, const char **argv, const char *prefix)
189{
190 struct rev_info rev;
191
192 git_config(git_log_config);
193 init_revisions(&rev, prefix);
194 init_reflog_walk(&rev.reflog_info);
195 rev.abbrev_commit = 1;
196 rev.verbose_header = 1;
197 cmd_log_init(argc, argv, prefix, &rev);
198
199 /*
200 * This means that we override whatever commit format the user gave
201 * on the cmd line. Sad, but cmd_log_init() currently doesn't
202 * allow us to set a different default.
203 */
204 rev.commit_format = CMIT_FMT_ONELINE;
205 rev.always_show_header = 1;
206
207 /*
208 * We get called through "git reflog", so unlike the other log
209 * routines, we need to set up our pager manually..
210 */
211 setup_pager();
212
213 return cmd_log_walk(&rev);
214}
215
a633fca0 216int cmd_log(int argc, const char **argv, const char *prefix)
70827b15
LT
217{
218 struct rev_info rev;
219
0f03ca94 220 git_config(git_log_config);
db6296a5 221 init_revisions(&rev, prefix);
70827b15 222 rev.always_show_header = 1;
a633fca0 223 cmd_log_init(argc, argv, prefix, &rev);
9dafea26 224 return cmd_log_walk(&rev);
70827b15 225}
91efcf60 226
0377db77
JS
227static int istitlechar(char c)
228{
229 return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z') ||
230 (c >= '0' && c <= '9') || c == '.' || c == '_';
231}
232
20ff0680
JS
233static char *extra_headers = NULL;
234static int extra_headers_size = 0;
917a8f89 235static const char *fmt_patch_suffix = ".patch";
20ff0680
JS
236
237static int git_format_config(const char *var, const char *value)
238{
239 if (!strcmp(var, "format.headers")) {
d7fb91c6
JH
240 int len;
241
242 if (!value)
243 die("format.headers without value");
244 len = strlen(value);
20ff0680 245 extra_headers_size += len + 1;
83572c1a 246 extra_headers = xrealloc(extra_headers, extra_headers_size);
20ff0680
JS
247 extra_headers[extra_headers_size - len - 1] = 0;
248 strcat(extra_headers, value);
249 return 0;
250 }
03eeaeae
JH
251 if (!strcmp(var, "format.suffix")) {
252 if (!value)
253 die("format.suffix without value");
254 fmt_patch_suffix = xstrdup(value);
255 return 0;
256 }
a159ca0c 257 if (!strcmp(var, "diff.color") || !strcmp(var, "color.diff")) {
f3aafa4d
RA
258 return 0;
259 }
0f03ca94 260 return git_log_config(var, value);
20ff0680
JS
261}
262
263
81f3a188 264static FILE *realstdout = NULL;
efd02016 265static const char *output_directory = NULL;
81f3a188 266
8ac80a57 267static void reopen_stdout(struct commit *commit, int nr, int keep_subject)
0377db77
JS
268{
269 char filename[1024];
270 char *sol;
2448482b 271 int len = 0;
03eeaeae 272 int suffix_len = strlen(fmt_patch_suffix) + 10; /* ., NUL and slop */
0377db77 273
2448482b 274 if (output_directory) {
03eeaeae 275 strlcpy(filename, output_directory, 1000);
2448482b
JS
276 len = strlen(filename);
277 if (filename[len - 1] != '/')
278 filename[len++] = '/';
279 }
0377db77 280
2448482b 281 sprintf(filename + len, "%04d", nr);
0377db77
JS
282 len = strlen(filename);
283
284 sol = strstr(commit->buffer, "\n\n");
285 if (sol) {
286 int j, space = 1;
287
288 sol += 2;
289 /* strip [PATCH] or [PATCH blabla] */
8ac80a57 290 if (!keep_subject && !strncmp(sol, "[PATCH", 6)) {
0377db77
JS
291 char *eos = strchr(sol + 6, ']');
292 if (eos) {
293 while (isspace(*eos))
294 eos++;
295 sol = eos;
296 }
297 }
298
03eeaeae
JH
299 for (j = 0;
300 len < sizeof(filename) - suffix_len &&
301 sol[j] && sol[j] != '\n';
302 j++) {
0377db77
JS
303 if (istitlechar(sol[j])) {
304 if (space) {
305 filename[len++] = '-';
306 space = 0;
307 }
308 filename[len++] = sol[j];
309 if (sol[j] == '.')
310 while (sol[j + 1] == '.')
311 j++;
312 } else
313 space = 1;
314 }
315 while (filename[len - 1] == '.' || filename[len - 1] == '-')
316 len--;
317 }
03eeaeae 318 strcpy(filename + len, fmt_patch_suffix);
81f3a188 319 fprintf(realstdout, "%s\n", filename);
0377db77
JS
320 freopen(filename, "w", stdout);
321}
322
9c6efa36
JS
323static int get_patch_id(struct commit *commit, struct diff_options *options,
324 unsigned char *sha1)
325{
2b60356d
RS
326 if (commit->parents)
327 diff_tree_sha1(commit->parents->item->object.sha1,
328 commit->object.sha1, "", options);
329 else
330 diff_root_tree_sha1(commit->object.sha1, "", options);
9c6efa36
JS
331 diffcore_std(options);
332 return diff_flush_patch_id(options, sha1);
333}
334
a633fca0 335static void get_patch_ids(struct rev_info *rev, struct diff_options *options, const char *prefix)
9c6efa36
JS
336{
337 struct rev_info check_rev;
338 struct commit *commit;
339 struct object *o1, *o2;
340 unsigned flags1, flags2;
341 unsigned char sha1[20];
342
343 if (rev->pending.nr != 2)
344 die("Need exactly one range.");
345
346 o1 = rev->pending.objects[0].item;
347 flags1 = o1->flags;
348 o2 = rev->pending.objects[1].item;
349 flags2 = o2->flags;
350
351 if ((flags1 & UNINTERESTING) == (flags2 & UNINTERESTING))
352 die("Not a range.");
353
354 diff_setup(options);
355 options->recursive = 1;
356 if (diff_setup_done(options) < 0)
357 die("diff_setup_done failed");
358
359 /* given a range a..b get all patch ids for b..a */
db6296a5 360 init_revisions(&check_rev, prefix);
9c6efa36
JS
361 o1->flags ^= UNINTERESTING;
362 o2->flags ^= UNINTERESTING;
363 add_pending_object(&check_rev, o1, "o1");
364 add_pending_object(&check_rev, o2, "o2");
365 prepare_revision_walk(&check_rev);
366
367 while ((commit = get_revision(&check_rev)) != NULL) {
368 /* ignore merges */
369 if (commit->parents && commit->parents->next)
370 continue;
371
372 if (!get_patch_id(commit, options, sha1))
373 created_object(sha1, xcalloc(1, sizeof(struct object)));
374 }
375
376 /* reset for next revision walk */
81db0941
JS
377 clear_commit_marks((struct commit *)o1,
378 SEEN | UNINTERESTING | SHOWN | ADDED);
379 clear_commit_marks((struct commit *)o2,
380 SEEN | UNINTERESTING | SHOWN | ADDED);
9c6efa36
JS
381 o1->flags = flags1;
382 o2->flags = flags2;
383}
384
d1566f78
JT
385static void gen_message_id(char *dest, unsigned int length, char *base)
386{
cb280e10 387 const char *committer = git_committer_info(-1);
d1566f78
JT
388 const char *email_start = strrchr(committer, '<');
389 const char *email_end = strrchr(committer, '>');
390 if(!email_start || !email_end || email_start > email_end - 1)
391 die("Could not extract email from committer identity.");
76af0734
JH
392 snprintf(dest, length, "%s.%lu.git.%.*s", base,
393 (unsigned long) time(NULL),
394 (int)(email_end - email_start - 1), email_start + 1);
d1566f78
JT
395}
396
a633fca0 397int cmd_format_patch(int argc, const char **argv, const char *prefix)
91efcf60
JH
398{
399 struct commit *commit;
400 struct commit **list = NULL;
401 struct rev_info rev;
2448482b 402 int nr = 0, total, i, j;
0377db77 403 int use_stdout = 0;
596524b3 404 int numbered = 0;
fa0f02df 405 int start_number = -1;
8ac80a57 406 int keep_subject = 0;
9c6efa36 407 int ignore_if_in_upstream = 0;
cc35de84 408 int thread = 0;
76af0734 409 const char *in_reply_to = NULL;
9c6efa36 410 struct diff_options patch_id_opts;
cf2251b6 411 char *add_signoff = NULL;
d1566f78
JT
412 char message_id[1024];
413 char ref_message_id[1024];
91efcf60 414
97beb812 415 git_config(git_format_config);
db6296a5 416 init_revisions(&rev, prefix);
91efcf60
JH
417 rev.commit_format = CMIT_FMT_EMAIL;
418 rev.verbose_header = 1;
419 rev.diff = 1;
91efcf60
JH
420 rev.combine_merges = 0;
421 rev.ignore_merges = 1;
27e1b127
JH
422 rev.diffopt.msg_sep = "";
423 rev.diffopt.recursive = 1;
91efcf60 424
20ff0680
JS
425 rev.extra_headers = extra_headers;
426
2448482b
JS
427 /*
428 * Parse the arguments before setup_revisions(), or something
429 * like "git fmt-patch -o a123 HEAD^.." may fail; a123 is
430 * possibly a valid SHA1.
431 */
432 for (i = 1, j = 1; i < argc; i++) {
433 if (!strcmp(argv[i], "--stdout"))
0377db77 434 use_stdout = 1;
596524b3
JS
435 else if (!strcmp(argv[i], "-n") ||
436 !strcmp(argv[i], "--numbered"))
437 numbered = 1;
fa0f02df
JS
438 else if (!strncmp(argv[i], "--start-number=", 15))
439 start_number = strtol(argv[i] + 15, NULL, 10);
440 else if (!strcmp(argv[i], "--start-number")) {
441 i++;
442 if (i == argc)
443 die("Need a number for --start-number");
444 start_number = strtol(argv[i], NULL, 10);
cf2251b6
JH
445 }
446 else if (!strcmp(argv[i], "-k") ||
8ac80a57
JS
447 !strcmp(argv[i], "--keep-subject")) {
448 keep_subject = 1;
449 rev.total = -1;
cf2251b6 450 }
efd02016
JH
451 else if (!strcmp(argv[i], "--output-directory") ||
452 !strcmp(argv[i], "-o")) {
2448482b 453 i++;
efd02016
JH
454 if (argc <= i)
455 die("Which directory?");
456 if (output_directory)
457 die("Two output directories?");
458 output_directory = argv[i];
698ce6f8 459 }
cf2251b6
JH
460 else if (!strcmp(argv[i], "--signoff") ||
461 !strcmp(argv[i], "-s")) {
6c4cca1c
EB
462 const char *committer;
463 const char *endpos;
6c4cca1c
EB
464 committer = git_committer_info(1);
465 endpos = strchr(committer, '>');
cf2251b6
JH
466 if (!endpos)
467 die("bogos committer info %s\n", committer);
468 add_signoff = xmalloc(endpos - committer + 2);
469 memcpy(add_signoff, committer, endpos - committer + 1);
470 add_signoff[endpos - committer + 1] = 0;
471 }
698ce6f8
JS
472 else if (!strcmp(argv[i], "--attach"))
473 rev.mime_boundary = git_version_string;
474 else if (!strncmp(argv[i], "--attach=", 9))
475 rev.mime_boundary = argv[i] + 9;
9c6efa36
JS
476 else if (!strcmp(argv[i], "--ignore-if-in-upstream"))
477 ignore_if_in_upstream = 1;
cc35de84
JT
478 else if (!strcmp(argv[i], "--thread"))
479 thread = 1;
da56645d
JT
480 else if (!strncmp(argv[i], "--in-reply-to=", 14))
481 in_reply_to = argv[i] + 14;
482 else if (!strcmp(argv[i], "--in-reply-to")) {
483 i++;
484 if (i == argc)
485 die("Need a Message-Id for --in-reply-to");
486 in_reply_to = argv[i];
487 }
03eeaeae
JH
488 else if (!strncmp(argv[i], "--suffix=", 9))
489 fmt_patch_suffix = argv[i] + 9;
698ce6f8 490 else
2448482b 491 argv[j++] = argv[i];
0377db77 492 }
2448482b
JS
493 argc = j;
494
add5c8a5 495 if (start_number < 0)
fa0f02df 496 start_number = 1;
63b398a4 497 if (numbered && keep_subject)
8ac80a57
JS
498 die ("-n and -k are mutually exclusive.");
499
2448482b
JS
500 argc = setup_revisions(argc, argv, &rev, "HEAD");
501 if (argc > 1)
502 die ("unrecognized argument: %s", argv[1]);
0377db77 503
c9b5ef99 504 if (!rev.diffopt.output_format)
c261e438 505 rev.diffopt.output_format = DIFF_FORMAT_DIFFSTAT | DIFF_FORMAT_SUMMARY | DIFF_FORMAT_PATCH;
c9b5ef99 506
e47f306d
JH
507 if (!rev.diffopt.text)
508 rev.diffopt.binary = 1;
509
90f70a91 510 if (!output_directory && !use_stdout)
77e565d8
ML
511 output_directory = prefix;
512
efd02016
JH
513 if (output_directory) {
514 if (use_stdout)
515 die("standard output, or directory, which one?");
516 if (mkdir(output_directory, 0777) < 0 && errno != EEXIST)
517 die("Could not create directory %s",
518 output_directory);
519 }
520
1f1e895f 521 if (rev.pending.nr == 1) {
7c496280
JH
522 if (rev.max_count < 0) {
523 rev.pending.objects[0].item->flags |= UNINTERESTING;
524 add_head(&rev);
525 }
526 /* Otherwise, it is "format-patch -22 HEAD", and
527 * get_revision() would return only the specified count.
528 */
e686eb98
JS
529 }
530
9c6efa36 531 if (ignore_if_in_upstream)
a633fca0 532 get_patch_ids(&rev, &patch_id_opts, prefix);
9c6efa36 533
81f3a188
JS
534 if (!use_stdout)
535 realstdout = fdopen(dup(1), "w");
536
91efcf60
JH
537 prepare_revision_walk(&rev);
538 while ((commit = get_revision(&rev)) != NULL) {
9c6efa36
JS
539 unsigned char sha1[20];
540
0377db77
JS
541 /* ignore merges */
542 if (commit->parents && commit->parents->next)
543 continue;
9c6efa36
JS
544
545 if (ignore_if_in_upstream &&
546 !get_patch_id(commit, &patch_id_opts, sha1) &&
547 lookup_object(sha1))
548 continue;
549
91efcf60 550 nr++;
83572c1a 551 list = xrealloc(list, nr * sizeof(list[0]));
91efcf60
JH
552 list[nr - 1] = commit;
553 }
0377db77 554 total = nr;
596524b3 555 if (numbered)
fa0f02df 556 rev.total = total + start_number - 1;
cf2251b6 557 rev.add_signoff = add_signoff;
da56645d 558 rev.ref_message_id = in_reply_to;
91efcf60
JH
559 while (0 <= --nr) {
560 int shown;
561 commit = list[nr];
add5c8a5 562 rev.nr = total - nr + (start_number - 1);
d1566f78 563 /* Make the second and subsequent mails replies to the first */
cc35de84
JT
564 if (thread) {
565 if (nr == (total - 2)) {
566 strncpy(ref_message_id, message_id,
567 sizeof(ref_message_id));
568 ref_message_id[sizeof(ref_message_id)-1]='\0';
569 rev.ref_message_id = ref_message_id;
570 }
571 gen_message_id(message_id, sizeof(message_id),
572 sha1_to_hex(commit->object.sha1));
573 rev.message_id = message_id;
d1566f78 574 }
0377db77 575 if (!use_stdout)
8ac80a57 576 reopen_stdout(commit, rev.nr, keep_subject);
91efcf60
JH
577 shown = log_tree_commit(&rev, commit);
578 free(commit->buffer);
579 commit->buffer = NULL;
add5c8a5
JH
580
581 /* We put one extra blank line between formatted
582 * patches and this flag is used by log-tree code
583 * to see if it needs to emit a LF before showing
584 * the log; when using one file per patch, we do
585 * not want the extra blank line.
586 */
587 if (!use_stdout)
588 rev.shown_one = 0;
698ce6f8
JS
589 if (shown) {
590 if (rev.mime_boundary)
591 printf("\n--%s%s--\n\n\n",
592 mime_boundary_leader,
593 rev.mime_boundary);
594 else
595 printf("-- \n%s\n\n", git_version_string);
596 }
0377db77
JS
597 if (!use_stdout)
598 fclose(stdout);
91efcf60
JH
599 }
600 free(list);
601 return 0;
602}
603
e827633a
RS
604static int add_pending_commit(const char *arg, struct rev_info *revs, int flags)
605{
606 unsigned char sha1[20];
607 if (get_sha1(arg, sha1) == 0) {
608 struct commit *commit = lookup_commit_reference(sha1);
609 if (commit) {
610 commit->object.flags |= flags;
611 add_pending_object(revs, &commit->object, arg);
612 return 0;
613 }
614 }
615 return -1;
616}
617
618static const char cherry_usage[] =
619"git-cherry [-v] <upstream> [<head>] [<limit>]";
620int cmd_cherry(int argc, const char **argv, const char *prefix)
621{
622 struct rev_info revs;
623 struct diff_options patch_id_opts;
624 struct commit *commit;
625 struct commit_list *list = NULL;
626 const char *upstream;
627 const char *head = "HEAD";
628 const char *limit = NULL;
629 int verbose = 0;
630
631 if (argc > 1 && !strcmp(argv[1], "-v")) {
632 verbose = 1;
633 argc--;
634 argv++;
635 }
636
637 switch (argc) {
638 case 4:
639 limit = argv[3];
640 /* FALLTHROUGH */
641 case 3:
642 head = argv[2];
643 /* FALLTHROUGH */
644 case 2:
645 upstream = argv[1];
646 break;
647 default:
648 usage(cherry_usage);
649 }
650
651 init_revisions(&revs, prefix);
652 revs.diff = 1;
653 revs.combine_merges = 0;
654 revs.ignore_merges = 1;
655 revs.diffopt.recursive = 1;
656
657 if (add_pending_commit(head, &revs, 0))
658 die("Unknown commit %s", head);
659 if (add_pending_commit(upstream, &revs, UNINTERESTING))
660 die("Unknown commit %s", upstream);
661
662 /* Don't say anything if head and upstream are the same. */
663 if (revs.pending.nr == 2) {
664 struct object_array_entry *o = revs.pending.objects;
665 if (hashcmp(o[0].item->sha1, o[1].item->sha1) == 0)
666 return 0;
667 }
668
669 get_patch_ids(&revs, &patch_id_opts, prefix);
670
671 if (limit && add_pending_commit(limit, &revs, UNINTERESTING))
672 die("Unknown commit %s", limit);
673
674 /* reverse the list of commits */
675 prepare_revision_walk(&revs);
676 while ((commit = get_revision(&revs)) != NULL) {
677 /* ignore merges */
678 if (commit->parents && commit->parents->next)
679 continue;
680
681 commit_list_insert(commit, &list);
682 }
683
684 while (list) {
685 unsigned char sha1[20];
686 char sign = '+';
687
688 commit = list->item;
689 if (!get_patch_id(commit, &patch_id_opts, sha1) &&
690 lookup_object(sha1))
691 sign = '-';
692
693 if (verbose) {
694 static char buf[16384];
695 pretty_print_commit(CMIT_FMT_ONELINE, commit, ~0,
696 buf, sizeof(buf), 0, NULL, NULL, 0);
697 printf("%c %s %s\n", sign,
698 sha1_to_hex(commit->object.sha1), buf);
699 }
700 else {
701 printf("%c %s\n", sign,
702 sha1_to_hex(commit->object.sha1));
703 }
704
705 list = list->next;
706 }
707
708 return 0;
709}