git.oblomov.eu Git - git/blob - revision.c

   1 #include "cache.h"
   2 #include "tag.h"
   3 #include "blob.h"
   4 #include "tree.h"
   5 #include "commit.h"
   6 #include "diff.h"
   7 #include "refs.h"
   8 #include "revision.h"
   9 #include "graph.h"
  10 #include "grep.h"
  11 #include "reflog-walk.h"
  12 #include "patch-ids.h"
  13 #include "decorate.h"
  14 #include "log-tree.h"
  15
  16 volatile show_early_output_fn_t show_early_output;
  17
  18 char *path_name(const struct name_path *path, const char *name)
  19 {
  20         const struct name_path *p;
  21         char *n, *m;
  22         int nlen = strlen(name);
  23         int len = nlen + 1;
  24
  25         for (p = path; p; p = p->up) {
  26                 if (p->elem_len)
  27                         len += p->elem_len + 1;
  28         }
  29         n = xmalloc(len);
  30         m = n + len - (nlen + 1);
  31         strcpy(m, name);
  32         for (p = path; p; p = p->up) {
  33                 if (p->elem_len) {
  34                         m -= p->elem_len + 1;
  35                         memcpy(m, p->elem, p->elem_len);
  36                         m[p->elem_len] = '/';
  37                 }
  38         }
  39         return n;
  40 }
  41
  42 void add_object(struct object *obj,
  43                 struct object_array *p,
  44                 struct name_path *path,
  45                 const char *name)
  46 {
  47         add_object_array(obj, path_name(path, name), p);
  48 }
  49
  50 static void mark_blob_uninteresting(struct blob *blob)
  51 {
  52         if (!blob)
  53                 return;
  54         if (blob->object.flags & UNINTERESTING)
  55                 return;
  56         blob->object.flags |= UNINTERESTING;
  57 }
  58
  59 void mark_tree_uninteresting(struct tree *tree)
  60 {
  61         struct tree_desc desc;
  62         struct name_entry entry;
  63         struct object *obj = &tree->object;
  64
  65         if (!tree)
  66                 return;
  67         if (obj->flags & UNINTERESTING)
  68                 return;
  69         obj->flags |= UNINTERESTING;
  70         if (!has_sha1_file(obj->sha1))
  71                 return;
  72         if (parse_tree(tree) < 0)
  73                 die("bad tree %s", sha1_to_hex(obj->sha1));
  74
  75         init_tree_desc(&desc, tree->buffer, tree->size);
  76         while (tree_entry(&desc, &entry)) {
  77                 switch (object_type(entry.mode)) {
  78                 case OBJ_TREE:
  79                         mark_tree_uninteresting(lookup_tree(entry.sha1));
  80                         break;
  81                 case OBJ_BLOB:
  82                         mark_blob_uninteresting(lookup_blob(entry.sha1));
  83                         break;
  84                 default:
  85                         /* Subproject commit - not in this repository */
  86                         break;
  87                 }
  88         }
  89
  90         /*
  91          * We don't care about the tree any more
  92          * after it has been marked uninteresting.
  93          */
  94         free(tree->buffer);
  95         tree->buffer = NULL;
  96 }
  97
  98 void mark_parents_uninteresting(struct commit *commit)
  99 {
 100         struct commit_list *parents = commit->parents;
 101
 102         while (parents) {
 103                 struct commit *commit = parents->item;
 104                 if (!(commit->object.flags & UNINTERESTING)) {
 105                         commit->object.flags |= UNINTERESTING;
 106
 107                         /*
 108                          * Normally we haven't parsed the parent
 109                          * yet, so we won't have a parent of a parent
 110                          * here. However, it may turn out that we've
 111                          * reached this commit some other way (where it
 112                          * wasn't uninteresting), in which case we need
 113                          * to mark its parents recursively too..
 114                          */
 115                         if (commit->parents)
 116                                 mark_parents_uninteresting(commit);
 117                 }
 118
 119                 /*
 120                  * A missing commit is ok iff its parent is marked
 121                  * uninteresting.
 122                  *
 123                  * We just mark such a thing parsed, so that when
 124                  * it is popped next time around, we won't be trying
 125                  * to parse it and get an error.
 126                  */
 127                 if (!has_sha1_file(commit->object.sha1))
 128                         commit->object.parsed = 1;
 129                 parents = parents->next;
 130         }
 131 }
 132
 133 static void add_pending_object_with_mode(struct rev_info *revs, struct object *obj, const char *name, unsigned mode)
 134 {
 135         if (revs->no_walk && (obj->flags & UNINTERESTING))
 136                 die("object ranges do not make sense when not walking revisions");
 137         if (revs->reflog_info && obj->type == OBJ_COMMIT &&
 138                         add_reflog_for_walk(revs->reflog_info,
 139                                 (struct commit *)obj, name))
 140                 return;
 141         add_object_array_with_mode(obj, name, &revs->pending, mode);
 142 }
 143
 144 void add_pending_object(struct rev_info *revs, struct object *obj, const char *name)
 145 {
 146         add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
 147 }
 148
 149 void add_head_to_pending(struct rev_info *revs)
 150 {
 151         unsigned char sha1[20];
 152         struct object *obj;
 153         if (get_sha1("HEAD", sha1))
 154                 return;
 155         obj = parse_object(sha1);
 156         if (!obj)
 157                 return;
 158         add_pending_object(revs, obj, "HEAD");
 159 }
 160
 161 static struct object *get_reference(struct rev_info *revs, const char *name, const unsigned char *sha1, unsigned int flags)
 162 {
 163         struct object *object;
 164
 165         object = parse_object(sha1);
 166         if (!object)
 167                 die("bad object %s", name);
 168         object->flags |= flags;
 169         return object;
 170 }
 171
 172 static struct commit *handle_commit(struct rev_info *revs, struct object *object, const char *name)
 173 {
 174         unsigned long flags = object->flags;
 175
 176         /*
 177          * Tag object? Look what it points to..
 178          */
 179         while (object->type == OBJ_TAG) {
 180                 struct tag *tag = (struct tag *) object;
 181                 if (revs->tag_objects && !(flags & UNINTERESTING))
 182                         add_pending_object(revs, object, tag->tag);
 183                 if (!tag->tagged)
 184                         die("bad tag");
 185                 object = parse_object(tag->tagged->sha1);
 186                 if (!object) {
 187                         if (flags & UNINTERESTING)
 188                                 return NULL;
 189                         die("bad object %s", sha1_to_hex(tag->tagged->sha1));
 190                 }
 191         }
 192
 193         /*
 194          * Commit object? Just return it, we'll do all the complex
 195          * reachability crud.
 196          */
 197         if (object->type == OBJ_COMMIT) {
 198                 struct commit *commit = (struct commit *)object;
 199                 if (parse_commit(commit) < 0)
 200                         die("unable to parse commit %s", name);
 201                 if (flags & UNINTERESTING) {
 202                         commit->object.flags |= UNINTERESTING;
 203                         mark_parents_uninteresting(commit);
 204                         revs->limited = 1;
 205                 }
 206                 if (revs->show_source && !commit->util)
 207                         commit->util = (void *) name;
 208                 return commit;
 209         }
 210
 211         /*
 212          * Tree object? Either mark it uninteresting, or add it
 213          * to the list of objects to look at later..
 214          */
 215         if (object->type == OBJ_TREE) {
 216                 struct tree *tree = (struct tree *)object;
 217                 if (!revs->tree_objects)
 218                         return NULL;
 219                 if (flags & UNINTERESTING) {
 220                         mark_tree_uninteresting(tree);
 221                         return NULL;
 222                 }
 223                 add_pending_object(revs, object, "");
 224                 return NULL;
 225         }
 226
 227         /*
 228          * Blob object? You know the drill by now..
 229          */
 230         if (object->type == OBJ_BLOB) {
 231                 struct blob *blob = (struct blob *)object;
 232                 if (!revs->blob_objects)
 233                         return NULL;
 234                 if (flags & UNINTERESTING) {
 235                         mark_blob_uninteresting(blob);
 236                         return NULL;
 237                 }
 238                 add_pending_object(revs, object, "");
 239                 return NULL;
 240         }
 241         die("%s is unknown object", name);
 242 }
 243
 244 static int everybody_uninteresting(struct commit_list *orig)
 245 {
 246         struct commit_list *list = orig;
 247         while (list) {
 248                 struct commit *commit = list->item;
 249                 list = list->next;
 250                 if (commit->object.flags & UNINTERESTING)
 251                         continue;
 252                 return 0;
 253         }
 254         return 1;
 255 }
 256
 257 /*
 258  * The goal is to get REV_TREE_NEW as the result only if the
 259  * diff consists of all '+' (and no other changes), and
 260  * REV_TREE_DIFFERENT otherwise (of course if the trees are
 261  * the same we want REV_TREE_SAME).  That means that once we
 262  * get to REV_TREE_DIFFERENT, we do not have to look any further.
 263  */
 264 static int tree_difference = REV_TREE_SAME;
 265
 266 static void file_add_remove(struct diff_options *options,
 267                     int addremove, unsigned mode,
 268                     const unsigned char *sha1,
 269                     const char *fullpath)
 270 {
 271         int diff = REV_TREE_DIFFERENT;
 272
 273         /*
 274          * Is it an add of a new file? It means that the old tree
 275          * didn't have it at all, so we will turn "REV_TREE_SAME" ->
 276          * "REV_TREE_NEW", but leave any "REV_TREE_DIFFERENT" alone
 277          * (and if it already was "REV_TREE_NEW", we'll keep it
 278          * "REV_TREE_NEW" of course).
 279          */
 280         if (addremove == '+') {
 281                 diff = tree_difference;
 282                 if (diff != REV_TREE_SAME)
 283                         return;
 284                 diff = REV_TREE_NEW;
 285         }
 286         tree_difference = diff;
 287         if (tree_difference == REV_TREE_DIFFERENT)
 288                 DIFF_OPT_SET(options, HAS_CHANGES);
 289 }
 290
 291 static void file_change(struct diff_options *options,
 292                  unsigned old_mode, unsigned new_mode,
 293                  const unsigned char *old_sha1,
 294                  const unsigned char *new_sha1,
 295                  const char *fullpath)
 296 {
 297         tree_difference = REV_TREE_DIFFERENT;
 298         DIFF_OPT_SET(options, HAS_CHANGES);
 299 }
 300
 301 static int rev_compare_tree(struct rev_info *revs, struct commit *parent, struct commit *commit)
 302 {
 303         struct tree *t1 = parent->tree;
 304         struct tree *t2 = commit->tree;
 305
 306         if (!t1)
 307                 return REV_TREE_NEW;
 308
 309         if (revs->simplify_by_decoration) {
 310                 /*
 311                  * If we are simplifying by decoration, then the commit
 312                  * is worth showing if it has a tag pointing at it.
 313                  */
 314                 if (lookup_decoration(&name_decoration, &commit->object))
 315                         return REV_TREE_DIFFERENT;
 316                 /*
 317                  * A commit that is not pointed by a tag is uninteresting
 318                  * if we are not limited by path.  This means that you will
 319                  * see the usual "commits that touch the paths" plus any
 320                  * tagged commit by specifying both --simplify-by-decoration
 321                  * and pathspec.
 322                  */
 323                 if (!revs->prune_data)
 324                         return REV_TREE_SAME;
 325         }
 326         if (!t2)
 327                 return REV_TREE_DIFFERENT;
 328         tree_difference = REV_TREE_SAME;
 329         DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 330         if (diff_tree_sha1(t1->object.sha1, t2->object.sha1, "",
 331                            &revs->pruning) < 0)
 332                 return REV_TREE_DIFFERENT;
 333         return tree_difference;
 334 }
 335
 336 static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
 337 {
 338         int retval;
 339         void *tree;
 340         unsigned long size;
 341         struct tree_desc empty, real;
 342         struct tree *t1 = commit->tree;
 343
 344         if (!t1)
 345                 return 0;
 346
 347         tree = read_object_with_reference(t1->object.sha1, tree_type, &size, NULL);
 348         if (!tree)
 349                 return 0;
 350         init_tree_desc(&real, tree, size);
 351         init_tree_desc(&empty, "", 0);
 352
 353         tree_difference = REV_TREE_SAME;
 354         DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 355         retval = diff_tree(&empty, &real, "", &revs->pruning);
 356         free(tree);
 357
 358         return retval >= 0 && (tree_difference == REV_TREE_SAME);
 359 }
 360
 361 static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 362 {
 363         struct commit_list **pp, *parent;
 364         int tree_changed = 0, tree_same = 0;
 365
 366         /*
 367          * If we don't do pruning, everything is interesting
 368          */
 369         if (!revs->prune)
 370                 return;
 371
 372         if (!commit->tree)
 373                 return;
 374
 375         if (!commit->parents) {
 376                 if (rev_same_tree_as_empty(revs, commit))
 377                         commit->object.flags |= TREESAME;
 378                 return;
 379         }
 380
 381         /*
 382          * Normal non-merge commit? If we don't want to make the
 383          * history dense, we consider it always to be a change..
 384          */
 385         if (!revs->dense && !commit->parents->next)
 386                 return;
 387
 388         pp = &commit->parents;
 389         while ((parent = *pp) != NULL) {
 390                 struct commit *p = parent->item;
 391
 392                 if (parse_commit(p) < 0)
 393                         die("cannot simplify commit %s (because of %s)",
 394                             sha1_to_hex(commit->object.sha1),
 395                             sha1_to_hex(p->object.sha1));
 396                 switch (rev_compare_tree(revs, p, commit)) {
 397                 case REV_TREE_SAME:
 398                         tree_same = 1;
 399                         if (!revs->simplify_history || (p->object.flags & UNINTERESTING)) {
 400                                 /* Even if a merge with an uninteresting
 401                                  * side branch brought the entire change
 402                                  * we are interested in, we do not want
 403                                  * to lose the other branches of this
 404                                  * merge, so we just keep going.
 405                                  */
 406                                 pp = &parent->next;
 407                                 continue;
 408                         }
 409                         parent->next = NULL;
 410                         commit->parents = parent;
 411                         commit->object.flags |= TREESAME;
 412                         return;
 413
 414                 case REV_TREE_NEW:
 415                         if (revs->remove_empty_trees &&
 416                             rev_same_tree_as_empty(revs, p)) {
 417                                 /* We are adding all the specified
 418                                  * paths from this parent, so the
 419                                  * history beyond this parent is not
 420                                  * interesting.  Remove its parents
 421                                  * (they are grandparents for us).
 422                                  * IOW, we pretend this parent is a
 423                                  * "root" commit.
 424                                  */
 425                                 if (parse_commit(p) < 0)
 426                                         die("cannot simplify commit %s (invalid %s)",
 427                                             sha1_to_hex(commit->object.sha1),
 428                                             sha1_to_hex(p->object.sha1));
 429                                 p->parents = NULL;
 430                         }
 431                 /* fallthrough */
 432                 case REV_TREE_DIFFERENT:
 433                         tree_changed = 1;
 434                         pp = &parent->next;
 435                         continue;
 436                 }
 437                 die("bad tree compare for commit %s", sha1_to_hex(commit->object.sha1));
 438         }
 439         if (tree_changed && !tree_same)
 440                 return;
 441         commit->object.flags |= TREESAME;
 442 }
 443
 444 static void insert_by_date_cached(struct commit *p, struct commit_list **head,
 445                     struct commit_list *cached_base, struct commit_list **cache)
 446 {
 447         struct commit_list *new_entry;
 448
 449         if (cached_base && p->date < cached_base->item->date)
 450                 new_entry = insert_by_date(p, &cached_base->next);
 451         else
 452                 new_entry = insert_by_date(p, head);
 453
 454         if (cache && (!*cache || p->date < (*cache)->item->date))
 455                 *cache = new_entry;
 456 }
 457
 458 static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
 459                     struct commit_list **list, struct commit_list **cache_ptr)
 460 {
 461         struct commit_list *parent = commit->parents;
 462         unsigned left_flag;
 463         struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
 464
 465         if (commit->object.flags & ADDED)
 466                 return 0;
 467         commit->object.flags |= ADDED;
 468
 469         /*
 470          * If the commit is uninteresting, don't try to
 471          * prune parents - we want the maximal uninteresting
 472          * set.
 473          *
 474          * Normally we haven't parsed the parent
 475          * yet, so we won't have a parent of a parent
 476          * here. However, it may turn out that we've
 477          * reached this commit some other way (where it
 478          * wasn't uninteresting), in which case we need
 479          * to mark its parents recursively too..
 480          */
 481         if (commit->object.flags & UNINTERESTING) {
 482                 while (parent) {
 483                         struct commit *p = parent->item;
 484                         parent = parent->next;
 485                         if (p)
 486                                 p->object.flags |= UNINTERESTING;
 487                         if (parse_commit(p) < 0)
 488                                 continue;
 489                         if (p->parents)
 490                                 mark_parents_uninteresting(p);
 491                         if (p->object.flags & SEEN)
 492                                 continue;
 493                         p->object.flags |= SEEN;
 494                         insert_by_date_cached(p, list, cached_base, cache_ptr);
 495                 }
 496                 return 0;
 497         }
 498
 499         /*
 500          * Ok, the commit wasn't uninteresting. Try to
 501          * simplify the commit history and find the parent
 502          * that has no differences in the path set if one exists.
 503          */
 504         try_to_simplify_commit(revs, commit);
 505
 506         if (revs->no_walk)
 507                 return 0;
 508
 509         left_flag = (commit->object.flags & SYMMETRIC_LEFT);
 510
 511         for (parent = commit->parents; parent; parent = parent->next) {
 512                 struct commit *p = parent->item;
 513
 514                 if (parse_commit(p) < 0)
 515                         return -1;
 516                 if (revs->show_source && !p->util)
 517                         p->util = commit->util;
 518                 p->object.flags |= left_flag;
 519                 if (!(p->object.flags & SEEN)) {
 520                         p->object.flags |= SEEN;
 521                         insert_by_date_cached(p, list, cached_base, cache_ptr);
 522                 }
 523                 if (revs->first_parent_only)
 524                         break;
 525         }
 526         return 0;
 527 }
 528
 529 static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 530 {
 531         struct commit_list *p;
 532         int left_count = 0, right_count = 0;
 533         int left_first;
 534         struct patch_ids ids;
 535
 536         /* First count the commits on the left and on the right */
 537         for (p = list; p; p = p->next) {
 538                 struct commit *commit = p->item;
 539                 unsigned flags = commit->object.flags;
 540                 if (flags & BOUNDARY)
 541                         ;
 542                 else if (flags & SYMMETRIC_LEFT)
 543                         left_count++;
 544                 else
 545                         right_count++;
 546         }
 547
 548         left_first = left_count < right_count;
 549         init_patch_ids(&ids);
 550         if (revs->diffopt.nr_paths) {
 551                 ids.diffopts.nr_paths = revs->diffopt.nr_paths;
 552                 ids.diffopts.paths = revs->diffopt.paths;
 553                 ids.diffopts.pathlens = revs->diffopt.pathlens;
 554         }
 555
 556         /* Compute patch-ids for one side */
 557         for (p = list; p; p = p->next) {
 558                 struct commit *commit = p->item;
 559                 unsigned flags = commit->object.flags;
 560
 561                 if (flags & BOUNDARY)
 562                         continue;
 563                 /*
 564                  * If we have fewer left, left_first is set and we omit
 565                  * commits on the right branch in this loop.  If we have
 566                  * fewer right, we skip the left ones.
 567                  */
 568                 if (left_first != !!(flags & SYMMETRIC_LEFT))
 569                         continue;
 570                 commit->util = add_commit_patch_id(commit, &ids);
 571         }
 572
 573         /* Check the other side */
 574         for (p = list; p; p = p->next) {
 575                 struct commit *commit = p->item;
 576                 struct patch_id *id;
 577                 unsigned flags = commit->object.flags;
 578
 579                 if (flags & BOUNDARY)
 580                         continue;
 581                 /*
 582                  * If we have fewer left, left_first is set and we omit
 583                  * commits on the left branch in this loop.
 584                  */
 585                 if (left_first == !!(flags & SYMMETRIC_LEFT))
 586                         continue;
 587
 588                 /*
 589                  * Have we seen the same patch id?
 590                  */
 591                 id = has_commit_patch_id(commit, &ids);
 592                 if (!id)
 593                         continue;
 594                 id->seen = 1;
 595                 commit->object.flags |= SHOWN;
 596         }
 597
 598         /* Now check the original side for seen ones */
 599         for (p = list; p; p = p->next) {
 600                 struct commit *commit = p->item;
 601                 struct patch_id *ent;
 602
 603                 ent = commit->util;
 604                 if (!ent)
 605                         continue;
 606                 if (ent->seen)
 607                         commit->object.flags |= SHOWN;
 608                 commit->util = NULL;
 609         }
 610
 611         free_patch_ids(&ids);
 612 }
 613
 614 /* How many extra uninteresting commits we want to see.. */
 615 #define SLOP 5
 616
 617 static int still_interesting(struct commit_list *src, unsigned long date, int slop)
 618 {
 619         /*
 620          * No source list at all? We're definitely done..
 621          */
 622         if (!src)
 623                 return 0;
 624
 625         /*
 626          * Does the destination list contain entries with a date
 627          * before the source list? Definitely _not_ done.
 628          */
 629         if (date < src->item->date)
 630                 return SLOP;
 631
 632         /*
 633          * Does the source list still have interesting commits in
 634          * it? Definitely not done..
 635          */
 636         if (!everybody_uninteresting(src))
 637                 return SLOP;
 638
 639         /* Ok, we're closing in.. */
 640         return slop-1;
 641 }
 642
 643 static int limit_list(struct rev_info *revs)
 644 {
 645         int slop = SLOP;
 646         unsigned long date = ~0ul;
 647         struct commit_list *list = revs->commits;
 648         struct commit_list *newlist = NULL;
 649         struct commit_list **p = &newlist;
 650
 651         while (list) {
 652                 struct commit_list *entry = list;
 653                 struct commit *commit = list->item;
 654                 struct object *obj = &commit->object;
 655                 show_early_output_fn_t show;
 656
 657                 list = list->next;
 658                 free(entry);
 659
 660                 if (revs->max_age != -1 && (commit->date < revs->max_age))
 661                         obj->flags |= UNINTERESTING;
 662                 if (add_parents_to_list(revs, commit, &list, NULL) < 0)
 663                         return -1;
 664                 if (obj->flags & UNINTERESTING) {
 665                         mark_parents_uninteresting(commit);
 666                         if (revs->show_all)
 667                                 p = &commit_list_insert(commit, p)->next;
 668                         slop = still_interesting(list, date, slop);
 669                         if (slop)
 670                                 continue;
 671                         /* If showing all, add the whole pending list to the end */
 672                         if (revs->show_all)
 673                                 *p = list;
 674                         break;
 675                 }
 676                 if (revs->min_age != -1 && (commit->date > revs->min_age))
 677                         continue;
 678                 date = commit->date;
 679                 p = &commit_list_insert(commit, p)->next;
 680
 681                 show = show_early_output;
 682                 if (!show)
 683                         continue;
 684
 685                 show(revs, newlist);
 686                 show_early_output = NULL;
 687         }
 688         if (revs->cherry_pick)
 689                 cherry_pick_list(newlist, revs);
 690
 691         revs->commits = newlist;
 692         return 0;
 693 }
 694
 695 struct all_refs_cb {
 696         int all_flags;
 697         int warned_bad_reflog;
 698         struct rev_info *all_revs;
 699         const char *name_for_errormsg;
 700 };
 701
 702 static int handle_one_ref(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 703 {
 704         struct all_refs_cb *cb = cb_data;
 705         struct object *object = get_reference(cb->all_revs, path, sha1,
 706                                               cb->all_flags);
 707         add_pending_object(cb->all_revs, object, path);
 708         return 0;
 709 }
 710
 711 static void handle_refs(struct rev_info *revs, unsigned flags,
 712                 int (*for_each)(each_ref_fn, void *))
 713 {
 714         struct all_refs_cb cb;
 715         cb.all_revs = revs;
 716         cb.all_flags = flags;
 717         for_each(handle_one_ref, &cb);
 718 }
 719
 720 static void handle_one_reflog_commit(unsigned char *sha1, void *cb_data)
 721 {
 722         struct all_refs_cb *cb = cb_data;
 723         if (!is_null_sha1(sha1)) {
 724                 struct object *o = parse_object(sha1);
 725                 if (o) {
 726                         o->flags |= cb->all_flags;
 727                         add_pending_object(cb->all_revs, o, "");
 728                 }
 729                 else if (!cb->warned_bad_reflog) {
 730                         warning("reflog of '%s' references pruned commits",
 731                                 cb->name_for_errormsg);
 732                         cb->warned_bad_reflog = 1;
 733                 }
 734         }
 735 }
 736
 737 static int handle_one_reflog_ent(unsigned char *osha1, unsigned char *nsha1,
 738                 const char *email, unsigned long timestamp, int tz,
 739                 const char *message, void *cb_data)
 740 {
 741         handle_one_reflog_commit(osha1, cb_data);
 742         handle_one_reflog_commit(nsha1, cb_data);
 743         return 0;
 744 }
 745
 746 static int handle_one_reflog(const char *path, const unsigned char *sha1, int flag, void *cb_data)
 747 {
 748         struct all_refs_cb *cb = cb_data;
 749         cb->warned_bad_reflog = 0;
 750         cb->name_for_errormsg = path;
 751         for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
 752         return 0;
 753 }
 754
 755 static void handle_reflog(struct rev_info *revs, unsigned flags)
 756 {
 757         struct all_refs_cb cb;
 758         cb.all_revs = revs;
 759         cb.all_flags = flags;
 760         for_each_reflog(handle_one_reflog, &cb);
 761 }
 762
 763 static int add_parents_only(struct rev_info *revs, const char *arg, int flags)
 764 {
 765         unsigned char sha1[20];
 766         struct object *it;
 767         struct commit *commit;
 768         struct commit_list *parents;
 769
 770         if (*arg == '^') {
 771                 flags ^= UNINTERESTING;
 772                 arg++;
 773         }
 774         if (get_sha1(arg, sha1))
 775                 return 0;
 776         while (1) {
 777                 it = get_reference(revs, arg, sha1, 0);
 778                 if (it->type != OBJ_TAG)
 779                         break;
 780                 if (!((struct tag*)it)->tagged)
 781                         return 0;
 782                 hashcpy(sha1, ((struct tag*)it)->tagged->sha1);
 783         }
 784         if (it->type != OBJ_COMMIT)
 785                 return 0;
 786         commit = (struct commit *)it;
 787         for (parents = commit->parents; parents; parents = parents->next) {
 788                 it = &parents->item->object;
 789                 it->flags |= flags;
 790                 add_pending_object(revs, it, arg);
 791         }
 792         return 1;
 793 }
 794
 795 void init_revisions(struct rev_info *revs, const char *prefix)
 796 {
 797         memset(revs, 0, sizeof(*revs));
 798
 799         revs->abbrev = DEFAULT_ABBREV;
 800         revs->ignore_merges = 1;
 801         revs->simplify_history = 1;
 802         DIFF_OPT_SET(&revs->pruning, RECURSIVE);
 803         DIFF_OPT_SET(&revs->pruning, QUIET);
 804         revs->pruning.add_remove = file_add_remove;
 805         revs->pruning.change = file_change;
 806         revs->lifo = 1;
 807         revs->dense = 1;
 808         revs->prefix = prefix;
 809         revs->max_age = -1;
 810         revs->min_age = -1;
 811         revs->skip_count = -1;
 812         revs->max_count = -1;
 813
 814         revs->commit_format = CMIT_FMT_DEFAULT;
 815
 816         revs->grep_filter.status_only = 1;
 817         revs->grep_filter.pattern_tail = &(revs->grep_filter.pattern_list);
 818         revs->grep_filter.regflags = REG_NEWLINE;
 819
 820         diff_setup(&revs->diffopt);
 821         if (prefix && !revs->diffopt.prefix) {
 822                 revs->diffopt.prefix = prefix;
 823                 revs->diffopt.prefix_length = strlen(prefix);
 824         }
 825 }
 826
 827 static void add_pending_commit_list(struct rev_info *revs,
 828                                     struct commit_list *commit_list,
 829                                     unsigned int flags)
 830 {
 831         while (commit_list) {
 832                 struct object *object = &commit_list->item->object;
 833                 object->flags |= flags;
 834                 add_pending_object(revs, object, sha1_to_hex(object->sha1));
 835                 commit_list = commit_list->next;
 836         }
 837 }
 838
 839 static void prepare_show_merge(struct rev_info *revs)
 840 {
 841         struct commit_list *bases;
 842         struct commit *head, *other;
 843         unsigned char sha1[20];
 844         const char **prune = NULL;
 845         int i, prune_num = 1; /* counting terminating NULL */
 846
 847         if (get_sha1("HEAD", sha1) || !(head = lookup_commit(sha1)))
 848                 die("--merge without HEAD?");
 849         if (get_sha1("MERGE_HEAD", sha1) || !(other = lookup_commit(sha1)))
 850                 die("--merge without MERGE_HEAD?");
 851         add_pending_object(revs, &head->object, "HEAD");
 852         add_pending_object(revs, &other->object, "MERGE_HEAD");
 853         bases = get_merge_bases(head, other, 1);
 854         add_pending_commit_list(revs, bases, UNINTERESTING);
 855         free_commit_list(bases);
 856         head->object.flags |= SYMMETRIC_LEFT;
 857
 858         if (!active_nr)
 859                 read_cache();
 860         for (i = 0; i < active_nr; i++) {
 861                 struct cache_entry *ce = active_cache[i];
 862                 if (!ce_stage(ce))
 863                         continue;
 864                 if (ce_path_match(ce, revs->prune_data)) {
 865                         prune_num++;
 866                         prune = xrealloc(prune, sizeof(*prune) * prune_num);
 867                         prune[prune_num-2] = ce->name;
 868                         prune[prune_num-1] = NULL;
 869                 }
 870                 while ((i+1 < active_nr) &&
 871                        ce_same_name(ce, active_cache[i+1]))
 872                         i++;
 873         }
 874         revs->prune_data = prune;
 875         revs->limited = 1;
 876 }
 877
 878 int handle_revision_arg(const char *arg, struct rev_info *revs,
 879                         int flags,
 880                         int cant_be_filename)
 881 {
 882         unsigned mode;
 883         char *dotdot;
 884         struct object *object;
 885         unsigned char sha1[20];
 886         int local_flags;
 887
 888         dotdot = strstr(arg, "..");
 889         if (dotdot) {
 890                 unsigned char from_sha1[20];
 891                 const char *next = dotdot + 2;
 892                 const char *this = arg;
 893                 int symmetric = *next == '.';
 894                 unsigned int flags_exclude = flags ^ UNINTERESTING;
 895
 896                 *dotdot = 0;
 897                 next += symmetric;
 898
 899                 if (!*next)
 900                         next = "HEAD";
 901                 if (dotdot == arg)
 902                         this = "HEAD";
 903                 if (!get_sha1(this, from_sha1) &&
 904                     !get_sha1(next, sha1)) {
 905                         struct commit *a, *b;
 906                         struct commit_list *exclude;
 907
 908                         a = lookup_commit_reference(from_sha1);
 909                         b = lookup_commit_reference(sha1);
 910                         if (!a || !b) {
 911                                 die(symmetric ?
 912                                     "Invalid symmetric difference expression %s...%s" :
 913                                     "Invalid revision range %s..%s",
 914                                     arg, next);
 915                         }
 916
 917                         if (!cant_be_filename) {
 918                                 *dotdot = '.';
 919                                 verify_non_filename(revs->prefix, arg);
 920                         }
 921
 922                         if (symmetric) {
 923                                 exclude = get_merge_bases(a, b, 1);
 924                                 add_pending_commit_list(revs, exclude,
 925                                                         flags_exclude);
 926                                 free_commit_list(exclude);
 927                                 a->object.flags |= flags | SYMMETRIC_LEFT;
 928                         } else
 929                                 a->object.flags |= flags_exclude;
 930                         b->object.flags |= flags;
 931                         add_pending_object(revs, &a->object, this);
 932                         add_pending_object(revs, &b->object, next);
 933                         return 0;
 934                 }
 935                 *dotdot = '.';
 936         }
 937         dotdot = strstr(arg, "^@");
 938         if (dotdot && !dotdot[2]) {
 939                 *dotdot = 0;
 940                 if (add_parents_only(revs, arg, flags))
 941                         return 0;
 942                 *dotdot = '^';
 943         }
 944         dotdot = strstr(arg, "^!");
 945         if (dotdot && !dotdot[2]) {
 946                 *dotdot = 0;
 947                 if (!add_parents_only(revs, arg, flags ^ UNINTERESTING))
 948                         *dotdot = '^';
 949         }
 950
 951         local_flags = 0;
 952         if (*arg == '^') {
 953                 local_flags = UNINTERESTING;
 954                 arg++;
 955         }
 956         if (get_sha1_with_mode(arg, sha1, &mode))
 957                 return -1;
 958         if (!cant_be_filename)
 959                 verify_non_filename(revs->prefix, arg);
 960         object = get_reference(revs, arg, sha1, flags ^ local_flags);
 961         add_pending_object_with_mode(revs, object, arg, mode);
 962         return 0;
 963 }
 964
 965 void read_revisions_from_stdin(struct rev_info *revs)
 966 {
 967         char line[1000];
 968
 969         while (fgets(line, sizeof(line), stdin) != NULL) {
 970                 int len = strlen(line);
 971                 if (len && line[len - 1] == '\n')
 972                         line[--len] = '\0';
 973                 if (!len)
 974                         break;
 975                 if (line[0] == '-')
 976                         die("options not supported in --stdin mode");
 977                 if (handle_revision_arg(line, revs, 0, 1))
 978                         die("bad revision '%s'", line);
 979         }
 980 }
 981
 982 static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
 983 {
 984         append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
 985 }
 986
 987 static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
 988 {
 989         append_header_grep_pattern(&revs->grep_filter, field, pattern);
 990 }
 991
 992 static void add_message_grep(struct rev_info *revs, const char *pattern)
 993 {
 994         add_grep(revs, pattern, GREP_PATTERN_BODY);
 995 }
 996
 997 static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
 998                                int *unkc, const char **unkv)
 999 {
1000         const char *arg = argv[0];
1001
1002         /* pseudo revision arguments */
1003         if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1004             !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1005             !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1006             !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk"))
1007         {
1008                 unkv[(*unkc)++] = arg;
1009                 return 1;
1010         }
1011
1012         if (!prefixcmp(arg, "--max-count=")) {
1013                 revs->max_count = atoi(arg + 12);
1014         } else if (!prefixcmp(arg, "--skip=")) {
1015                 revs->skip_count = atoi(arg + 7);
1016         } else if ((*arg == '-') && isdigit(arg[1])) {
1017         /* accept -<digit>, like traditional "head" */
1018                 revs->max_count = atoi(arg + 1);
1019         } else if (!strcmp(arg, "-n")) {
1020                 if (argc <= 1)
1021                         return error("-n requires an argument");
1022                 revs->max_count = atoi(argv[1]);
1023                 return 2;
1024         } else if (!prefixcmp(arg, "-n")) {
1025                 revs->max_count = atoi(arg + 2);
1026         } else if (!prefixcmp(arg, "--max-age=")) {
1027                 revs->max_age = atoi(arg + 10);
1028         } else if (!prefixcmp(arg, "--since=")) {
1029                 revs->max_age = approxidate(arg + 8);
1030         } else if (!prefixcmp(arg, "--after=")) {
1031                 revs->max_age = approxidate(arg + 8);
1032         } else if (!prefixcmp(arg, "--min-age=")) {
1033                 revs->min_age = atoi(arg + 10);
1034         } else if (!prefixcmp(arg, "--before=")) {
1035                 revs->min_age = approxidate(arg + 9);
1036         } else if (!prefixcmp(arg, "--until=")) {
1037                 revs->min_age = approxidate(arg + 8);
1038         } else if (!strcmp(arg, "--first-parent")) {
1039                 revs->first_parent_only = 1;
1040         } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1041                 init_reflog_walk(&revs->reflog_info);
1042         } else if (!strcmp(arg, "--default")) {
1043                 if (argc <= 1)
1044                         return error("bad --default argument");
1045                 revs->def = argv[1];
1046                 return 2;
1047         } else if (!strcmp(arg, "--merge")) {
1048                 revs->show_merge = 1;
1049         } else if (!strcmp(arg, "--topo-order")) {
1050                 revs->lifo = 1;
1051                 revs->topo_order = 1;
1052         } else if (!strcmp(arg, "--simplify-merges")) {
1053                 revs->simplify_merges = 1;
1054                 revs->rewrite_parents = 1;
1055                 revs->simplify_history = 0;
1056                 revs->limited = 1;
1057         } else if (!strcmp(arg, "--simplify-by-decoration")) {
1058                 revs->simplify_merges = 1;
1059                 revs->rewrite_parents = 1;
1060                 revs->simplify_history = 0;
1061                 revs->simplify_by_decoration = 1;
1062                 revs->limited = 1;
1063                 revs->prune = 1;
1064                 load_ref_decorations();
1065         } else if (!strcmp(arg, "--date-order")) {
1066                 revs->lifo = 0;
1067                 revs->topo_order = 1;
1068         } else if (!prefixcmp(arg, "--early-output")) {
1069                 int count = 100;
1070                 switch (arg[14]) {
1071                 case '=':
1072                         count = atoi(arg+15);
1073                         /* Fallthrough */
1074                 case 0:
1075                         revs->topo_order = 1;
1076                        revs->early_output = count;
1077                 }
1078         } else if (!strcmp(arg, "--parents")) {
1079                 revs->rewrite_parents = 1;
1080                 revs->print_parents = 1;
1081         } else if (!strcmp(arg, "--dense")) {
1082                 revs->dense = 1;
1083         } else if (!strcmp(arg, "--sparse")) {
1084                 revs->dense = 0;
1085         } else if (!strcmp(arg, "--show-all")) {
1086                 revs->show_all = 1;
1087         } else if (!strcmp(arg, "--remove-empty")) {
1088                 revs->remove_empty_trees = 1;
1089         } else if (!strcmp(arg, "--no-merges")) {
1090                 revs->no_merges = 1;
1091         } else if (!strcmp(arg, "--boundary")) {
1092                 revs->boundary = 1;
1093         } else if (!strcmp(arg, "--left-right")) {
1094                 revs->left_right = 1;
1095         } else if (!strcmp(arg, "--cherry-pick")) {
1096                 revs->cherry_pick = 1;
1097                 revs->limited = 1;
1098         } else if (!strcmp(arg, "--objects")) {
1099                 revs->tag_objects = 1;
1100                 revs->tree_objects = 1;
1101                 revs->blob_objects = 1;
1102         } else if (!strcmp(arg, "--objects-edge")) {
1103                 revs->tag_objects = 1;
1104                 revs->tree_objects = 1;
1105                 revs->blob_objects = 1;
1106                 revs->edge_hint = 1;
1107         } else if (!strcmp(arg, "--unpacked")) {
1108                 revs->unpacked = 1;
1109         } else if (!prefixcmp(arg, "--unpacked=")) {
1110                 die("--unpacked=<packfile> no longer supported.");
1111         } else if (!strcmp(arg, "-r")) {
1112                 revs->diff = 1;
1113                 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1114         } else if (!strcmp(arg, "-t")) {
1115                 revs->diff = 1;
1116                 DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1117                 DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1118         } else if (!strcmp(arg, "-m")) {
1119                 revs->ignore_merges = 0;
1120         } else if (!strcmp(arg, "-c")) {
1121                 revs->diff = 1;
1122                 revs->dense_combined_merges = 0;
1123                 revs->combine_merges = 1;
1124         } else if (!strcmp(arg, "--cc")) {
1125                 revs->diff = 1;
1126                 revs->dense_combined_merges = 1;
1127                 revs->combine_merges = 1;
1128         } else if (!strcmp(arg, "-v")) {
1129                 revs->verbose_header = 1;
1130         } else if (!strcmp(arg, "--pretty")) {
1131                 revs->verbose_header = 1;
1132                 get_commit_format(arg+8, revs);
1133         } else if (!prefixcmp(arg, "--pretty=") || !prefixcmp(arg, "--format=")) {
1134                 revs->verbose_header = 1;
1135                 get_commit_format(arg+9, revs);
1136         } else if (!strcmp(arg, "--oneline")) {
1137                 revs->verbose_header = 1;
1138                 get_commit_format("oneline", revs);
1139                 revs->abbrev_commit = 1;
1140         } else if (!strcmp(arg, "--graph")) {
1141                 revs->topo_order = 1;
1142                 revs->rewrite_parents = 1;
1143                 revs->graph = graph_init(revs);
1144         } else if (!strcmp(arg, "--root")) {
1145                 revs->show_root_diff = 1;
1146         } else if (!strcmp(arg, "--no-commit-id")) {
1147                 revs->no_commit_id = 1;
1148         } else if (!strcmp(arg, "--always")) {
1149                 revs->always_show_header = 1;
1150         } else if (!strcmp(arg, "--no-abbrev")) {
1151                 revs->abbrev = 0;
1152         } else if (!strcmp(arg, "--abbrev")) {
1153                 revs->abbrev = DEFAULT_ABBREV;
1154         } else if (!prefixcmp(arg, "--abbrev=")) {
1155                 revs->abbrev = strtoul(arg + 9, NULL, 10);
1156                 if (revs->abbrev < MINIMUM_ABBREV)
1157                         revs->abbrev = MINIMUM_ABBREV;
1158                 else if (revs->abbrev > 40)
1159                         revs->abbrev = 40;
1160         } else if (!strcmp(arg, "--abbrev-commit")) {
1161                 revs->abbrev_commit = 1;
1162         } else if (!strcmp(arg, "--full-diff")) {
1163                 revs->diff = 1;
1164                 revs->full_diff = 1;
1165         } else if (!strcmp(arg, "--full-history")) {
1166                 revs->simplify_history = 0;
1167         } else if (!strcmp(arg, "--relative-date")) {
1168                 revs->date_mode = DATE_RELATIVE;
1169         } else if (!strncmp(arg, "--date=", 7)) {
1170                 revs->date_mode = parse_date_format(arg + 7);
1171         } else if (!strcmp(arg, "--log-size")) {
1172                 revs->show_log_size = 1;
1173         }
1174         /*
1175          * Grepping the commit log
1176          */
1177         else if (!prefixcmp(arg, "--author=")) {
1178                 add_header_grep(revs, GREP_HEADER_AUTHOR, arg+9);
1179         } else if (!prefixcmp(arg, "--committer=")) {
1180                 add_header_grep(revs, GREP_HEADER_COMMITTER, arg+12);
1181         } else if (!prefixcmp(arg, "--grep=")) {
1182                 add_message_grep(revs, arg+7);
1183         } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
1184                 revs->grep_filter.regflags |= REG_EXTENDED;
1185         } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
1186                 revs->grep_filter.regflags |= REG_ICASE;
1187         } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
1188                 revs->grep_filter.fixed = 1;
1189         } else if (!strcmp(arg, "--all-match")) {
1190                 revs->grep_filter.all_match = 1;
1191         } else if (!prefixcmp(arg, "--encoding=")) {
1192                 arg += 11;
1193                 if (strcmp(arg, "none"))
1194                         git_log_output_encoding = xstrdup(arg);
1195                 else
1196                         git_log_output_encoding = "";
1197         } else if (!strcmp(arg, "--reverse")) {
1198                 revs->reverse ^= 1;
1199         } else if (!strcmp(arg, "--children")) {
1200                 revs->children.name = "children";
1201                 revs->limited = 1;
1202         } else {
1203                 int opts = diff_opt_parse(&revs->diffopt, argv, argc);
1204                 if (!opts)
1205                         unkv[(*unkc)++] = arg;
1206                 return opts;
1207         }
1208
1209         return 1;
1210 }
1211
1212 void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
1213                         const struct option *options,
1214                         const char * const usagestr[])
1215 {
1216         int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
1217                                     &ctx->cpidx, ctx->out);
1218         if (n <= 0) {
1219                 error("unknown option `%s'", ctx->argv[0]);
1220                 usage_with_options(usagestr, options);
1221         }
1222         ctx->argv += n;
1223         ctx->argc -= n;
1224 }
1225
1226 /*
1227  * Parse revision information, filling in the "rev_info" structure,
1228  * and removing the used arguments from the argument list.
1229  *
1230  * Returns the number of arguments left that weren't recognized
1231  * (which are also moved to the head of the argument list)
1232  */
1233 int setup_revisions(int argc, const char **argv, struct rev_info *revs, const char *def)
1234 {
1235         int i, flags, left, seen_dashdash;
1236
1237         /* First, search for "--" */
1238         seen_dashdash = 0;
1239         for (i = 1; i < argc; i++) {
1240                 const char *arg = argv[i];
1241                 if (strcmp(arg, "--"))
1242                         continue;
1243                 argv[i] = NULL;
1244                 argc = i;
1245                 if (argv[i + 1])
1246                         revs->prune_data = get_pathspec(revs->prefix, argv + i + 1);
1247                 seen_dashdash = 1;
1248                 break;
1249         }
1250
1251         /* Second, deal with arguments and options */
1252         flags = 0;
1253         for (left = i = 1; i < argc; i++) {
1254                 const char *arg = argv[i];
1255                 if (*arg == '-') {
1256                         int opts;
1257
1258                         if (!strcmp(arg, "--all")) {
1259                                 handle_refs(revs, flags, for_each_ref);
1260                                 handle_refs(revs, flags, head_ref);
1261                                 continue;
1262                         }
1263                         if (!strcmp(arg, "--branches")) {
1264                                 handle_refs(revs, flags, for_each_branch_ref);
1265                                 continue;
1266                         }
1267                         if (!strcmp(arg, "--tags")) {
1268                                 handle_refs(revs, flags, for_each_tag_ref);
1269                                 continue;
1270                         }
1271                         if (!strcmp(arg, "--remotes")) {
1272                                 handle_refs(revs, flags, for_each_remote_ref);
1273                                 continue;
1274                         }
1275                         if (!strcmp(arg, "--reflog")) {
1276                                 handle_reflog(revs, flags);
1277                                 continue;
1278                         }
1279                         if (!strcmp(arg, "--not")) {
1280                                 flags ^= UNINTERESTING;
1281                                 continue;
1282                         }
1283                         if (!strcmp(arg, "--no-walk")) {
1284                                 revs->no_walk = 1;
1285                                 continue;
1286                         }
1287                         if (!strcmp(arg, "--do-walk")) {
1288                                 revs->no_walk = 0;
1289                                 continue;
1290                         }
1291
1292                         opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
1293                         if (opts > 0) {
1294                                 i += opts - 1;
1295                                 continue;
1296                         }
1297                         if (opts < 0)
1298                                 exit(128);
1299                         continue;
1300                 }
1301
1302                 if (handle_revision_arg(arg, revs, flags, seen_dashdash)) {
1303                         int j;
1304                         if (seen_dashdash || *arg == '^')
1305                                 die("bad revision '%s'", arg);
1306
1307                         /* If we didn't have a "--":
1308                          * (1) all filenames must exist;
1309                          * (2) all rev-args must not be interpretable
1310                          *     as a valid filename.
1311                          * but the latter we have checked in the main loop.
1312                          */
1313                         for (j = i; j < argc; j++)
1314                                 verify_filename(revs->prefix, argv[j]);
1315
1316                         revs->prune_data = get_pathspec(revs->prefix,
1317                                                         argv + i);
1318                         break;
1319                 }
1320         }
1321
1322         if (revs->def == NULL)
1323                 revs->def = def;
1324         if (revs->show_merge)
1325                 prepare_show_merge(revs);
1326         if (revs->def && !revs->pending.nr) {
1327                 unsigned char sha1[20];
1328                 struct object *object;
1329                 unsigned mode;
1330                 if (get_sha1_with_mode(revs->def, sha1, &mode))
1331                         die("bad default revision '%s'", revs->def);
1332                 object = get_reference(revs, revs->def, sha1, 0);
1333                 add_pending_object_with_mode(revs, object, revs->def, mode);
1334         }
1335
1336         /* Did the user ask for any diff output? Run the diff! */
1337         if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
1338                 revs->diff = 1;
1339
1340         /* Pickaxe, diff-filter and rename following need diffs */
1341         if (revs->diffopt.pickaxe ||
1342             revs->diffopt.filter ||
1343             DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1344                 revs->diff = 1;
1345
1346         if (revs->topo_order)
1347                 revs->limited = 1;
1348
1349         if (revs->prune_data) {
1350                 diff_tree_setup_paths(revs->prune_data, &revs->pruning);
1351                 /* Can't prune commits with rename following: the paths change.. */
1352                 if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
1353                         revs->prune = 1;
1354                 if (!revs->full_diff)
1355                         diff_tree_setup_paths(revs->prune_data, &revs->diffopt);
1356         }
1357         if (revs->combine_merges) {
1358                 revs->ignore_merges = 0;
1359                 if (revs->dense_combined_merges && !revs->diffopt.output_format)
1360                         revs->diffopt.output_format = DIFF_FORMAT_PATCH;
1361         }
1362         revs->diffopt.abbrev = revs->abbrev;
1363         if (diff_setup_done(&revs->diffopt) < 0)
1364                 die("diff_setup_done failed");
1365
1366         compile_grep_patterns(&revs->grep_filter);
1367
1368         if (revs->reverse && revs->reflog_info)
1369                 die("cannot combine --reverse with --walk-reflogs");
1370         if (revs->rewrite_parents && revs->children.name)
1371                 die("cannot combine --parents and --children");
1372
1373         /*
1374          * Limitations on the graph functionality
1375          */
1376         if (revs->reverse && revs->graph)
1377                 die("cannot combine --reverse with --graph");
1378
1379         if (revs->reflog_info && revs->graph)
1380                 die("cannot combine --walk-reflogs with --graph");
1381
1382         return left;
1383 }
1384
1385 static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
1386 {
1387         struct commit_list *l = xcalloc(1, sizeof(*l));
1388
1389         l->item = child;
1390         l->next = add_decoration(&revs->children, &parent->object, l);
1391 }
1392
1393 static int remove_duplicate_parents(struct commit *commit)
1394 {
1395         struct commit_list **pp, *p;
1396         int surviving_parents;
1397
1398         /* Examine existing parents while marking ones we have seen... */
1399         pp = &commit->parents;
1400         while ((p = *pp) != NULL) {
1401                 struct commit *parent = p->item;
1402                 if (parent->object.flags & TMP_MARK) {
1403                         *pp = p->next;
1404                         continue;
1405                 }
1406                 parent->object.flags |= TMP_MARK;
1407                 pp = &p->next;
1408         }
1409         /* count them while clearing the temporary mark */
1410         surviving_parents = 0;
1411         for (p = commit->parents; p; p = p->next) {
1412                 p->item->object.flags &= ~TMP_MARK;
1413                 surviving_parents++;
1414         }
1415         return surviving_parents;
1416 }
1417
1418 struct merge_simplify_state {
1419         struct commit *simplified;
1420 };
1421
1422 static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
1423 {
1424         struct merge_simplify_state *st;
1425
1426         st = lookup_decoration(&revs->merge_simplification, &commit->object);
1427         if (!st) {
1428                 st = xcalloc(1, sizeof(*st));
1429                 add_decoration(&revs->merge_simplification, &commit->object, st);
1430         }
1431         return st;
1432 }
1433
1434 static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
1435 {
1436         struct commit_list *p;
1437         struct merge_simplify_state *st, *pst;
1438         int cnt;
1439
1440         st = locate_simplify_state(revs, commit);
1441
1442         /*
1443          * Have we handled this one?
1444          */
1445         if (st->simplified)
1446                 return tail;
1447
1448         /*
1449          * An UNINTERESTING commit simplifies to itself, so does a
1450          * root commit.  We do not rewrite parents of such commit
1451          * anyway.
1452          */
1453         if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
1454                 st->simplified = commit;
1455                 return tail;
1456         }
1457
1458         /*
1459          * Do we know what commit all of our parents should be rewritten to?
1460          * Otherwise we are not ready to rewrite this one yet.
1461          */
1462         for (cnt = 0, p = commit->parents; p; p = p->next) {
1463                 pst = locate_simplify_state(revs, p->item);
1464                 if (!pst->simplified) {
1465                         tail = &commit_list_insert(p->item, tail)->next;
1466                         cnt++;
1467                 }
1468         }
1469         if (cnt) {
1470                 tail = &commit_list_insert(commit, tail)->next;
1471                 return tail;
1472         }
1473
1474         /*
1475          * Rewrite our list of parents.
1476          */
1477         for (p = commit->parents; p; p = p->next) {
1478                 pst = locate_simplify_state(revs, p->item);
1479                 p->item = pst->simplified;
1480         }
1481         cnt = remove_duplicate_parents(commit);
1482
1483         /*
1484          * It is possible that we are a merge and one side branch
1485          * does not have any commit that touches the given paths;
1486          * in such a case, the immediate parents will be rewritten
1487          * to different commits.
1488          *
1489          *      o----X          X: the commit we are looking at;
1490          *     /    /           o: a commit that touches the paths;
1491          * ---o----'
1492          *
1493          * Further reduce the parents by removing redundant parents.
1494          */
1495         if (1 < cnt) {
1496                 struct commit_list *h = reduce_heads(commit->parents);
1497                 cnt = commit_list_count(h);
1498                 free_commit_list(commit->parents);
1499                 commit->parents = h;
1500         }
1501
1502         /*
1503          * A commit simplifies to itself if it is a root, if it is
1504          * UNINTERESTING, if it touches the given paths, or if it is a
1505          * merge and its parents simplifies to more than one commits
1506          * (the first two cases are already handled at the beginning of
1507          * this function).
1508          *
1509          * Otherwise, it simplifies to what its sole parent simplifies to.
1510          */
1511         if (!cnt ||
1512             (commit->object.flags & UNINTERESTING) ||
1513             !(commit->object.flags & TREESAME) ||
1514             (1 < cnt))
1515                 st->simplified = commit;
1516         else {
1517                 pst = locate_simplify_state(revs, commit->parents->item);
1518                 st->simplified = pst->simplified;
1519         }
1520         return tail;
1521 }
1522
1523 static void simplify_merges(struct rev_info *revs)
1524 {
1525         struct commit_list *list;
1526         struct commit_list *yet_to_do, **tail;
1527
1528         if (!revs->topo_order)
1529                 sort_in_topological_order(&revs->commits, revs->lifo);
1530         if (!revs->prune)
1531                 return;
1532
1533         /* feed the list reversed */
1534         yet_to_do = NULL;
1535         for (list = revs->commits; list; list = list->next)
1536                 commit_list_insert(list->item, &yet_to_do);
1537         while (yet_to_do) {
1538                 list = yet_to_do;
1539                 yet_to_do = NULL;
1540                 tail = &yet_to_do;
1541                 while (list) {
1542                         struct commit *commit = list->item;
1543                         struct commit_list *next = list->next;
1544                         free(list);
1545                         list = next;
1546                         tail = simplify_one(revs, commit, tail);
1547                 }
1548         }
1549
1550         /* clean up the result, removing the simplified ones */
1551         list = revs->commits;
1552         revs->commits = NULL;
1553         tail = &revs->commits;
1554         while (list) {
1555                 struct commit *commit = list->item;
1556                 struct commit_list *next = list->next;
1557                 struct merge_simplify_state *st;
1558                 free(list);
1559                 list = next;
1560                 st = locate_simplify_state(revs, commit);
1561                 if (st->simplified == commit)
1562                         tail = &commit_list_insert(commit, tail)->next;
1563         }
1564 }
1565
1566 static void set_children(struct rev_info *revs)
1567 {
1568         struct commit_list *l;
1569         for (l = revs->commits; l; l = l->next) {
1570                 struct commit *commit = l->item;
1571                 struct commit_list *p;
1572
1573                 for (p = commit->parents; p; p = p->next)
1574                         add_child(revs, p->item, commit);
1575         }
1576 }
1577
1578 int prepare_revision_walk(struct rev_info *revs)
1579 {
1580         int nr = revs->pending.nr;
1581         struct object_array_entry *e, *list;
1582
1583         e = list = revs->pending.objects;
1584         revs->pending.nr = 0;
1585         revs->pending.alloc = 0;
1586         revs->pending.objects = NULL;
1587         while (--nr >= 0) {
1588                 struct commit *commit = handle_commit(revs, e->item, e->name);
1589                 if (commit) {
1590                         if (!(commit->object.flags & SEEN)) {
1591                                 commit->object.flags |= SEEN;
1592                                 insert_by_date(commit, &revs->commits);
1593                         }
1594                 }
1595                 e++;
1596         }
1597         free(list);
1598
1599         if (revs->no_walk)
1600                 return 0;
1601         if (revs->limited)
1602                 if (limit_list(revs) < 0)
1603                         return -1;
1604         if (revs->topo_order)
1605                 sort_in_topological_order(&revs->commits, revs->lifo);
1606         if (revs->simplify_merges)
1607                 simplify_merges(revs);
1608         if (revs->children.name)
1609                 set_children(revs);
1610         return 0;
1611 }
1612
1613 enum rewrite_result {
1614         rewrite_one_ok,
1615         rewrite_one_noparents,
1616         rewrite_one_error,
1617 };
1618
1619 static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
1620 {
1621         struct commit_list *cache = NULL;
1622
1623         for (;;) {
1624                 struct commit *p = *pp;
1625                 if (!revs->limited)
1626                         if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
1627                                 return rewrite_one_error;
1628                 if (p->parents && p->parents->next)
1629                         return rewrite_one_ok;
1630                 if (p->object.flags & UNINTERESTING)
1631                         return rewrite_one_ok;
1632                 if (!(p->object.flags & TREESAME))
1633                         return rewrite_one_ok;
1634                 if (!p->parents)
1635                         return rewrite_one_noparents;
1636                 *pp = p->parents->item;
1637         }
1638 }
1639
1640 static int rewrite_parents(struct rev_info *revs, struct commit *commit)
1641 {
1642         struct commit_list **pp = &commit->parents;
1643         while (*pp) {
1644                 struct commit_list *parent = *pp;
1645                 switch (rewrite_one(revs, &parent->item)) {
1646                 case rewrite_one_ok:
1647                         break;
1648                 case rewrite_one_noparents:
1649                         *pp = parent->next;
1650                         continue;
1651                 case rewrite_one_error:
1652                         return -1;
1653                 }
1654                 pp = &parent->next;
1655         }
1656         remove_duplicate_parents(commit);
1657         return 0;
1658 }
1659
1660 static int commit_match(struct commit *commit, struct rev_info *opt)
1661 {
1662         if (!opt->grep_filter.pattern_list)
1663                 return 1;
1664         return grep_buffer(&opt->grep_filter,
1665                            NULL, /* we say nothing, not even filename */
1666                            commit->buffer, strlen(commit->buffer));
1667 }
1668
1669 static inline int want_ancestry(struct rev_info *revs)
1670 {
1671         return (revs->rewrite_parents || revs->children.name);
1672 }
1673
1674 enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
1675 {
1676         if (commit->object.flags & SHOWN)
1677                 return commit_ignore;
1678         if (revs->unpacked && has_sha1_pack(commit->object.sha1))
1679                 return commit_ignore;
1680         if (revs->show_all)
1681                 return commit_show;
1682         if (commit->object.flags & UNINTERESTING)
1683                 return commit_ignore;
1684         if (revs->min_age != -1 && (commit->date > revs->min_age))
1685                 return commit_ignore;
1686         if (revs->no_merges && commit->parents && commit->parents->next)
1687                 return commit_ignore;
1688         if (!commit_match(commit, revs))
1689                 return commit_ignore;
1690         if (revs->prune && revs->dense) {
1691                 /* Commit without changes? */
1692                 if (commit->object.flags & TREESAME) {
1693                         /* drop merges unless we want parenthood */
1694                         if (!want_ancestry(revs))
1695                                 return commit_ignore;
1696                         /* non-merge - always ignore it */
1697                         if (!commit->parents || !commit->parents->next)
1698                                 return commit_ignore;
1699                 }
1700                 if (want_ancestry(revs) && rewrite_parents(revs, commit) < 0)
1701                         return commit_error;
1702         }
1703         return commit_show;
1704 }
1705
1706 static struct commit *get_revision_1(struct rev_info *revs)
1707 {
1708         if (!revs->commits)
1709                 return NULL;
1710
1711         do {
1712                 struct commit_list *entry = revs->commits;
1713                 struct commit *commit = entry->item;
1714
1715                 revs->commits = entry->next;
1716                 free(entry);
1717
1718                 if (revs->reflog_info)
1719                         fake_reflog_parent(revs->reflog_info, commit);
1720
1721                 /*
1722                  * If we haven't done the list limiting, we need to look at
1723                  * the parents here. We also need to do the date-based limiting
1724                  * that we'd otherwise have done in limit_list().
1725                  */
1726                 if (!revs->limited) {
1727                         if (revs->max_age != -1 &&
1728                             (commit->date < revs->max_age))
1729                                 continue;
1730                         if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0)
1731                                 die("Failed to traverse parents of commit %s",
1732                                     sha1_to_hex(commit->object.sha1));
1733                 }
1734
1735                 switch (simplify_commit(revs, commit)) {
1736                 case commit_ignore:
1737                         continue;
1738                 case commit_error:
1739                         die("Failed to simplify parents of commit %s",
1740                             sha1_to_hex(commit->object.sha1));
1741                 default:
1742                         return commit;
1743                 }
1744         } while (revs->commits);
1745         return NULL;
1746 }
1747
1748 static void gc_boundary(struct object_array *array)
1749 {
1750         unsigned nr = array->nr;
1751         unsigned alloc = array->alloc;
1752         struct object_array_entry *objects = array->objects;
1753
1754         if (alloc <= nr) {
1755                 unsigned i, j;
1756                 for (i = j = 0; i < nr; i++) {
1757                         if (objects[i].item->flags & SHOWN)
1758                                 continue;
1759                         if (i != j)
1760                                 objects[j] = objects[i];
1761                         j++;
1762                 }
1763                 for (i = j; i < nr; i++)
1764                         objects[i].item = NULL;
1765                 array->nr = j;
1766         }
1767 }
1768
1769 static void create_boundary_commit_list(struct rev_info *revs)
1770 {
1771         unsigned i;
1772         struct commit *c;
1773         struct object_array *array = &revs->boundary_commits;
1774         struct object_array_entry *objects = array->objects;
1775
1776         /*
1777          * If revs->commits is non-NULL at this point, an error occurred in
1778          * get_revision_1().  Ignore the error and continue printing the
1779          * boundary commits anyway.  (This is what the code has always
1780          * done.)
1781          */
1782         if (revs->commits) {
1783                 free_commit_list(revs->commits);
1784                 revs->commits = NULL;
1785         }
1786
1787         /*
1788          * Put all of the actual boundary commits from revs->boundary_commits
1789          * into revs->commits
1790          */
1791         for (i = 0; i < array->nr; i++) {
1792                 c = (struct commit *)(objects[i].item);
1793                 if (!c)
1794                         continue;
1795                 if (!(c->object.flags & CHILD_SHOWN))
1796                         continue;
1797                 if (c->object.flags & (SHOWN | BOUNDARY))
1798                         continue;
1799                 c->object.flags |= BOUNDARY;
1800                 commit_list_insert(c, &revs->commits);
1801         }
1802
1803         /*
1804          * If revs->topo_order is set, sort the boundary commits
1805          * in topological order
1806          */
1807         sort_in_topological_order(&revs->commits, revs->lifo);
1808 }
1809
1810 static struct commit *get_revision_internal(struct rev_info *revs)
1811 {
1812         struct commit *c = NULL;
1813         struct commit_list *l;
1814
1815         if (revs->boundary == 2) {
1816                 /*
1817                  * All of the normal commits have already been returned,
1818                  * and we are now returning boundary commits.
1819                  * create_boundary_commit_list() has populated
1820                  * revs->commits with the remaining commits to return.
1821                  */
1822                 c = pop_commit(&revs->commits);
1823                 if (c)
1824                         c->object.flags |= SHOWN;
1825                 return c;
1826         }
1827
1828         /*
1829          * Now pick up what they want to give us
1830          */
1831         c = get_revision_1(revs);
1832         if (c) {
1833                 while (0 < revs->skip_count) {
1834                         revs->skip_count--;
1835                         c = get_revision_1(revs);
1836                         if (!c)
1837                                 break;
1838                 }
1839         }
1840
1841         /*
1842          * Check the max_count.
1843          */
1844         switch (revs->max_count) {
1845         case -1:
1846                 break;
1847         case 0:
1848                 c = NULL;
1849                 break;
1850         default:
1851                 revs->max_count--;
1852         }
1853
1854         if (c)
1855                 c->object.flags |= SHOWN;
1856
1857         if (!revs->boundary) {
1858                 return c;
1859         }
1860
1861         if (!c) {
1862                 /*
1863                  * get_revision_1() runs out the commits, and
1864                  * we are done computing the boundaries.
1865                  * switch to boundary commits output mode.
1866                  */
1867                 revs->boundary = 2;
1868
1869                 /*
1870                  * Update revs->commits to contain the list of
1871                  * boundary commits.
1872                  */
1873                 create_boundary_commit_list(revs);
1874
1875                 return get_revision_internal(revs);
1876         }
1877
1878         /*
1879          * boundary commits are the commits that are parents of the
1880          * ones we got from get_revision_1() but they themselves are
1881          * not returned from get_revision_1().  Before returning
1882          * 'c', we need to mark its parents that they could be boundaries.
1883          */
1884
1885         for (l = c->parents; l; l = l->next) {
1886                 struct object *p;
1887                 p = &(l->item->object);
1888                 if (p->flags & (CHILD_SHOWN | SHOWN))
1889                         continue;
1890                 p->flags |= CHILD_SHOWN;
1891                 gc_boundary(&revs->boundary_commits);
1892                 add_object_array(p, NULL, &revs->boundary_commits);
1893         }
1894
1895         return c;
1896 }
1897
1898 struct commit *get_revision(struct rev_info *revs)
1899 {
1900         struct commit *c;
1901         struct commit_list *reversed;
1902
1903         if (revs->reverse) {
1904                 reversed = NULL;
1905                 while ((c = get_revision_internal(revs))) {
1906                         commit_list_insert(c, &reversed);
1907                 }
1908                 revs->commits = reversed;
1909                 revs->reverse = 0;
1910                 revs->reverse_output_stage = 1;
1911         }
1912
1913         if (revs->reverse_output_stage)
1914                 return pop_commit(&revs->commits);
1915
1916         c = get_revision_internal(revs);
1917         if (c && revs->graph)
1918                 graph_update(revs->graph, c);
1919         return c;
1920 }