revision.con commit travis-ci: check that all build artifacts are .gitignore-d (b92cb86)
   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#include "string-list.h"
  16#include "line-log.h"
  17#include "mailmap.h"
  18#include "commit-slab.h"
  19#include "dir.h"
  20#include "cache-tree.h"
  21#include "bisect.h"
  22
  23volatile show_early_output_fn_t show_early_output;
  24
  25static const char *term_bad;
  26static const char *term_good;
  27
  28void show_object_with_name(FILE *out, struct object *obj, const char *name)
  29{
  30        const char *p;
  31
  32        fprintf(out, "%s ", oid_to_hex(&obj->oid));
  33        for (p = name; *p && *p != '\n'; p++)
  34                fputc(*p, out);
  35        fputc('\n', out);
  36}
  37
  38static void mark_blob_uninteresting(struct blob *blob)
  39{
  40        if (!blob)
  41                return;
  42        if (blob->object.flags & UNINTERESTING)
  43                return;
  44        blob->object.flags |= UNINTERESTING;
  45}
  46
  47static void mark_tree_contents_uninteresting(struct tree *tree)
  48{
  49        struct tree_desc desc;
  50        struct name_entry entry;
  51        struct object *obj = &tree->object;
  52
  53        if (!has_object_file(&obj->oid))
  54                return;
  55        if (parse_tree(tree) < 0)
  56                die("bad tree %s", oid_to_hex(&obj->oid));
  57
  58        init_tree_desc(&desc, tree->buffer, tree->size);
  59        while (tree_entry(&desc, &entry)) {
  60                switch (object_type(entry.mode)) {
  61                case OBJ_TREE:
  62                        mark_tree_uninteresting(lookup_tree(entry.oid));
  63                        break;
  64                case OBJ_BLOB:
  65                        mark_blob_uninteresting(lookup_blob(entry.oid));
  66                        break;
  67                default:
  68                        /* Subproject commit - not in this repository */
  69                        break;
  70                }
  71        }
  72
  73        /*
  74         * We don't care about the tree any more
  75         * after it has been marked uninteresting.
  76         */
  77        free_tree_buffer(tree);
  78}
  79
  80void mark_tree_uninteresting(struct tree *tree)
  81{
  82        struct object *obj;
  83
  84        if (!tree)
  85                return;
  86
  87        obj = &tree->object;
  88        if (obj->flags & UNINTERESTING)
  89                return;
  90        obj->flags |= UNINTERESTING;
  91        mark_tree_contents_uninteresting(tree);
  92}
  93
  94void mark_parents_uninteresting(struct commit *commit)
  95{
  96        struct commit_list *parents = NULL, *l;
  97
  98        for (l = commit->parents; l; l = l->next)
  99                commit_list_insert(l->item, &parents);
 100
 101        while (parents) {
 102                struct commit *commit = pop_commit(&parents);
 103
 104                while (commit) {
 105                        /*
 106                         * A missing commit is ok iff its parent is marked
 107                         * uninteresting.
 108                         *
 109                         * We just mark such a thing parsed, so that when
 110                         * it is popped next time around, we won't be trying
 111                         * to parse it and get an error.
 112                         */
 113                        if (!has_object_file(&commit->object.oid))
 114                                commit->object.parsed = 1;
 115
 116                        if (commit->object.flags & UNINTERESTING)
 117                                break;
 118
 119                        commit->object.flags |= UNINTERESTING;
 120
 121                        /*
 122                         * Normally we haven't parsed the parent
 123                         * yet, so we won't have a parent of a parent
 124                         * here. However, it may turn out that we've
 125                         * reached this commit some other way (where it
 126                         * wasn't uninteresting), in which case we need
 127                         * to mark its parents recursively too..
 128                         */
 129                        if (!commit->parents)
 130                                break;
 131
 132                        for (l = commit->parents->next; l; l = l->next)
 133                                commit_list_insert(l->item, &parents);
 134                        commit = commit->parents->item;
 135                }
 136        }
 137}
 138
 139static void add_pending_object_with_path(struct rev_info *revs,
 140                                         struct object *obj,
 141                                         const char *name, unsigned mode,
 142                                         const char *path)
 143{
 144        if (!obj)
 145                return;
 146        if (revs->no_walk && (obj->flags & UNINTERESTING))
 147                revs->no_walk = 0;
 148        if (revs->reflog_info && obj->type == OBJ_COMMIT) {
 149                struct strbuf buf = STRBUF_INIT;
 150                int len = interpret_branch_name(name, 0, &buf, 0);
 151
 152                if (0 < len && name[len] && buf.len)
 153                        strbuf_addstr(&buf, name + len);
 154                add_reflog_for_walk(revs->reflog_info,
 155                                    (struct commit *)obj,
 156                                    buf.buf[0] ? buf.buf: name);
 157                strbuf_release(&buf);
 158                return; /* do not add the commit itself */
 159        }
 160        add_object_array_with_path(obj, name, &revs->pending, mode, path);
 161}
 162
 163static void add_pending_object_with_mode(struct rev_info *revs,
 164                                         struct object *obj,
 165                                         const char *name, unsigned mode)
 166{
 167        add_pending_object_with_path(revs, obj, name, mode, NULL);
 168}
 169
 170void add_pending_object(struct rev_info *revs,
 171                        struct object *obj, const char *name)
 172{
 173        add_pending_object_with_mode(revs, obj, name, S_IFINVALID);
 174}
 175
 176void add_head_to_pending(struct rev_info *revs)
 177{
 178        struct object_id oid;
 179        struct object *obj;
 180        if (get_oid("HEAD", &oid))
 181                return;
 182        obj = parse_object(&oid);
 183        if (!obj)
 184                return;
 185        add_pending_object(revs, obj, "HEAD");
 186}
 187
 188static struct object *get_reference(struct rev_info *revs, const char *name,
 189                                    const struct object_id *oid,
 190                                    unsigned int flags)
 191{
 192        struct object *object;
 193
 194        object = parse_object(oid);
 195        if (!object) {
 196                if (revs->ignore_missing)
 197                        return object;
 198                die("bad object %s", name);
 199        }
 200        object->flags |= flags;
 201        return object;
 202}
 203
 204void add_pending_oid(struct rev_info *revs, const char *name,
 205                      const struct object_id *oid, unsigned int flags)
 206{
 207        struct object *object = get_reference(revs, name, oid, flags);
 208        add_pending_object(revs, object, name);
 209}
 210
 211static struct commit *handle_commit(struct rev_info *revs,
 212                                    struct object_array_entry *entry)
 213{
 214        struct object *object = entry->item;
 215        const char *name = entry->name;
 216        const char *path = entry->path;
 217        unsigned int mode = entry->mode;
 218        unsigned long flags = object->flags;
 219
 220        /*
 221         * Tag object? Look what it points to..
 222         */
 223        while (object->type == OBJ_TAG) {
 224                struct tag *tag = (struct tag *) object;
 225                if (revs->tag_objects && !(flags & UNINTERESTING))
 226                        add_pending_object(revs, object, tag->tag);
 227                if (!tag->tagged)
 228                        die("bad tag");
 229                object = parse_object(&tag->tagged->oid);
 230                if (!object) {
 231                        if (revs->ignore_missing_links || (flags & UNINTERESTING))
 232                                return NULL;
 233                        die("bad object %s", oid_to_hex(&tag->tagged->oid));
 234                }
 235                object->flags |= flags;
 236                /*
 237                 * We'll handle the tagged object by looping or dropping
 238                 * through to the non-tag handlers below. Do not
 239                 * propagate path data from the tag's pending entry.
 240                 */
 241                path = NULL;
 242                mode = 0;
 243        }
 244
 245        /*
 246         * Commit object? Just return it, we'll do all the complex
 247         * reachability crud.
 248         */
 249        if (object->type == OBJ_COMMIT) {
 250                struct commit *commit = (struct commit *)object;
 251                if (parse_commit(commit) < 0)
 252                        die("unable to parse commit %s", name);
 253                if (flags & UNINTERESTING) {
 254                        mark_parents_uninteresting(commit);
 255                        revs->limited = 1;
 256                }
 257                if (revs->show_source && !commit->util)
 258                        commit->util = xstrdup(name);
 259                return commit;
 260        }
 261
 262        /*
 263         * Tree object? Either mark it uninteresting, or add it
 264         * to the list of objects to look at later..
 265         */
 266        if (object->type == OBJ_TREE) {
 267                struct tree *tree = (struct tree *)object;
 268                if (!revs->tree_objects)
 269                        return NULL;
 270                if (flags & UNINTERESTING) {
 271                        mark_tree_contents_uninteresting(tree);
 272                        return NULL;
 273                }
 274                add_pending_object_with_path(revs, object, name, mode, path);
 275                return NULL;
 276        }
 277
 278        /*
 279         * Blob object? You know the drill by now..
 280         */
 281        if (object->type == OBJ_BLOB) {
 282                if (!revs->blob_objects)
 283                        return NULL;
 284                if (flags & UNINTERESTING)
 285                        return NULL;
 286                add_pending_object_with_path(revs, object, name, mode, path);
 287                return NULL;
 288        }
 289        die("%s is unknown object", name);
 290}
 291
 292static int everybody_uninteresting(struct commit_list *orig,
 293                                   struct commit **interesting_cache)
 294{
 295        struct commit_list *list = orig;
 296
 297        if (*interesting_cache) {
 298                struct commit *commit = *interesting_cache;
 299                if (!(commit->object.flags & UNINTERESTING))
 300                        return 0;
 301        }
 302
 303        while (list) {
 304                struct commit *commit = list->item;
 305                list = list->next;
 306                if (commit->object.flags & UNINTERESTING)
 307                        continue;
 308
 309                *interesting_cache = commit;
 310                return 0;
 311        }
 312        return 1;
 313}
 314
 315/*
 316 * A definition of "relevant" commit that we can use to simplify limited graphs
 317 * by eliminating side branches.
 318 *
 319 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
 320 * in our list), or that is a specified BOTTOM commit. Then after computing
 321 * a limited list, during processing we can generally ignore boundary merges
 322 * coming from outside the graph, (ie from irrelevant parents), and treat
 323 * those merges as if they were single-parent. TREESAME is defined to consider
 324 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
 325 * we don't care if we were !TREESAME to non-graph parents.
 326 *
 327 * Treating bottom commits as relevant ensures that a limited graph's
 328 * connection to the actual bottom commit is not viewed as a side branch, but
 329 * treated as part of the graph. For example:
 330 *
 331 *   ....Z...A---X---o---o---B
 332 *        .     /
 333 *         W---Y
 334 *
 335 * When computing "A..B", the A-X connection is at least as important as
 336 * Y-X, despite A being flagged UNINTERESTING.
 337 *
 338 * And when computing --ancestry-path "A..B", the A-X connection is more
 339 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
 340 */
 341static inline int relevant_commit(struct commit *commit)
 342{
 343        return (commit->object.flags & (UNINTERESTING | BOTTOM)) != UNINTERESTING;
 344}
 345
 346/*
 347 * Return a single relevant commit from a parent list. If we are a TREESAME
 348 * commit, and this selects one of our parents, then we can safely simplify to
 349 * that parent.
 350 */
 351static struct commit *one_relevant_parent(const struct rev_info *revs,
 352                                          struct commit_list *orig)
 353{
 354        struct commit_list *list = orig;
 355        struct commit *relevant = NULL;
 356
 357        if (!orig)
 358                return NULL;
 359
 360        /*
 361         * For 1-parent commits, or if first-parent-only, then return that
 362         * first parent (even if not "relevant" by the above definition).
 363         * TREESAME will have been set purely on that parent.
 364         */
 365        if (revs->first_parent_only || !orig->next)
 366                return orig->item;
 367
 368        /*
 369         * For multi-parent commits, identify a sole relevant parent, if any.
 370         * If we have only one relevant parent, then TREESAME will be set purely
 371         * with regard to that parent, and we can simplify accordingly.
 372         *
 373         * If we have more than one relevant parent, or no relevant parents
 374         * (and multiple irrelevant ones), then we can't select a parent here
 375         * and return NULL.
 376         */
 377        while (list) {
 378                struct commit *commit = list->item;
 379                list = list->next;
 380                if (relevant_commit(commit)) {
 381                        if (relevant)
 382                                return NULL;
 383                        relevant = commit;
 384                }
 385        }
 386        return relevant;
 387}
 388
 389/*
 390 * The goal is to get REV_TREE_NEW as the result only if the
 391 * diff consists of all '+' (and no other changes), REV_TREE_OLD
 392 * if the whole diff is removal of old data, and otherwise
 393 * REV_TREE_DIFFERENT (of course if the trees are the same we
 394 * want REV_TREE_SAME).
 395 * That means that once we get to REV_TREE_DIFFERENT, we do not
 396 * have to look any further.
 397 */
 398static int tree_difference = REV_TREE_SAME;
 399
 400static void file_add_remove(struct diff_options *options,
 401                    int addremove, unsigned mode,
 402                    const struct object_id *oid,
 403                    int oid_valid,
 404                    const char *fullpath, unsigned dirty_submodule)
 405{
 406        int diff = addremove == '+' ? REV_TREE_NEW : REV_TREE_OLD;
 407
 408        tree_difference |= diff;
 409        if (tree_difference == REV_TREE_DIFFERENT)
 410                DIFF_OPT_SET(options, HAS_CHANGES);
 411}
 412
 413static void file_change(struct diff_options *options,
 414                 unsigned old_mode, unsigned new_mode,
 415                 const struct object_id *old_oid,
 416                 const struct object_id *new_oid,
 417                 int old_oid_valid, int new_oid_valid,
 418                 const char *fullpath,
 419                 unsigned old_dirty_submodule, unsigned new_dirty_submodule)
 420{
 421        tree_difference = REV_TREE_DIFFERENT;
 422        DIFF_OPT_SET(options, HAS_CHANGES);
 423}
 424
 425static int rev_compare_tree(struct rev_info *revs,
 426                            struct commit *parent, struct commit *commit)
 427{
 428        struct tree *t1 = parent->tree;
 429        struct tree *t2 = commit->tree;
 430
 431        if (!t1)
 432                return REV_TREE_NEW;
 433        if (!t2)
 434                return REV_TREE_OLD;
 435
 436        if (revs->simplify_by_decoration) {
 437                /*
 438                 * If we are simplifying by decoration, then the commit
 439                 * is worth showing if it has a tag pointing at it.
 440                 */
 441                if (get_name_decoration(&commit->object))
 442                        return REV_TREE_DIFFERENT;
 443                /*
 444                 * A commit that is not pointed by a tag is uninteresting
 445                 * if we are not limited by path.  This means that you will
 446                 * see the usual "commits that touch the paths" plus any
 447                 * tagged commit by specifying both --simplify-by-decoration
 448                 * and pathspec.
 449                 */
 450                if (!revs->prune_data.nr)
 451                        return REV_TREE_SAME;
 452        }
 453
 454        tree_difference = REV_TREE_SAME;
 455        DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 456        if (diff_tree_oid(&t1->object.oid, &t2->object.oid, "",
 457                           &revs->pruning) < 0)
 458                return REV_TREE_DIFFERENT;
 459        return tree_difference;
 460}
 461
 462static int rev_same_tree_as_empty(struct rev_info *revs, struct commit *commit)
 463{
 464        int retval;
 465        struct tree *t1 = commit->tree;
 466
 467        if (!t1)
 468                return 0;
 469
 470        tree_difference = REV_TREE_SAME;
 471        DIFF_OPT_CLR(&revs->pruning, HAS_CHANGES);
 472        retval = diff_tree_oid(NULL, &t1->object.oid, "", &revs->pruning);
 473
 474        return retval >= 0 && (tree_difference == REV_TREE_SAME);
 475}
 476
 477struct treesame_state {
 478        unsigned int nparents;
 479        unsigned char treesame[FLEX_ARRAY];
 480};
 481
 482static struct treesame_state *initialise_treesame(struct rev_info *revs, struct commit *commit)
 483{
 484        unsigned n = commit_list_count(commit->parents);
 485        struct treesame_state *st = xcalloc(1, st_add(sizeof(*st), n));
 486        st->nparents = n;
 487        add_decoration(&revs->treesame, &commit->object, st);
 488        return st;
 489}
 490
 491/*
 492 * Must be called immediately after removing the nth_parent from a commit's
 493 * parent list, if we are maintaining the per-parent treesame[] decoration.
 494 * This does not recalculate the master TREESAME flag - update_treesame()
 495 * should be called to update it after a sequence of treesame[] modifications
 496 * that may have affected it.
 497 */
 498static int compact_treesame(struct rev_info *revs, struct commit *commit, unsigned nth_parent)
 499{
 500        struct treesame_state *st;
 501        int old_same;
 502
 503        if (!commit->parents) {
 504                /*
 505                 * Have just removed the only parent from a non-merge.
 506                 * Different handling, as we lack decoration.
 507                 */
 508                if (nth_parent != 0)
 509                        die("compact_treesame %u", nth_parent);
 510                old_same = !!(commit->object.flags & TREESAME);
 511                if (rev_same_tree_as_empty(revs, commit))
 512                        commit->object.flags |= TREESAME;
 513                else
 514                        commit->object.flags &= ~TREESAME;
 515                return old_same;
 516        }
 517
 518        st = lookup_decoration(&revs->treesame, &commit->object);
 519        if (!st || nth_parent >= st->nparents)
 520                die("compact_treesame %u", nth_parent);
 521
 522        old_same = st->treesame[nth_parent];
 523        memmove(st->treesame + nth_parent,
 524                st->treesame + nth_parent + 1,
 525                st->nparents - nth_parent - 1);
 526
 527        /*
 528         * If we've just become a non-merge commit, update TREESAME
 529         * immediately, and remove the no-longer-needed decoration.
 530         * If still a merge, defer update until update_treesame().
 531         */
 532        if (--st->nparents == 1) {
 533                if (commit->parents->next)
 534                        die("compact_treesame parents mismatch");
 535                if (st->treesame[0] && revs->dense)
 536                        commit->object.flags |= TREESAME;
 537                else
 538                        commit->object.flags &= ~TREESAME;
 539                free(add_decoration(&revs->treesame, &commit->object, NULL));
 540        }
 541
 542        return old_same;
 543}
 544
 545static unsigned update_treesame(struct rev_info *revs, struct commit *commit)
 546{
 547        if (commit->parents && commit->parents->next) {
 548                unsigned n;
 549                struct treesame_state *st;
 550                struct commit_list *p;
 551                unsigned relevant_parents;
 552                unsigned relevant_change, irrelevant_change;
 553
 554                st = lookup_decoration(&revs->treesame, &commit->object);
 555                if (!st)
 556                        die("update_treesame %s", oid_to_hex(&commit->object.oid));
 557                relevant_parents = 0;
 558                relevant_change = irrelevant_change = 0;
 559                for (p = commit->parents, n = 0; p; n++, p = p->next) {
 560                        if (relevant_commit(p->item)) {
 561                                relevant_change |= !st->treesame[n];
 562                                relevant_parents++;
 563                        } else
 564                                irrelevant_change |= !st->treesame[n];
 565                }
 566                if (relevant_parents ? relevant_change : irrelevant_change)
 567                        commit->object.flags &= ~TREESAME;
 568                else
 569                        commit->object.flags |= TREESAME;
 570        }
 571
 572        return commit->object.flags & TREESAME;
 573}
 574
 575static inline int limiting_can_increase_treesame(const struct rev_info *revs)
 576{
 577        /*
 578         * TREESAME is irrelevant unless prune && dense;
 579         * if simplify_history is set, we can't have a mixture of TREESAME and
 580         *    !TREESAME INTERESTING parents (and we don't have treesame[]
 581         *    decoration anyway);
 582         * if first_parent_only is set, then the TREESAME flag is locked
 583         *    against the first parent (and again we lack treesame[] decoration).
 584         */
 585        return revs->prune && revs->dense &&
 586               !revs->simplify_history &&
 587               !revs->first_parent_only;
 588}
 589
 590static void try_to_simplify_commit(struct rev_info *revs, struct commit *commit)
 591{
 592        struct commit_list **pp, *parent;
 593        struct treesame_state *ts = NULL;
 594        int relevant_change = 0, irrelevant_change = 0;
 595        int relevant_parents, nth_parent;
 596
 597        /*
 598         * If we don't do pruning, everything is interesting
 599         */
 600        if (!revs->prune)
 601                return;
 602
 603        if (!commit->tree)
 604                return;
 605
 606        if (!commit->parents) {
 607                if (rev_same_tree_as_empty(revs, commit))
 608                        commit->object.flags |= TREESAME;
 609                return;
 610        }
 611
 612        /*
 613         * Normal non-merge commit? If we don't want to make the
 614         * history dense, we consider it always to be a change..
 615         */
 616        if (!revs->dense && !commit->parents->next)
 617                return;
 618
 619        for (pp = &commit->parents, nth_parent = 0, relevant_parents = 0;
 620             (parent = *pp) != NULL;
 621             pp = &parent->next, nth_parent++) {
 622                struct commit *p = parent->item;
 623                if (relevant_commit(p))
 624                        relevant_parents++;
 625
 626                if (nth_parent == 1) {
 627                        /*
 628                         * This our second loop iteration - so we now know
 629                         * we're dealing with a merge.
 630                         *
 631                         * Do not compare with later parents when we care only about
 632                         * the first parent chain, in order to avoid derailing the
 633                         * traversal to follow a side branch that brought everything
 634                         * in the path we are limited to by the pathspec.
 635                         */
 636                        if (revs->first_parent_only)
 637                                break;
 638                        /*
 639                         * If this will remain a potentially-simplifiable
 640                         * merge, remember per-parent treesame if needed.
 641                         * Initialise the array with the comparison from our
 642                         * first iteration.
 643                         */
 644                        if (revs->treesame.name &&
 645                            !revs->simplify_history &&
 646                            !(commit->object.flags & UNINTERESTING)) {
 647                                ts = initialise_treesame(revs, commit);
 648                                if (!(irrelevant_change || relevant_change))
 649                                        ts->treesame[0] = 1;
 650                        }
 651                }
 652                if (parse_commit(p) < 0)
 653                        die("cannot simplify commit %s (because of %s)",
 654                            oid_to_hex(&commit->object.oid),
 655                            oid_to_hex(&p->object.oid));
 656                switch (rev_compare_tree(revs, p, commit)) {
 657                case REV_TREE_SAME:
 658                        if (!revs->simplify_history || !relevant_commit(p)) {
 659                                /* Even if a merge with an uninteresting
 660                                 * side branch brought the entire change
 661                                 * we are interested in, we do not want
 662                                 * to lose the other branches of this
 663                                 * merge, so we just keep going.
 664                                 */
 665                                if (ts)
 666                                        ts->treesame[nth_parent] = 1;
 667                                continue;
 668                        }
 669                        parent->next = NULL;
 670                        commit->parents = parent;
 671                        commit->object.flags |= TREESAME;
 672                        return;
 673
 674                case REV_TREE_NEW:
 675                        if (revs->remove_empty_trees &&
 676                            rev_same_tree_as_empty(revs, p)) {
 677                                /* We are adding all the specified
 678                                 * paths from this parent, so the
 679                                 * history beyond this parent is not
 680                                 * interesting.  Remove its parents
 681                                 * (they are grandparents for us).
 682                                 * IOW, we pretend this parent is a
 683                                 * "root" commit.
 684                                 */
 685                                if (parse_commit(p) < 0)
 686                                        die("cannot simplify commit %s (invalid %s)",
 687                                            oid_to_hex(&commit->object.oid),
 688                                            oid_to_hex(&p->object.oid));
 689                                p->parents = NULL;
 690                        }
 691                /* fallthrough */
 692                case REV_TREE_OLD:
 693                case REV_TREE_DIFFERENT:
 694                        if (relevant_commit(p))
 695                                relevant_change = 1;
 696                        else
 697                                irrelevant_change = 1;
 698                        continue;
 699                }
 700                die("bad tree compare for commit %s", oid_to_hex(&commit->object.oid));
 701        }
 702
 703        /*
 704         * TREESAME is straightforward for single-parent commits. For merge
 705         * commits, it is most useful to define it so that "irrelevant"
 706         * parents cannot make us !TREESAME - if we have any relevant
 707         * parents, then we only consider TREESAMEness with respect to them,
 708         * allowing irrelevant merges from uninteresting branches to be
 709         * simplified away. Only if we have only irrelevant parents do we
 710         * base TREESAME on them. Note that this logic is replicated in
 711         * update_treesame, which should be kept in sync.
 712         */
 713        if (relevant_parents ? !relevant_change : !irrelevant_change)
 714                commit->object.flags |= TREESAME;
 715}
 716
 717static void commit_list_insert_by_date_cached(struct commit *p, struct commit_list **head,
 718                    struct commit_list *cached_base, struct commit_list **cache)
 719{
 720        struct commit_list *new_entry;
 721
 722        if (cached_base && p->date < cached_base->item->date)
 723                new_entry = commit_list_insert_by_date(p, &cached_base->next);
 724        else
 725                new_entry = commit_list_insert_by_date(p, head);
 726
 727        if (cache && (!*cache || p->date < (*cache)->item->date))
 728                *cache = new_entry;
 729}
 730
 731static int add_parents_to_list(struct rev_info *revs, struct commit *commit,
 732                    struct commit_list **list, struct commit_list **cache_ptr)
 733{
 734        struct commit_list *parent = commit->parents;
 735        unsigned left_flag;
 736        struct commit_list *cached_base = cache_ptr ? *cache_ptr : NULL;
 737
 738        if (commit->object.flags & ADDED)
 739                return 0;
 740        commit->object.flags |= ADDED;
 741
 742        if (revs->include_check &&
 743            !revs->include_check(commit, revs->include_check_data))
 744                return 0;
 745
 746        /*
 747         * If the commit is uninteresting, don't try to
 748         * prune parents - we want the maximal uninteresting
 749         * set.
 750         *
 751         * Normally we haven't parsed the parent
 752         * yet, so we won't have a parent of a parent
 753         * here. However, it may turn out that we've
 754         * reached this commit some other way (where it
 755         * wasn't uninteresting), in which case we need
 756         * to mark its parents recursively too..
 757         */
 758        if (commit->object.flags & UNINTERESTING) {
 759                while (parent) {
 760                        struct commit *p = parent->item;
 761                        parent = parent->next;
 762                        if (p)
 763                                p->object.flags |= UNINTERESTING;
 764                        if (parse_commit_gently(p, 1) < 0)
 765                                continue;
 766                        if (p->parents)
 767                                mark_parents_uninteresting(p);
 768                        if (p->object.flags & SEEN)
 769                                continue;
 770                        p->object.flags |= SEEN;
 771                        commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
 772                }
 773                return 0;
 774        }
 775
 776        /*
 777         * Ok, the commit wasn't uninteresting. Try to
 778         * simplify the commit history and find the parent
 779         * that has no differences in the path set if one exists.
 780         */
 781        try_to_simplify_commit(revs, commit);
 782
 783        if (revs->no_walk)
 784                return 0;
 785
 786        left_flag = (commit->object.flags & SYMMETRIC_LEFT);
 787
 788        for (parent = commit->parents; parent; parent = parent->next) {
 789                struct commit *p = parent->item;
 790
 791                if (parse_commit_gently(p, revs->ignore_missing_links) < 0)
 792                        return -1;
 793                if (revs->show_source && !p->util)
 794                        p->util = commit->util;
 795                p->object.flags |= left_flag;
 796                if (!(p->object.flags & SEEN)) {
 797                        p->object.flags |= SEEN;
 798                        commit_list_insert_by_date_cached(p, list, cached_base, cache_ptr);
 799                }
 800                if (revs->first_parent_only)
 801                        break;
 802        }
 803        return 0;
 804}
 805
 806static void cherry_pick_list(struct commit_list *list, struct rev_info *revs)
 807{
 808        struct commit_list *p;
 809        int left_count = 0, right_count = 0;
 810        int left_first;
 811        struct patch_ids ids;
 812        unsigned cherry_flag;
 813
 814        /* First count the commits on the left and on the right */
 815        for (p = list; p; p = p->next) {
 816                struct commit *commit = p->item;
 817                unsigned flags = commit->object.flags;
 818                if (flags & BOUNDARY)
 819                        ;
 820                else if (flags & SYMMETRIC_LEFT)
 821                        left_count++;
 822                else
 823                        right_count++;
 824        }
 825
 826        if (!left_count || !right_count)
 827                return;
 828
 829        left_first = left_count < right_count;
 830        init_patch_ids(&ids);
 831        ids.diffopts.pathspec = revs->diffopt.pathspec;
 832
 833        /* Compute patch-ids for one side */
 834        for (p = list; p; p = p->next) {
 835                struct commit *commit = p->item;
 836                unsigned flags = commit->object.flags;
 837
 838                if (flags & BOUNDARY)
 839                        continue;
 840                /*
 841                 * If we have fewer left, left_first is set and we omit
 842                 * commits on the right branch in this loop.  If we have
 843                 * fewer right, we skip the left ones.
 844                 */
 845                if (left_first != !!(flags & SYMMETRIC_LEFT))
 846                        continue;
 847                add_commit_patch_id(commit, &ids);
 848        }
 849
 850        /* either cherry_mark or cherry_pick are true */
 851        cherry_flag = revs->cherry_mark ? PATCHSAME : SHOWN;
 852
 853        /* Check the other side */
 854        for (p = list; p; p = p->next) {
 855                struct commit *commit = p->item;
 856                struct patch_id *id;
 857                unsigned flags = commit->object.flags;
 858
 859                if (flags & BOUNDARY)
 860                        continue;
 861                /*
 862                 * If we have fewer left, left_first is set and we omit
 863                 * commits on the left branch in this loop.
 864                 */
 865                if (left_first == !!(flags & SYMMETRIC_LEFT))
 866                        continue;
 867
 868                /*
 869                 * Have we seen the same patch id?
 870                 */
 871                id = has_commit_patch_id(commit, &ids);
 872                if (!id)
 873                        continue;
 874
 875                commit->object.flags |= cherry_flag;
 876                id->commit->object.flags |= cherry_flag;
 877        }
 878
 879        free_patch_ids(&ids);
 880}
 881
 882/* How many extra uninteresting commits we want to see.. */
 883#define SLOP 5
 884
 885static int still_interesting(struct commit_list *src, timestamp_t date, int slop,
 886                             struct commit **interesting_cache)
 887{
 888        /*
 889         * No source list at all? We're definitely done..
 890         */
 891        if (!src)
 892                return 0;
 893
 894        /*
 895         * Does the destination list contain entries with a date
 896         * before the source list? Definitely _not_ done.
 897         */
 898        if (date <= src->item->date)
 899                return SLOP;
 900
 901        /*
 902         * Does the source list still have interesting commits in
 903         * it? Definitely not done..
 904         */
 905        if (!everybody_uninteresting(src, interesting_cache))
 906                return SLOP;
 907
 908        /* Ok, we're closing in.. */
 909        return slop-1;
 910}
 911
 912/*
 913 * "rev-list --ancestry-path A..B" computes commits that are ancestors
 914 * of B but not ancestors of A but further limits the result to those
 915 * that are descendants of A.  This takes the list of bottom commits and
 916 * the result of "A..B" without --ancestry-path, and limits the latter
 917 * further to the ones that can reach one of the commits in "bottom".
 918 */
 919static void limit_to_ancestry(struct commit_list *bottom, struct commit_list *list)
 920{
 921        struct commit_list *p;
 922        struct commit_list *rlist = NULL;
 923        int made_progress;
 924
 925        /*
 926         * Reverse the list so that it will be likely that we would
 927         * process parents before children.
 928         */
 929        for (p = list; p; p = p->next)
 930                commit_list_insert(p->item, &rlist);
 931
 932        for (p = bottom; p; p = p->next)
 933                p->item->object.flags |= TMP_MARK;
 934
 935        /*
 936         * Mark the ones that can reach bottom commits in "list",
 937         * in a bottom-up fashion.
 938         */
 939        do {
 940                made_progress = 0;
 941                for (p = rlist; p; p = p->next) {
 942                        struct commit *c = p->item;
 943                        struct commit_list *parents;
 944                        if (c->object.flags & (TMP_MARK | UNINTERESTING))
 945                                continue;
 946                        for (parents = c->parents;
 947                             parents;
 948                             parents = parents->next) {
 949                                if (!(parents->item->object.flags & TMP_MARK))
 950                                        continue;
 951                                c->object.flags |= TMP_MARK;
 952                                made_progress = 1;
 953                                break;
 954                        }
 955                }
 956        } while (made_progress);
 957
 958        /*
 959         * NEEDSWORK: decide if we want to remove parents that are
 960         * not marked with TMP_MARK from commit->parents for commits
 961         * in the resulting list.  We may not want to do that, though.
 962         */
 963
 964        /*
 965         * The ones that are not marked with TMP_MARK are uninteresting
 966         */
 967        for (p = list; p; p = p->next) {
 968                struct commit *c = p->item;
 969                if (c->object.flags & TMP_MARK)
 970                        continue;
 971                c->object.flags |= UNINTERESTING;
 972        }
 973
 974        /* We are done with the TMP_MARK */
 975        for (p = list; p; p = p->next)
 976                p->item->object.flags &= ~TMP_MARK;
 977        for (p = bottom; p; p = p->next)
 978                p->item->object.flags &= ~TMP_MARK;
 979        free_commit_list(rlist);
 980}
 981
 982/*
 983 * Before walking the history, keep the set of "negative" refs the
 984 * caller has asked to exclude.
 985 *
 986 * This is used to compute "rev-list --ancestry-path A..B", as we need
 987 * to filter the result of "A..B" further to the ones that can actually
 988 * reach A.
 989 */
 990static struct commit_list *collect_bottom_commits(struct commit_list *list)
 991{
 992        struct commit_list *elem, *bottom = NULL;
 993        for (elem = list; elem; elem = elem->next)
 994                if (elem->item->object.flags & BOTTOM)
 995                        commit_list_insert(elem->item, &bottom);
 996        return bottom;
 997}
 998
 999/* Assumes either left_only or right_only is set */
1000static void limit_left_right(struct commit_list *list, struct rev_info *revs)
1001{
1002        struct commit_list *p;
1003
1004        for (p = list; p; p = p->next) {
1005                struct commit *commit = p->item;
1006
1007                if (revs->right_only) {
1008                        if (commit->object.flags & SYMMETRIC_LEFT)
1009                                commit->object.flags |= SHOWN;
1010                } else  /* revs->left_only is set */
1011                        if (!(commit->object.flags & SYMMETRIC_LEFT))
1012                                commit->object.flags |= SHOWN;
1013        }
1014}
1015
1016static int limit_list(struct rev_info *revs)
1017{
1018        int slop = SLOP;
1019        timestamp_t date = TIME_MAX;
1020        struct commit_list *list = revs->commits;
1021        struct commit_list *newlist = NULL;
1022        struct commit_list **p = &newlist;
1023        struct commit_list *bottom = NULL;
1024        struct commit *interesting_cache = NULL;
1025
1026        if (revs->ancestry_path) {
1027                bottom = collect_bottom_commits(list);
1028                if (!bottom)
1029                        die("--ancestry-path given but there are no bottom commits");
1030        }
1031
1032        while (list) {
1033                struct commit *commit = pop_commit(&list);
1034                struct object *obj = &commit->object;
1035                show_early_output_fn_t show;
1036
1037                if (commit == interesting_cache)
1038                        interesting_cache = NULL;
1039
1040                if (revs->max_age != -1 && (commit->date < revs->max_age))
1041                        obj->flags |= UNINTERESTING;
1042                if (add_parents_to_list(revs, commit, &list, NULL) < 0)
1043                        return -1;
1044                if (obj->flags & UNINTERESTING) {
1045                        mark_parents_uninteresting(commit);
1046                        if (revs->show_all)
1047                                p = &commit_list_insert(commit, p)->next;
1048                        slop = still_interesting(list, date, slop, &interesting_cache);
1049                        if (slop)
1050                                continue;
1051                        /* If showing all, add the whole pending list to the end */
1052                        if (revs->show_all)
1053                                *p = list;
1054                        break;
1055                }
1056                if (revs->min_age != -1 && (commit->date > revs->min_age))
1057                        continue;
1058                date = commit->date;
1059                p = &commit_list_insert(commit, p)->next;
1060
1061                show = show_early_output;
1062                if (!show)
1063                        continue;
1064
1065                show(revs, newlist);
1066                show_early_output = NULL;
1067        }
1068        if (revs->cherry_pick || revs->cherry_mark)
1069                cherry_pick_list(newlist, revs);
1070
1071        if (revs->left_only || revs->right_only)
1072                limit_left_right(newlist, revs);
1073
1074        if (bottom) {
1075                limit_to_ancestry(bottom, newlist);
1076                free_commit_list(bottom);
1077        }
1078
1079        /*
1080         * Check if any commits have become TREESAME by some of their parents
1081         * becoming UNINTERESTING.
1082         */
1083        if (limiting_can_increase_treesame(revs))
1084                for (list = newlist; list; list = list->next) {
1085                        struct commit *c = list->item;
1086                        if (c->object.flags & (UNINTERESTING | TREESAME))
1087                                continue;
1088                        update_treesame(revs, c);
1089                }
1090
1091        revs->commits = newlist;
1092        return 0;
1093}
1094
1095/*
1096 * Add an entry to refs->cmdline with the specified information.
1097 * *name is copied.
1098 */
1099static void add_rev_cmdline(struct rev_info *revs,
1100                            struct object *item,
1101                            const char *name,
1102                            int whence,
1103                            unsigned flags)
1104{
1105        struct rev_cmdline_info *info = &revs->cmdline;
1106        int nr = info->nr;
1107
1108        ALLOC_GROW(info->rev, nr + 1, info->alloc);
1109        info->rev[nr].item = item;
1110        info->rev[nr].name = xstrdup(name);
1111        info->rev[nr].whence = whence;
1112        info->rev[nr].flags = flags;
1113        info->nr++;
1114}
1115
1116static void add_rev_cmdline_list(struct rev_info *revs,
1117                                 struct commit_list *commit_list,
1118                                 int whence,
1119                                 unsigned flags)
1120{
1121        while (commit_list) {
1122                struct object *object = &commit_list->item->object;
1123                add_rev_cmdline(revs, object, oid_to_hex(&object->oid),
1124                                whence, flags);
1125                commit_list = commit_list->next;
1126        }
1127}
1128
1129struct all_refs_cb {
1130        int all_flags;
1131        int warned_bad_reflog;
1132        struct rev_info *all_revs;
1133        const char *name_for_errormsg;
1134};
1135
1136int ref_excluded(struct string_list *ref_excludes, const char *path)
1137{
1138        struct string_list_item *item;
1139
1140        if (!ref_excludes)
1141                return 0;
1142        for_each_string_list_item(item, ref_excludes) {
1143                if (!wildmatch(item->string, path, 0))
1144                        return 1;
1145        }
1146        return 0;
1147}
1148
1149static int handle_one_ref(const char *path, const struct object_id *oid,
1150                          int flag, void *cb_data)
1151{
1152        struct all_refs_cb *cb = cb_data;
1153        struct object *object;
1154
1155        if (ref_excluded(cb->all_revs->ref_excludes, path))
1156            return 0;
1157
1158        object = get_reference(cb->all_revs, path, oid, cb->all_flags);
1159        add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1160        add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
1161        return 0;
1162}
1163
1164static void init_all_refs_cb(struct all_refs_cb *cb, struct rev_info *revs,
1165        unsigned flags)
1166{
1167        cb->all_revs = revs;
1168        cb->all_flags = flags;
1169}
1170
1171void clear_ref_exclusion(struct string_list **ref_excludes_p)
1172{
1173        if (*ref_excludes_p) {
1174                string_list_clear(*ref_excludes_p, 0);
1175                free(*ref_excludes_p);
1176        }
1177        *ref_excludes_p = NULL;
1178}
1179
1180void add_ref_exclusion(struct string_list **ref_excludes_p, const char *exclude)
1181{
1182        if (!*ref_excludes_p) {
1183                *ref_excludes_p = xcalloc(1, sizeof(**ref_excludes_p));
1184                (*ref_excludes_p)->strdup_strings = 1;
1185        }
1186        string_list_append(*ref_excludes_p, exclude);
1187}
1188
1189static void handle_refs(const char *submodule, struct rev_info *revs, unsigned flags,
1190                int (*for_each)(const char *, each_ref_fn, void *))
1191{
1192        struct all_refs_cb cb;
1193        init_all_refs_cb(&cb, revs, flags);
1194        for_each(submodule, handle_one_ref, &cb);
1195}
1196
1197static void handle_one_reflog_commit(struct object_id *oid, void *cb_data)
1198{
1199        struct all_refs_cb *cb = cb_data;
1200        if (!is_null_oid(oid)) {
1201                struct object *o = parse_object(oid);
1202                if (o) {
1203                        o->flags |= cb->all_flags;
1204                        /* ??? CMDLINEFLAGS ??? */
1205                        add_pending_object(cb->all_revs, o, "");
1206                }
1207                else if (!cb->warned_bad_reflog) {
1208                        warning("reflog of '%s' references pruned commits",
1209                                cb->name_for_errormsg);
1210                        cb->warned_bad_reflog = 1;
1211                }
1212        }
1213}
1214
1215static int handle_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
1216                const char *email, timestamp_t timestamp, int tz,
1217                const char *message, void *cb_data)
1218{
1219        handle_one_reflog_commit(ooid, cb_data);
1220        handle_one_reflog_commit(noid, cb_data);
1221        return 0;
1222}
1223
1224static int handle_one_reflog(const char *path, const struct object_id *oid,
1225                             int flag, void *cb_data)
1226{
1227        struct all_refs_cb *cb = cb_data;
1228        cb->warned_bad_reflog = 0;
1229        cb->name_for_errormsg = path;
1230        for_each_reflog_ent(path, handle_one_reflog_ent, cb_data);
1231        return 0;
1232}
1233
1234void add_reflogs_to_pending(struct rev_info *revs, unsigned flags)
1235{
1236        struct all_refs_cb cb;
1237
1238        cb.all_revs = revs;
1239        cb.all_flags = flags;
1240        for_each_reflog(handle_one_reflog, &cb);
1241}
1242
1243static void add_cache_tree(struct cache_tree *it, struct rev_info *revs,
1244                           struct strbuf *path)
1245{
1246        size_t baselen = path->len;
1247        int i;
1248
1249        if (it->entry_count >= 0) {
1250                struct tree *tree = lookup_tree(&it->oid);
1251                add_pending_object_with_path(revs, &tree->object, "",
1252                                             040000, path->buf);
1253        }
1254
1255        for (i = 0; i < it->subtree_nr; i++) {
1256                struct cache_tree_sub *sub = it->down[i];
1257                strbuf_addf(path, "%s%s", baselen ? "/" : "", sub->name);
1258                add_cache_tree(sub->cache_tree, revs, path);
1259                strbuf_setlen(path, baselen);
1260        }
1261
1262}
1263
1264void add_index_objects_to_pending(struct rev_info *revs, unsigned flags)
1265{
1266        int i;
1267
1268        read_cache();
1269        for (i = 0; i < active_nr; i++) {
1270                struct cache_entry *ce = active_cache[i];
1271                struct blob *blob;
1272
1273                if (S_ISGITLINK(ce->ce_mode))
1274                        continue;
1275
1276                blob = lookup_blob(&ce->oid);
1277                if (!blob)
1278                        die("unable to add index blob to traversal");
1279                add_pending_object_with_path(revs, &blob->object, "",
1280                                             ce->ce_mode, ce->name);
1281        }
1282
1283        if (active_cache_tree) {
1284                struct strbuf path = STRBUF_INIT;
1285                add_cache_tree(active_cache_tree, revs, &path);
1286                strbuf_release(&path);
1287        }
1288}
1289
1290static int add_parents_only(struct rev_info *revs, const char *arg_, int flags,
1291                            int exclude_parent)
1292{
1293        struct object_id oid;
1294        struct object *it;
1295        struct commit *commit;
1296        struct commit_list *parents;
1297        int parent_number;
1298        const char *arg = arg_;
1299
1300        if (*arg == '^') {
1301                flags ^= UNINTERESTING | BOTTOM;
1302                arg++;
1303        }
1304        if (get_sha1_committish(arg, oid.hash))
1305                return 0;
1306        while (1) {
1307                it = get_reference(revs, arg, &oid, 0);
1308                if (!it && revs->ignore_missing)
1309                        return 0;
1310                if (it->type != OBJ_TAG)
1311                        break;
1312                if (!((struct tag*)it)->tagged)
1313                        return 0;
1314                oidcpy(&oid, &((struct tag*)it)->tagged->oid);
1315        }
1316        if (it->type != OBJ_COMMIT)
1317                return 0;
1318        commit = (struct commit *)it;
1319        if (exclude_parent &&
1320            exclude_parent > commit_list_count(commit->parents))
1321                return 0;
1322        for (parents = commit->parents, parent_number = 1;
1323             parents;
1324             parents = parents->next, parent_number++) {
1325                if (exclude_parent && parent_number != exclude_parent)
1326                        continue;
1327
1328                it = &parents->item->object;
1329                it->flags |= flags;
1330                add_rev_cmdline(revs, it, arg_, REV_CMD_PARENTS_ONLY, flags);
1331                add_pending_object(revs, it, arg);
1332        }
1333        return 1;
1334}
1335
1336void init_revisions(struct rev_info *revs, const char *prefix)
1337{
1338        memset(revs, 0, sizeof(*revs));
1339
1340        revs->abbrev = DEFAULT_ABBREV;
1341        revs->ignore_merges = 1;
1342        revs->simplify_history = 1;
1343        DIFF_OPT_SET(&revs->pruning, RECURSIVE);
1344        DIFF_OPT_SET(&revs->pruning, QUICK);
1345        revs->pruning.add_remove = file_add_remove;
1346        revs->pruning.change = file_change;
1347        revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1348        revs->dense = 1;
1349        revs->prefix = prefix;
1350        revs->max_age = -1;
1351        revs->min_age = -1;
1352        revs->skip_count = -1;
1353        revs->max_count = -1;
1354        revs->max_parents = -1;
1355        revs->expand_tabs_in_log = -1;
1356
1357        revs->commit_format = CMIT_FMT_DEFAULT;
1358        revs->expand_tabs_in_log_default = 8;
1359
1360        init_grep_defaults();
1361        grep_init(&revs->grep_filter, prefix);
1362        revs->grep_filter.status_only = 1;
1363
1364        diff_setup(&revs->diffopt);
1365        if (prefix && !revs->diffopt.prefix) {
1366                revs->diffopt.prefix = prefix;
1367                revs->diffopt.prefix_length = strlen(prefix);
1368        }
1369
1370        revs->notes_opt.use_default_notes = -1;
1371}
1372
1373static void add_pending_commit_list(struct rev_info *revs,
1374                                    struct commit_list *commit_list,
1375                                    unsigned int flags)
1376{
1377        while (commit_list) {
1378                struct object *object = &commit_list->item->object;
1379                object->flags |= flags;
1380                add_pending_object(revs, object, oid_to_hex(&object->oid));
1381                commit_list = commit_list->next;
1382        }
1383}
1384
1385static void prepare_show_merge(struct rev_info *revs)
1386{
1387        struct commit_list *bases;
1388        struct commit *head, *other;
1389        struct object_id oid;
1390        const char **prune = NULL;
1391        int i, prune_num = 1; /* counting terminating NULL */
1392
1393        if (get_oid("HEAD", &oid))
1394                die("--merge without HEAD?");
1395        head = lookup_commit_or_die(&oid, "HEAD");
1396        if (get_oid("MERGE_HEAD", &oid))
1397                die("--merge without MERGE_HEAD?");
1398        other = lookup_commit_or_die(&oid, "MERGE_HEAD");
1399        add_pending_object(revs, &head->object, "HEAD");
1400        add_pending_object(revs, &other->object, "MERGE_HEAD");
1401        bases = get_merge_bases(head, other);
1402        add_rev_cmdline_list(revs, bases, REV_CMD_MERGE_BASE, UNINTERESTING | BOTTOM);
1403        add_pending_commit_list(revs, bases, UNINTERESTING | BOTTOM);
1404        free_commit_list(bases);
1405        head->object.flags |= SYMMETRIC_LEFT;
1406
1407        if (!active_nr)
1408                read_cache();
1409        for (i = 0; i < active_nr; i++) {
1410                const struct cache_entry *ce = active_cache[i];
1411                if (!ce_stage(ce))
1412                        continue;
1413                if (ce_path_match(ce, &revs->prune_data, NULL)) {
1414                        prune_num++;
1415                        REALLOC_ARRAY(prune, prune_num);
1416                        prune[prune_num-2] = ce->name;
1417                        prune[prune_num-1] = NULL;
1418                }
1419                while ((i+1 < active_nr) &&
1420                       ce_same_name(ce, active_cache[i+1]))
1421                        i++;
1422        }
1423        clear_pathspec(&revs->prune_data);
1424        parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
1425                       PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
1426        revs->limited = 1;
1427}
1428
1429static int dotdot_missing(const char *arg, char *dotdot,
1430                          struct rev_info *revs, int symmetric)
1431{
1432        if (revs->ignore_missing)
1433                return 0;
1434        /* de-munge so we report the full argument */
1435        *dotdot = '.';
1436        die(symmetric
1437            ? "Invalid symmetric difference expression %s"
1438            : "Invalid revision range %s", arg);
1439}
1440
1441static int handle_dotdot_1(const char *arg, char *dotdot,
1442                           struct rev_info *revs, int flags,
1443                           int cant_be_filename,
1444                           struct object_context *a_oc,
1445                           struct object_context *b_oc)
1446{
1447        const char *a_name, *b_name;
1448        struct object_id a_oid, b_oid;
1449        struct object *a_obj, *b_obj;
1450        unsigned int a_flags, b_flags;
1451        int symmetric = 0;
1452        unsigned int flags_exclude = flags ^ (UNINTERESTING | BOTTOM);
1453        unsigned int oc_flags = GET_SHA1_COMMITTISH | GET_SHA1_RECORD_PATH;
1454
1455        a_name = arg;
1456        if (!*a_name)
1457                a_name = "HEAD";
1458
1459        b_name = dotdot + 2;
1460        if (*b_name == '.') {
1461                symmetric = 1;
1462                b_name++;
1463        }
1464        if (!*b_name)
1465                b_name = "HEAD";
1466
1467        if (get_sha1_with_context(a_name, oc_flags, a_oid.hash, a_oc) ||
1468            get_sha1_with_context(b_name, oc_flags, b_oid.hash, b_oc))
1469                return -1;
1470
1471        if (!cant_be_filename) {
1472                *dotdot = '.';
1473                verify_non_filename(revs->prefix, arg);
1474                *dotdot = '\0';
1475        }
1476
1477        a_obj = parse_object(&a_oid);
1478        b_obj = parse_object(&b_oid);
1479        if (!a_obj || !b_obj)
1480                return dotdot_missing(arg, dotdot, revs, symmetric);
1481
1482        if (!symmetric) {
1483                /* just A..B */
1484                b_flags = flags;
1485                a_flags = flags_exclude;
1486        } else {
1487                /* A...B -- find merge bases between the two */
1488                struct commit *a, *b;
1489                struct commit_list *exclude;
1490
1491                a = lookup_commit_reference(&a_obj->oid);
1492                b = lookup_commit_reference(&b_obj->oid);
1493                if (!a || !b)
1494                        return dotdot_missing(arg, dotdot, revs, symmetric);
1495
1496                exclude = get_merge_bases(a, b);
1497                add_rev_cmdline_list(revs, exclude, REV_CMD_MERGE_BASE,
1498                                     flags_exclude);
1499                add_pending_commit_list(revs, exclude, flags_exclude);
1500                free_commit_list(exclude);
1501
1502                b_flags = flags;
1503                a_flags = flags | SYMMETRIC_LEFT;
1504        }
1505
1506        a_obj->flags |= a_flags;
1507        b_obj->flags |= b_flags;
1508        add_rev_cmdline(revs, a_obj, a_name, REV_CMD_LEFT, a_flags);
1509        add_rev_cmdline(revs, b_obj, b_name, REV_CMD_RIGHT, b_flags);
1510        add_pending_object_with_path(revs, a_obj, a_name, a_oc->mode, a_oc->path);
1511        add_pending_object_with_path(revs, b_obj, b_name, b_oc->mode, b_oc->path);
1512        return 0;
1513}
1514
1515static int handle_dotdot(const char *arg,
1516                         struct rev_info *revs, int flags,
1517                         int cant_be_filename)
1518{
1519        struct object_context a_oc, b_oc;
1520        char *dotdot = strstr(arg, "..");
1521        int ret;
1522
1523        if (!dotdot)
1524                return -1;
1525
1526        memset(&a_oc, 0, sizeof(a_oc));
1527        memset(&b_oc, 0, sizeof(b_oc));
1528
1529        *dotdot = '\0';
1530        ret = handle_dotdot_1(arg, dotdot, revs, flags, cant_be_filename,
1531                              &a_oc, &b_oc);
1532        *dotdot = '.';
1533
1534        free(a_oc.path);
1535        free(b_oc.path);
1536
1537        return ret;
1538}
1539
1540int handle_revision_arg(const char *arg_, struct rev_info *revs, int flags, unsigned revarg_opt)
1541{
1542        struct object_context oc;
1543        char *mark;
1544        struct object *object;
1545        struct object_id oid;
1546        int local_flags;
1547        const char *arg = arg_;
1548        int cant_be_filename = revarg_opt & REVARG_CANNOT_BE_FILENAME;
1549        unsigned get_sha1_flags = GET_SHA1_RECORD_PATH;
1550
1551        flags = flags & UNINTERESTING ? flags | BOTTOM : flags & ~BOTTOM;
1552
1553        if (!cant_be_filename && !strcmp(arg, "..")) {
1554                /*
1555                 * Just ".."?  That is not a range but the
1556                 * pathspec for the parent directory.
1557                 */
1558                return -1;
1559        }
1560
1561        if (!handle_dotdot(arg, revs, flags, revarg_opt))
1562                return 0;
1563
1564        mark = strstr(arg, "^@");
1565        if (mark && !mark[2]) {
1566                *mark = 0;
1567                if (add_parents_only(revs, arg, flags, 0))
1568                        return 0;
1569                *mark = '^';
1570        }
1571        mark = strstr(arg, "^!");
1572        if (mark && !mark[2]) {
1573                *mark = 0;
1574                if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), 0))
1575                        *mark = '^';
1576        }
1577        mark = strstr(arg, "^-");
1578        if (mark) {
1579                int exclude_parent = 1;
1580
1581                if (mark[2]) {
1582                        char *end;
1583                        exclude_parent = strtoul(mark + 2, &end, 10);
1584                        if (*end != '\0' || !exclude_parent)
1585                                return -1;
1586                }
1587
1588                *mark = 0;
1589                if (!add_parents_only(revs, arg, flags ^ (UNINTERESTING | BOTTOM), exclude_parent))
1590                        *mark = '^';
1591        }
1592
1593        local_flags = 0;
1594        if (*arg == '^') {
1595                local_flags = UNINTERESTING | BOTTOM;
1596                arg++;
1597        }
1598
1599        if (revarg_opt & REVARG_COMMITTISH)
1600                get_sha1_flags |= GET_SHA1_COMMITTISH;
1601
1602        if (get_sha1_with_context(arg, get_sha1_flags, oid.hash, &oc))
1603                return revs->ignore_missing ? 0 : -1;
1604        if (!cant_be_filename)
1605                verify_non_filename(revs->prefix, arg);
1606        object = get_reference(revs, arg, &oid, flags ^ local_flags);
1607        add_rev_cmdline(revs, object, arg_, REV_CMD_REV, flags ^ local_flags);
1608        add_pending_object_with_path(revs, object, arg, oc.mode, oc.path);
1609        free(oc.path);
1610        return 0;
1611}
1612
1613struct cmdline_pathspec {
1614        int alloc;
1615        int nr;
1616        const char **path;
1617};
1618
1619static void append_prune_data(struct cmdline_pathspec *prune, const char **av)
1620{
1621        while (*av) {
1622                ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1623                prune->path[prune->nr++] = *(av++);
1624        }
1625}
1626
1627static void read_pathspec_from_stdin(struct rev_info *revs, struct strbuf *sb,
1628                                     struct cmdline_pathspec *prune)
1629{
1630        while (strbuf_getline(sb, stdin) != EOF) {
1631                ALLOC_GROW(prune->path, prune->nr + 1, prune->alloc);
1632                prune->path[prune->nr++] = xstrdup(sb->buf);
1633        }
1634}
1635
1636static void read_revisions_from_stdin(struct rev_info *revs,
1637                                      struct cmdline_pathspec *prune)
1638{
1639        struct strbuf sb;
1640        int seen_dashdash = 0;
1641        int save_warning;
1642
1643        save_warning = warn_on_object_refname_ambiguity;
1644        warn_on_object_refname_ambiguity = 0;
1645
1646        strbuf_init(&sb, 1000);
1647        while (strbuf_getline(&sb, stdin) != EOF) {
1648                int len = sb.len;
1649                if (!len)
1650                        break;
1651                if (sb.buf[0] == '-') {
1652                        if (len == 2 && sb.buf[1] == '-') {
1653                                seen_dashdash = 1;
1654                                break;
1655                        }
1656                        die("options not supported in --stdin mode");
1657                }
1658                if (handle_revision_arg(sb.buf, revs, 0,
1659                                        REVARG_CANNOT_BE_FILENAME))
1660                        die("bad revision '%s'", sb.buf);
1661        }
1662        if (seen_dashdash)
1663                read_pathspec_from_stdin(revs, &sb, prune);
1664
1665        strbuf_release(&sb);
1666        warn_on_object_refname_ambiguity = save_warning;
1667}
1668
1669static void add_grep(struct rev_info *revs, const char *ptn, enum grep_pat_token what)
1670{
1671        append_grep_pattern(&revs->grep_filter, ptn, "command line", 0, what);
1672}
1673
1674static void add_header_grep(struct rev_info *revs, enum grep_header_field field, const char *pattern)
1675{
1676        append_header_grep_pattern(&revs->grep_filter, field, pattern);
1677}
1678
1679static void add_message_grep(struct rev_info *revs, const char *pattern)
1680{
1681        add_grep(revs, pattern, GREP_PATTERN_BODY);
1682}
1683
1684static int handle_revision_opt(struct rev_info *revs, int argc, const char **argv,
1685                               int *unkc, const char **unkv)
1686{
1687        const char *arg = argv[0];
1688        const char *optarg;
1689        int argcount;
1690
1691        /* pseudo revision arguments */
1692        if (!strcmp(arg, "--all") || !strcmp(arg, "--branches") ||
1693            !strcmp(arg, "--tags") || !strcmp(arg, "--remotes") ||
1694            !strcmp(arg, "--reflog") || !strcmp(arg, "--not") ||
1695            !strcmp(arg, "--no-walk") || !strcmp(arg, "--do-walk") ||
1696            !strcmp(arg, "--bisect") || starts_with(arg, "--glob=") ||
1697            !strcmp(arg, "--indexed-objects") ||
1698            starts_with(arg, "--exclude=") ||
1699            starts_with(arg, "--branches=") || starts_with(arg, "--tags=") ||
1700            starts_with(arg, "--remotes=") || starts_with(arg, "--no-walk="))
1701        {
1702                unkv[(*unkc)++] = arg;
1703                return 1;
1704        }
1705
1706        if ((argcount = parse_long_opt("max-count", argv, &optarg))) {
1707                revs->max_count = atoi(optarg);
1708                revs->no_walk = 0;
1709                return argcount;
1710        } else if ((argcount = parse_long_opt("skip", argv, &optarg))) {
1711                revs->skip_count = atoi(optarg);
1712                return argcount;
1713        } else if ((*arg == '-') && isdigit(arg[1])) {
1714                /* accept -<digit>, like traditional "head" */
1715                if (strtol_i(arg + 1, 10, &revs->max_count) < 0 ||
1716                    revs->max_count < 0)
1717                        die("'%s': not a non-negative integer", arg + 1);
1718                revs->no_walk = 0;
1719        } else if (!strcmp(arg, "-n")) {
1720                if (argc <= 1)
1721                        return error("-n requires an argument");
1722                revs->max_count = atoi(argv[1]);
1723                revs->no_walk = 0;
1724                return 2;
1725        } else if (skip_prefix(arg, "-n", &optarg)) {
1726                revs->max_count = atoi(optarg);
1727                revs->no_walk = 0;
1728        } else if ((argcount = parse_long_opt("max-age", argv, &optarg))) {
1729                revs->max_age = atoi(optarg);
1730                return argcount;
1731        } else if ((argcount = parse_long_opt("since", argv, &optarg))) {
1732                revs->max_age = approxidate(optarg);
1733                return argcount;
1734        } else if ((argcount = parse_long_opt("after", argv, &optarg))) {
1735                revs->max_age = approxidate(optarg);
1736                return argcount;
1737        } else if ((argcount = parse_long_opt("min-age", argv, &optarg))) {
1738                revs->min_age = atoi(optarg);
1739                return argcount;
1740        } else if ((argcount = parse_long_opt("before", argv, &optarg))) {
1741                revs->min_age = approxidate(optarg);
1742                return argcount;
1743        } else if ((argcount = parse_long_opt("until", argv, &optarg))) {
1744                revs->min_age = approxidate(optarg);
1745                return argcount;
1746        } else if (!strcmp(arg, "--first-parent")) {
1747                revs->first_parent_only = 1;
1748        } else if (!strcmp(arg, "--ancestry-path")) {
1749                revs->ancestry_path = 1;
1750                revs->simplify_history = 0;
1751                revs->limited = 1;
1752        } else if (!strcmp(arg, "-g") || !strcmp(arg, "--walk-reflogs")) {
1753                init_reflog_walk(&revs->reflog_info);
1754        } else if (!strcmp(arg, "--default")) {
1755                if (argc <= 1)
1756                        return error("bad --default argument");
1757                revs->def = argv[1];
1758                return 2;
1759        } else if (!strcmp(arg, "--merge")) {
1760                revs->show_merge = 1;
1761        } else if (!strcmp(arg, "--topo-order")) {
1762                revs->sort_order = REV_SORT_IN_GRAPH_ORDER;
1763                revs->topo_order = 1;
1764        } else if (!strcmp(arg, "--simplify-merges")) {
1765                revs->simplify_merges = 1;
1766                revs->topo_order = 1;
1767                revs->rewrite_parents = 1;
1768                revs->simplify_history = 0;
1769                revs->limited = 1;
1770        } else if (!strcmp(arg, "--simplify-by-decoration")) {
1771                revs->simplify_merges = 1;
1772                revs->topo_order = 1;
1773                revs->rewrite_parents = 1;
1774                revs->simplify_history = 0;
1775                revs->simplify_by_decoration = 1;
1776                revs->limited = 1;
1777                revs->prune = 1;
1778                load_ref_decorations(DECORATE_SHORT_REFS);
1779        } else if (!strcmp(arg, "--date-order")) {
1780                revs->sort_order = REV_SORT_BY_COMMIT_DATE;
1781                revs->topo_order = 1;
1782        } else if (!strcmp(arg, "--author-date-order")) {
1783                revs->sort_order = REV_SORT_BY_AUTHOR_DATE;
1784                revs->topo_order = 1;
1785        } else if (!strcmp(arg, "--early-output")) {
1786                revs->early_output = 100;
1787                revs->topo_order = 1;
1788        } else if (skip_prefix(arg, "--early-output=", &optarg)) {
1789                if (strtoul_ui(optarg, 10, &revs->early_output) < 0)
1790                        die("'%s': not a non-negative integer", optarg);
1791                revs->topo_order = 1;
1792        } else if (!strcmp(arg, "--parents")) {
1793                revs->rewrite_parents = 1;
1794                revs->print_parents = 1;
1795        } else if (!strcmp(arg, "--dense")) {
1796                revs->dense = 1;
1797        } else if (!strcmp(arg, "--sparse")) {
1798                revs->dense = 0;
1799        } else if (!strcmp(arg, "--show-all")) {
1800                revs->show_all = 1;
1801        } else if (!strcmp(arg, "--remove-empty")) {
1802                revs->remove_empty_trees = 1;
1803        } else if (!strcmp(arg, "--merges")) {
1804                revs->min_parents = 2;
1805        } else if (!strcmp(arg, "--no-merges")) {
1806                revs->max_parents = 1;
1807        } else if (skip_prefix(arg, "--min-parents=", &optarg)) {
1808                revs->min_parents = atoi(optarg);
1809        } else if (!strcmp(arg, "--no-min-parents")) {
1810                revs->min_parents = 0;
1811        } else if (skip_prefix(arg, "--max-parents=", &optarg)) {
1812                revs->max_parents = atoi(optarg);
1813        } else if (!strcmp(arg, "--no-max-parents")) {
1814                revs->max_parents = -1;
1815        } else if (!strcmp(arg, "--boundary")) {
1816                revs->boundary = 1;
1817        } else if (!strcmp(arg, "--left-right")) {
1818                revs->left_right = 1;
1819        } else if (!strcmp(arg, "--left-only")) {
1820                if (revs->right_only)
1821                        die("--left-only is incompatible with --right-only"
1822                            " or --cherry");
1823                revs->left_only = 1;
1824        } else if (!strcmp(arg, "--right-only")) {
1825                if (revs->left_only)
1826                        die("--right-only is incompatible with --left-only");
1827                revs->right_only = 1;
1828        } else if (!strcmp(arg, "--cherry")) {
1829                if (revs->left_only)
1830                        die("--cherry is incompatible with --left-only");
1831                revs->cherry_mark = 1;
1832                revs->right_only = 1;
1833                revs->max_parents = 1;
1834                revs->limited = 1;
1835        } else if (!strcmp(arg, "--count")) {
1836                revs->count = 1;
1837        } else if (!strcmp(arg, "--cherry-mark")) {
1838                if (revs->cherry_pick)
1839                        die("--cherry-mark is incompatible with --cherry-pick");
1840                revs->cherry_mark = 1;
1841                revs->limited = 1; /* needs limit_list() */
1842        } else if (!strcmp(arg, "--cherry-pick")) {
1843                if (revs->cherry_mark)
1844                        die("--cherry-pick is incompatible with --cherry-mark");
1845                revs->cherry_pick = 1;
1846                revs->limited = 1;
1847        } else if (!strcmp(arg, "--objects")) {
1848                revs->tag_objects = 1;
1849                revs->tree_objects = 1;
1850                revs->blob_objects = 1;
1851        } else if (!strcmp(arg, "--objects-edge")) {
1852                revs->tag_objects = 1;
1853                revs->tree_objects = 1;
1854                revs->blob_objects = 1;
1855                revs->edge_hint = 1;
1856        } else if (!strcmp(arg, "--objects-edge-aggressive")) {
1857                revs->tag_objects = 1;
1858                revs->tree_objects = 1;
1859                revs->blob_objects = 1;
1860                revs->edge_hint = 1;
1861                revs->edge_hint_aggressive = 1;
1862        } else if (!strcmp(arg, "--verify-objects")) {
1863                revs->tag_objects = 1;
1864                revs->tree_objects = 1;
1865                revs->blob_objects = 1;
1866                revs->verify_objects = 1;
1867        } else if (!strcmp(arg, "--unpacked")) {
1868                revs->unpacked = 1;
1869        } else if (starts_with(arg, "--unpacked=")) {
1870                die("--unpacked=<packfile> no longer supported.");
1871        } else if (!strcmp(arg, "-r")) {
1872                revs->diff = 1;
1873                DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1874        } else if (!strcmp(arg, "-t")) {
1875                revs->diff = 1;
1876                DIFF_OPT_SET(&revs->diffopt, RECURSIVE);
1877                DIFF_OPT_SET(&revs->diffopt, TREE_IN_RECURSIVE);
1878        } else if (!strcmp(arg, "-m")) {
1879                revs->ignore_merges = 0;
1880        } else if (!strcmp(arg, "-c")) {
1881                revs->diff = 1;
1882                revs->dense_combined_merges = 0;
1883                revs->combine_merges = 1;
1884        } else if (!strcmp(arg, "--cc")) {
1885                revs->diff = 1;
1886                revs->dense_combined_merges = 1;
1887                revs->combine_merges = 1;
1888        } else if (!strcmp(arg, "-v")) {
1889                revs->verbose_header = 1;
1890        } else if (!strcmp(arg, "--pretty")) {
1891                revs->verbose_header = 1;
1892                revs->pretty_given = 1;
1893                get_commit_format(NULL, revs);
1894        } else if (skip_prefix(arg, "--pretty=", &optarg) ||
1895                   skip_prefix(arg, "--format=", &optarg)) {
1896                /*
1897                 * Detached form ("--pretty X" as opposed to "--pretty=X")
1898                 * not allowed, since the argument is optional.
1899                 */
1900                revs->verbose_header = 1;
1901                revs->pretty_given = 1;
1902                get_commit_format(optarg, revs);
1903        } else if (!strcmp(arg, "--expand-tabs")) {
1904                revs->expand_tabs_in_log = 8;
1905        } else if (!strcmp(arg, "--no-expand-tabs")) {
1906                revs->expand_tabs_in_log = 0;
1907        } else if (skip_prefix(arg, "--expand-tabs=", &arg)) {
1908                int val;
1909                if (strtol_i(arg, 10, &val) < 0 || val < 0)
1910                        die("'%s': not a non-negative integer", arg);
1911                revs->expand_tabs_in_log = val;
1912        } else if (!strcmp(arg, "--show-notes") || !strcmp(arg, "--notes")) {
1913                revs->show_notes = 1;
1914                revs->show_notes_given = 1;
1915                revs->notes_opt.use_default_notes = 1;
1916        } else if (!strcmp(arg, "--show-signature")) {
1917                revs->show_signature = 1;
1918        } else if (!strcmp(arg, "--no-show-signature")) {
1919                revs->show_signature = 0;
1920        } else if (!strcmp(arg, "--show-linear-break")) {
1921                revs->break_bar = "                    ..........";
1922                revs->track_linear = 1;
1923                revs->track_first_time = 1;
1924        } else if (skip_prefix(arg, "--show-linear-break=", &optarg)) {
1925                revs->break_bar = xstrdup(optarg);
1926                revs->track_linear = 1;
1927                revs->track_first_time = 1;
1928        } else if (skip_prefix(arg, "--show-notes=", &optarg) ||
1929                   skip_prefix(arg, "--notes=", &optarg)) {
1930                struct strbuf buf = STRBUF_INIT;
1931                revs->show_notes = 1;
1932                revs->show_notes_given = 1;
1933                if (starts_with(arg, "--show-notes=") &&
1934                    revs->notes_opt.use_default_notes < 0)
1935                        revs->notes_opt.use_default_notes = 1;
1936                strbuf_addstr(&buf, optarg);
1937                expand_notes_ref(&buf);
1938                string_list_append(&revs->notes_opt.extra_notes_refs,
1939                                   strbuf_detach(&buf, NULL));
1940        } else if (!strcmp(arg, "--no-notes")) {
1941                revs->show_notes = 0;
1942                revs->show_notes_given = 1;
1943                revs->notes_opt.use_default_notes = -1;
1944                /* we have been strdup'ing ourselves, so trick
1945                 * string_list into free()ing strings */
1946                revs->notes_opt.extra_notes_refs.strdup_strings = 1;
1947                string_list_clear(&revs->notes_opt.extra_notes_refs, 0);
1948                revs->notes_opt.extra_notes_refs.strdup_strings = 0;
1949        } else if (!strcmp(arg, "--standard-notes")) {
1950                revs->show_notes_given = 1;
1951                revs->notes_opt.use_default_notes = 1;
1952        } else if (!strcmp(arg, "--no-standard-notes")) {
1953                revs->notes_opt.use_default_notes = 0;
1954        } else if (!strcmp(arg, "--oneline")) {
1955                revs->verbose_header = 1;
1956                get_commit_format("oneline", revs);
1957                revs->pretty_given = 1;
1958                revs->abbrev_commit = 1;
1959        } else if (!strcmp(arg, "--graph")) {
1960                revs->topo_order = 1;
1961                revs->rewrite_parents = 1;
1962                revs->graph = graph_init(revs);
1963        } else if (!strcmp(arg, "--root")) {
1964                revs->show_root_diff = 1;
1965        } else if (!strcmp(arg, "--no-commit-id")) {
1966                revs->no_commit_id = 1;
1967        } else if (!strcmp(arg, "--always")) {
1968                revs->always_show_header = 1;
1969        } else if (!strcmp(arg, "--no-abbrev")) {
1970                revs->abbrev = 0;
1971        } else if (!strcmp(arg, "--abbrev")) {
1972                revs->abbrev = DEFAULT_ABBREV;
1973        } else if (skip_prefix(arg, "--abbrev=", &optarg)) {
1974                revs->abbrev = strtoul(optarg, NULL, 10);
1975                if (revs->abbrev < MINIMUM_ABBREV)
1976                        revs->abbrev = MINIMUM_ABBREV;
1977                else if (revs->abbrev > 40)
1978                        revs->abbrev = 40;
1979        } else if (!strcmp(arg, "--abbrev-commit")) {
1980                revs->abbrev_commit = 1;
1981                revs->abbrev_commit_given = 1;
1982        } else if (!strcmp(arg, "--no-abbrev-commit")) {
1983                revs->abbrev_commit = 0;
1984        } else if (!strcmp(arg, "--full-diff")) {
1985                revs->diff = 1;
1986                revs->full_diff = 1;
1987        } else if (!strcmp(arg, "--full-history")) {
1988                revs->simplify_history = 0;
1989        } else if (!strcmp(arg, "--relative-date")) {
1990                revs->date_mode.type = DATE_RELATIVE;
1991                revs->date_mode_explicit = 1;
1992        } else if ((argcount = parse_long_opt("date", argv, &optarg))) {
1993                parse_date_format(optarg, &revs->date_mode);
1994                revs->date_mode_explicit = 1;
1995                return argcount;
1996        } else if (!strcmp(arg, "--log-size")) {
1997                revs->show_log_size = 1;
1998        }
1999        /*
2000         * Grepping the commit log
2001         */
2002        else if ((argcount = parse_long_opt("author", argv, &optarg))) {
2003                add_header_grep(revs, GREP_HEADER_AUTHOR, optarg);
2004                return argcount;
2005        } else if ((argcount = parse_long_opt("committer", argv, &optarg))) {
2006                add_header_grep(revs, GREP_HEADER_COMMITTER, optarg);
2007                return argcount;
2008        } else if ((argcount = parse_long_opt("grep-reflog", argv, &optarg))) {
2009                add_header_grep(revs, GREP_HEADER_REFLOG, optarg);
2010                return argcount;
2011        } else if ((argcount = parse_long_opt("grep", argv, &optarg))) {
2012                add_message_grep(revs, optarg);
2013                return argcount;
2014        } else if (!strcmp(arg, "--grep-debug")) {
2015                revs->grep_filter.debug = 1;
2016        } else if (!strcmp(arg, "--basic-regexp")) {
2017                revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_BRE;
2018        } else if (!strcmp(arg, "--extended-regexp") || !strcmp(arg, "-E")) {
2019                revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
2020        } else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
2021                revs->grep_filter.ignore_case = 1;
2022                DIFF_OPT_SET(&revs->diffopt, PICKAXE_IGNORE_CASE);
2023        } else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
2024                revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
2025        } else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {
2026                revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_PCRE;
2027        } else if (!strcmp(arg, "--all-match")) {
2028                revs->grep_filter.all_match = 1;
2029        } else if (!strcmp(arg, "--invert-grep")) {
2030                revs->invert_grep = 1;
2031        } else if ((argcount = parse_long_opt("encoding", argv, &optarg))) {
2032                if (strcmp(optarg, "none"))
2033                        git_log_output_encoding = xstrdup(optarg);
2034                else
2035                        git_log_output_encoding = "";
2036                return argcount;
2037        } else if (!strcmp(arg, "--reverse")) {
2038                revs->reverse ^= 1;
2039        } else if (!strcmp(arg, "--children")) {
2040                revs->children.name = "children";
2041                revs->limited = 1;
2042        } else if (!strcmp(arg, "--ignore-missing")) {
2043                revs->ignore_missing = 1;
2044        } else {
2045                int opts = diff_opt_parse(&revs->diffopt, argv, argc, revs->prefix);
2046                if (!opts)
2047                        unkv[(*unkc)++] = arg;
2048                return opts;
2049        }
2050        if (revs->graph && revs->track_linear)
2051                die("--show-linear-break and --graph are incompatible");
2052
2053        return 1;
2054}
2055
2056void parse_revision_opt(struct rev_info *revs, struct parse_opt_ctx_t *ctx,
2057                        const struct option *options,
2058                        const char * const usagestr[])
2059{
2060        int n = handle_revision_opt(revs, ctx->argc, ctx->argv,
2061                                    &ctx->cpidx, ctx->out);
2062        if (n <= 0) {
2063                error("unknown option `%s'", ctx->argv[0]);
2064                usage_with_options(usagestr, options);
2065        }
2066        ctx->argv += n;
2067        ctx->argc -= n;
2068}
2069
2070static int for_each_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data, const char *term) {
2071        struct strbuf bisect_refs = STRBUF_INIT;
2072        int status;
2073        strbuf_addf(&bisect_refs, "refs/bisect/%s", term);
2074        status = for_each_fullref_in_submodule(submodule, bisect_refs.buf, fn, cb_data, 0);
2075        strbuf_release(&bisect_refs);
2076        return status;
2077}
2078
2079static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2080{
2081        return for_each_bisect_ref(submodule, fn, cb_data, term_bad);
2082}
2083
2084static int for_each_good_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data)
2085{
2086        return for_each_bisect_ref(submodule, fn, cb_data, term_good);
2087}
2088
2089static int handle_revision_pseudo_opt(const char *submodule,
2090                                struct rev_info *revs,
2091                                int argc, const char **argv, int *flags)
2092{
2093        const char *arg = argv[0];
2094        const char *optarg;
2095        int argcount;
2096
2097        /*
2098         * NOTE!
2099         *
2100         * Commands like "git shortlog" will not accept the options below
2101         * unless parse_revision_opt queues them (as opposed to erroring
2102         * out).
2103         *
2104         * When implementing your new pseudo-option, remember to
2105         * register it in the list at the top of handle_revision_opt.
2106         */
2107        if (!strcmp(arg, "--all")) {
2108                handle_refs(submodule, revs, *flags, for_each_ref_submodule);
2109                handle_refs(submodule, revs, *flags, head_ref_submodule);
2110                clear_ref_exclusion(&revs->ref_excludes);
2111        } else if (!strcmp(arg, "--branches")) {
2112                handle_refs(submodule, revs, *flags, for_each_branch_ref_submodule);
2113                clear_ref_exclusion(&revs->ref_excludes);
2114        } else if (!strcmp(arg, "--bisect")) {
2115                read_bisect_terms(&term_bad, &term_good);
2116                handle_refs(submodule, revs, *flags, for_each_bad_bisect_ref);
2117                handle_refs(submodule, revs, *flags ^ (UNINTERESTING | BOTTOM), for_each_good_bisect_ref);
2118                revs->bisect = 1;
2119        } else if (!strcmp(arg, "--tags")) {
2120                handle_refs(submodule, revs, *flags, for_each_tag_ref_submodule);
2121                clear_ref_exclusion(&revs->ref_excludes);
2122        } else if (!strcmp(arg, "--remotes")) {
2123                handle_refs(submodule, revs, *flags, for_each_remote_ref_submodule);
2124                clear_ref_exclusion(&revs->ref_excludes);
2125        } else if ((argcount = parse_long_opt("glob", argv, &optarg))) {
2126                struct all_refs_cb cb;
2127                init_all_refs_cb(&cb, revs, *flags);
2128                for_each_glob_ref(handle_one_ref, optarg, &cb);
2129                clear_ref_exclusion(&revs->ref_excludes);
2130                return argcount;
2131        } else if ((argcount = parse_long_opt("exclude", argv, &optarg))) {
2132                add_ref_exclusion(&revs->ref_excludes, optarg);
2133                return argcount;
2134        } else if (skip_prefix(arg, "--branches=", &optarg)) {
2135                struct all_refs_cb cb;
2136                init_all_refs_cb(&cb, revs, *flags);
2137                for_each_glob_ref_in(handle_one_ref, optarg, "refs/heads/", &cb);
2138                clear_ref_exclusion(&revs->ref_excludes);
2139        } else if (skip_prefix(arg, "--tags=", &optarg)) {
2140                struct all_refs_cb cb;
2141                init_all_refs_cb(&cb, revs, *flags);
2142                for_each_glob_ref_in(handle_one_ref, optarg, "refs/tags/", &cb);
2143                clear_ref_exclusion(&revs->ref_excludes);
2144        } else if (skip_prefix(arg, "--remotes=", &optarg)) {
2145                struct all_refs_cb cb;
2146                init_all_refs_cb(&cb, revs, *flags);
2147                for_each_glob_ref_in(handle_one_ref, optarg, "refs/remotes/", &cb);
2148                clear_ref_exclusion(&revs->ref_excludes);
2149        } else if (!strcmp(arg, "--reflog")) {
2150                add_reflogs_to_pending(revs, *flags);
2151        } else if (!strcmp(arg, "--indexed-objects")) {
2152                add_index_objects_to_pending(revs, *flags);
2153        } else if (!strcmp(arg, "--not")) {
2154                *flags ^= UNINTERESTING | BOTTOM;
2155        } else if (!strcmp(arg, "--no-walk")) {
2156                revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2157        } else if (skip_prefix(arg, "--no-walk=", &optarg)) {
2158                /*
2159                 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2160                 * not allowed, since the argument is optional.
2161                 */
2162                if (!strcmp(optarg, "sorted"))
2163                        revs->no_walk = REVISION_WALK_NO_WALK_SORTED;
2164                else if (!strcmp(optarg, "unsorted"))
2165                        revs->no_walk = REVISION_WALK_NO_WALK_UNSORTED;
2166                else
2167                        return error("invalid argument to --no-walk");
2168        } else if (!strcmp(arg, "--do-walk")) {
2169                revs->no_walk = 0;
2170        } else {
2171                return 0;
2172        }
2173
2174        return 1;
2175}
2176
2177static void NORETURN diagnose_missing_default(const char *def)
2178{
2179        unsigned char sha1[20];
2180        int flags;
2181        const char *refname;
2182
2183        refname = resolve_ref_unsafe(def, 0, sha1, &flags);
2184        if (!refname || !(flags & REF_ISSYMREF) || (flags & REF_ISBROKEN))
2185                die(_("your current branch appears to be broken"));
2186
2187        skip_prefix(refname, "refs/heads/", &refname);
2188        die(_("your current branch '%s' does not have any commits yet"),
2189            refname);
2190}
2191
2192/*
2193 * Parse revision information, filling in the "rev_info" structure,
2194 * and removing the used arguments from the argument list.
2195 *
2196 * Returns the number of arguments left that weren't recognized
2197 * (which are also moved to the head of the argument list)
2198 */
2199int setup_revisions(int argc, const char **argv, struct rev_info *revs, struct setup_revision_opt *opt)
2200{
2201        int i, flags, left, seen_dashdash, read_from_stdin, got_rev_arg = 0, revarg_opt;
2202        struct cmdline_pathspec prune_data;
2203        const char *submodule = NULL;
2204
2205        memset(&prune_data, 0, sizeof(prune_data));
2206        if (opt)
2207                submodule = opt->submodule;
2208
2209        /* First, search for "--" */
2210        if (opt && opt->assume_dashdash) {
2211                seen_dashdash = 1;
2212        } else {
2213                seen_dashdash = 0;
2214                for (i = 1; i < argc; i++) {
2215                        const char *arg = argv[i];
2216                        if (strcmp(arg, "--"))
2217                                continue;
2218                        argv[i] = NULL;
2219                        argc = i;
2220                        if (argv[i + 1])
2221                                append_prune_data(&prune_data, argv + i + 1);
2222                        seen_dashdash = 1;
2223                        break;
2224                }
2225        }
2226
2227        /* Second, deal with arguments and options */
2228        flags = 0;
2229        revarg_opt = opt ? opt->revarg_opt : 0;
2230        if (seen_dashdash)
2231                revarg_opt |= REVARG_CANNOT_BE_FILENAME;
2232        read_from_stdin = 0;
2233        for (left = i = 1; i < argc; i++) {
2234                const char *arg = argv[i];
2235                if (*arg == '-') {
2236                        int opts;
2237
2238                        opts = handle_revision_pseudo_opt(submodule,
2239                                                revs, argc - i, argv + i,
2240                                                &flags);
2241                        if (opts > 0) {
2242                                i += opts - 1;
2243                                continue;
2244                        }
2245
2246                        if (!strcmp(arg, "--stdin")) {
2247                                if (revs->disable_stdin) {
2248                                        argv[left++] = arg;
2249                                        continue;
2250                                }
2251                                if (read_from_stdin++)
2252                                        die("--stdin given twice?");
2253                                read_revisions_from_stdin(revs, &prune_data);
2254                                continue;
2255                        }
2256
2257                        opts = handle_revision_opt(revs, argc - i, argv + i, &left, argv);
2258                        if (opts > 0) {
2259                                i += opts - 1;
2260                                continue;
2261                        }
2262                        if (opts < 0)
2263                                exit(128);
2264                        continue;
2265                }
2266
2267
2268                if (handle_revision_arg(arg, revs, flags, revarg_opt)) {
2269                        int j;
2270                        if (seen_dashdash || *arg == '^')
2271                                die("bad revision '%s'", arg);
2272
2273                        /* If we didn't have a "--":
2274                         * (1) all filenames must exist;
2275                         * (2) all rev-args must not be interpretable
2276                         *     as a valid filename.
2277                         * but the latter we have checked in the main loop.
2278                         */
2279                        for (j = i; j < argc; j++)
2280                                verify_filename(revs->prefix, argv[j], j == i);
2281
2282                        append_prune_data(&prune_data, argv + i);
2283                        break;
2284                }
2285                else
2286                        got_rev_arg = 1;
2287        }
2288
2289        if (prune_data.nr) {
2290                /*
2291                 * If we need to introduce the magic "a lone ':' means no
2292                 * pathspec whatsoever", here is the place to do so.
2293                 *
2294                 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2295                 *      prune_data.nr = 0;
2296                 *      prune_data.alloc = 0;
2297                 *      free(prune_data.path);
2298                 *      prune_data.path = NULL;
2299                 * } else {
2300                 *      terminate prune_data.alloc with NULL and
2301                 *      call init_pathspec() to set revs->prune_data here.
2302                 * }
2303                 */
2304                ALLOC_GROW(prune_data.path, prune_data.nr + 1, prune_data.alloc);
2305                prune_data.path[prune_data.nr++] = NULL;
2306                parse_pathspec(&revs->prune_data, 0, 0,
2307                               revs->prefix, prune_data.path);
2308        }
2309
2310        if (revs->def == NULL)
2311                revs->def = opt ? opt->def : NULL;
2312        if (opt && opt->tweak)
2313                opt->tweak(revs, opt);
2314        if (revs->show_merge)
2315                prepare_show_merge(revs);
2316        if (revs->def && !revs->pending.nr && !got_rev_arg) {
2317                struct object_id oid;
2318                struct object *object;
2319                struct object_context oc;
2320                if (get_sha1_with_context(revs->def, 0, oid.hash, &oc))
2321                        diagnose_missing_default(revs->def);
2322                object = get_reference(revs, revs->def, &oid, 0);
2323                add_pending_object_with_mode(revs, object, revs->def, oc.mode);
2324        }
2325
2326        /* Did the user ask for any diff output? Run the diff! */
2327        if (revs->diffopt.output_format & ~DIFF_FORMAT_NO_OUTPUT)
2328                revs->diff = 1;
2329
2330        /* Pickaxe, diff-filter and rename following need diffs */
2331        if (revs->diffopt.pickaxe ||
2332            revs->diffopt.filter ||
2333            DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2334                revs->diff = 1;
2335
2336        if (revs->topo_order)
2337                revs->limited = 1;
2338
2339        if (revs->prune_data.nr) {
2340                copy_pathspec(&revs->pruning.pathspec, &revs->prune_data);
2341                /* Can't prune commits with rename following: the paths change.. */
2342                if (!DIFF_OPT_TST(&revs->diffopt, FOLLOW_RENAMES))
2343                        revs->prune = 1;
2344                if (!revs->full_diff)
2345                        copy_pathspec(&revs->diffopt.pathspec,
2346                                      &revs->prune_data);
2347        }
2348        if (revs->combine_merges)
2349                revs->ignore_merges = 0;
2350        revs->diffopt.abbrev = revs->abbrev;
2351
2352        if (revs->line_level_traverse) {
2353                revs->limited = 1;
2354                revs->topo_order = 1;
2355        }
2356
2357        diff_setup_done(&revs->diffopt);
2358
2359        grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED,
2360                                 &revs->grep_filter);
2361        compile_grep_patterns(&revs->grep_filter);
2362
2363        if (revs->reverse && revs->reflog_info)
2364                die("cannot combine --reverse with --walk-reflogs");
2365        if (revs->reflog_info && revs->limited)
2366                die("cannot combine --walk-reflogs with history-limiting options");
2367        if (revs->rewrite_parents && revs->children.name)
2368                die("cannot combine --parents and --children");
2369
2370        /*
2371         * Limitations on the graph functionality
2372         */
2373        if (revs->reverse && revs->graph)
2374                die("cannot combine --reverse with --graph");
2375
2376        if (revs->reflog_info && revs->graph)
2377                die("cannot combine --walk-reflogs with --graph");
2378        if (revs->no_walk && revs->graph)
2379                die("cannot combine --no-walk with --graph");
2380        if (!revs->reflog_info && revs->grep_filter.use_reflog_filter)
2381                die("cannot use --grep-reflog without --walk-reflogs");
2382
2383        if (revs->first_parent_only && revs->bisect)
2384                die(_("--first-parent is incompatible with --bisect"));
2385
2386        if (revs->expand_tabs_in_log < 0)
2387                revs->expand_tabs_in_log = revs->expand_tabs_in_log_default;
2388
2389        return left;
2390}
2391
2392static void add_child(struct rev_info *revs, struct commit *parent, struct commit *child)
2393{
2394        struct commit_list *l = xcalloc(1, sizeof(*l));
2395
2396        l->item = child;
2397        l->next = add_decoration(&revs->children, &parent->object, l);
2398}
2399
2400static int remove_duplicate_parents(struct rev_info *revs, struct commit *commit)
2401{
2402        struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2403        struct commit_list **pp, *p;
2404        int surviving_parents;
2405
2406        /* Examine existing parents while marking ones we have seen... */
2407        pp = &commit->parents;
2408        surviving_parents = 0;
2409        while ((p = *pp) != NULL) {
2410                struct commit *parent = p->item;
2411                if (parent->object.flags & TMP_MARK) {
2412                        *pp = p->next;
2413                        if (ts)
2414                                compact_treesame(revs, commit, surviving_parents);
2415                        continue;
2416                }
2417                parent->object.flags |= TMP_MARK;
2418                surviving_parents++;
2419                pp = &p->next;
2420        }
2421        /* clear the temporary mark */
2422        for (p = commit->parents; p; p = p->next) {
2423                p->item->object.flags &= ~TMP_MARK;
2424        }
2425        /* no update_treesame() - removing duplicates can't affect TREESAME */
2426        return surviving_parents;
2427}
2428
2429struct merge_simplify_state {
2430        struct commit *simplified;
2431};
2432
2433static struct merge_simplify_state *locate_simplify_state(struct rev_info *revs, struct commit *commit)
2434{
2435        struct merge_simplify_state *st;
2436
2437        st = lookup_decoration(&revs->merge_simplification, &commit->object);
2438        if (!st) {
2439                st = xcalloc(1, sizeof(*st));
2440                add_decoration(&revs->merge_simplification, &commit->object, st);
2441        }
2442        return st;
2443}
2444
2445static int mark_redundant_parents(struct rev_info *revs, struct commit *commit)
2446{
2447        struct commit_list *h = reduce_heads(commit->parents);
2448        int i = 0, marked = 0;
2449        struct commit_list *po, *pn;
2450
2451        /* Want these for sanity-checking only */
2452        int orig_cnt = commit_list_count(commit->parents);
2453        int cnt = commit_list_count(h);
2454
2455        /*
2456         * Not ready to remove items yet, just mark them for now, based
2457         * on the output of reduce_heads(). reduce_heads outputs the reduced
2458         * set in its original order, so this isn't too hard.
2459         */
2460        po = commit->parents;
2461        pn = h;
2462        while (po) {
2463                if (pn && po->item == pn->item) {
2464                        pn = pn->next;
2465                        i++;
2466                } else {
2467                        po->item->object.flags |= TMP_MARK;
2468                        marked++;
2469                }
2470                po=po->next;
2471        }
2472
2473        if (i != cnt || cnt+marked != orig_cnt)
2474                die("mark_redundant_parents %d %d %d %d", orig_cnt, cnt, i, marked);
2475
2476        free_commit_list(h);
2477
2478        return marked;
2479}
2480
2481static int mark_treesame_root_parents(struct rev_info *revs, struct commit *commit)
2482{
2483        struct commit_list *p;
2484        int marked = 0;
2485
2486        for (p = commit->parents; p; p = p->next) {
2487                struct commit *parent = p->item;
2488                if (!parent->parents && (parent->object.flags & TREESAME)) {
2489                        parent->object.flags |= TMP_MARK;
2490                        marked++;
2491                }
2492        }
2493
2494        return marked;
2495}
2496
2497/*
2498 * Awkward naming - this means one parent we are TREESAME to.
2499 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2500 * empty tree). Better name suggestions?
2501 */
2502static int leave_one_treesame_to_parent(struct rev_info *revs, struct commit *commit)
2503{
2504        struct treesame_state *ts = lookup_decoration(&revs->treesame, &commit->object);
2505        struct commit *unmarked = NULL, *marked = NULL;
2506        struct commit_list *p;
2507        unsigned n;
2508
2509        for (p = commit->parents, n = 0; p; p = p->next, n++) {
2510                if (ts->treesame[n]) {
2511                        if (p->item->object.flags & TMP_MARK) {
2512                                if (!marked)
2513                                        marked = p->item;
2514                        } else {
2515                                if (!unmarked) {
2516                                        unmarked = p->item;
2517                                        break;
2518                                }
2519                        }
2520                }
2521        }
2522
2523        /*
2524         * If we are TREESAME to a marked-for-deletion parent, but not to any
2525         * unmarked parents, unmark the first TREESAME parent. This is the
2526         * parent that the default simplify_history==1 scan would have followed,
2527         * and it doesn't make sense to omit that path when asking for a
2528         * simplified full history. Retaining it improves the chances of
2529         * understanding odd missed merges that took an old version of a file.
2530         *
2531         * Example:
2532         *
2533         *   I--------*X       A modified the file, but mainline merge X used
2534         *    \       /        "-s ours", so took the version from I. X is
2535         *     `-*A--'         TREESAME to I and !TREESAME to A.
2536         *
2537         * Default log from X would produce "I". Without this check,
2538         * --full-history --simplify-merges would produce "I-A-X", showing
2539         * the merge commit X and that it changed A, but not making clear that
2540         * it had just taken the I version. With this check, the topology above
2541         * is retained.
2542         *
2543         * Note that it is possible that the simplification chooses a different
2544         * TREESAME parent from the default, in which case this test doesn't
2545         * activate, and we _do_ drop the default parent. Example:
2546         *
2547         *   I------X         A modified the file, but it was reverted in B,
2548         *    \    /          meaning mainline merge X is TREESAME to both
2549         *    *A-*B           parents.
2550         *
2551         * Default log would produce "I" by following the first parent;
2552         * --full-history --simplify-merges will produce "I-A-B". But this is a
2553         * reasonable result - it presents a logical full history leading from
2554         * I to X, and X is not an important merge.
2555         */
2556        if (!unmarked && marked) {
2557                marked->object.flags &= ~TMP_MARK;
2558                return 1;
2559        }
2560
2561        return 0;
2562}
2563
2564static int remove_marked_parents(struct rev_info *revs, struct commit *commit)
2565{
2566        struct commit_list **pp, *p;
2567        int nth_parent, removed = 0;
2568
2569        pp = &commit->parents;
2570        nth_parent = 0;
2571        while ((p = *pp) != NULL) {
2572                struct commit *parent = p->item;
2573                if (parent->object.flags & TMP_MARK) {
2574                        parent->object.flags &= ~TMP_MARK;
2575                        *pp = p->next;
2576                        free(p);
2577                        removed++;
2578                        compact_treesame(revs, commit, nth_parent);
2579                        continue;
2580                }
2581                pp = &p->next;
2582                nth_parent++;
2583        }
2584
2585        /* Removing parents can only increase TREESAMEness */
2586        if (removed && !(commit->object.flags & TREESAME))
2587                update_treesame(revs, commit);
2588
2589        return nth_parent;
2590}
2591
2592static struct commit_list **simplify_one(struct rev_info *revs, struct commit *commit, struct commit_list **tail)
2593{
2594        struct commit_list *p;
2595        struct commit *parent;
2596        struct merge_simplify_state *st, *pst;
2597        int cnt;
2598
2599        st = locate_simplify_state(revs, commit);
2600
2601        /*
2602         * Have we handled this one?
2603         */
2604        if (st->simplified)
2605                return tail;
2606
2607        /*
2608         * An UNINTERESTING commit simplifies to itself, so does a
2609         * root commit.  We do not rewrite parents of such commit
2610         * anyway.
2611         */
2612        if ((commit->object.flags & UNINTERESTING) || !commit->parents) {
2613                st->simplified = commit;
2614                return tail;
2615        }
2616
2617        /*
2618         * Do we know what commit all of our parents that matter
2619         * should be rewritten to?  Otherwise we are not ready to
2620         * rewrite this one yet.
2621         */
2622        for (cnt = 0, p = commit->parents; p; p = p->next) {
2623                pst = locate_simplify_state(revs, p->item);
2624                if (!pst->simplified) {
2625                        tail = &commit_list_insert(p->item, tail)->next;
2626                        cnt++;
2627                }
2628                if (revs->first_parent_only)
2629                        break;
2630        }
2631        if (cnt) {
2632                tail = &commit_list_insert(commit, tail)->next;
2633                return tail;
2634        }
2635
2636        /*
2637         * Rewrite our list of parents. Note that this cannot
2638         * affect our TREESAME flags in any way - a commit is
2639         * always TREESAME to its simplification.
2640         */
2641        for (p = commit->parents; p; p = p->next) {
2642                pst = locate_simplify_state(revs, p->item);
2643                p->item = pst->simplified;
2644                if (revs->first_parent_only)
2645                        break;
2646        }
2647
2648        if (revs->first_parent_only)
2649                cnt = 1;
2650        else
2651                cnt = remove_duplicate_parents(revs, commit);
2652
2653        /*
2654         * It is possible that we are a merge and one side branch
2655         * does not have any commit that touches the given paths;
2656         * in such a case, the immediate parent from that branch
2657         * will be rewritten to be the merge base.
2658         *
2659         *      o----X          X: the commit we are looking at;
2660         *     /    /           o: a commit that touches the paths;
2661         * ---o----'
2662         *
2663         * Further, a merge of an independent branch that doesn't
2664         * touch the path will reduce to a treesame root parent:
2665         *
2666         *  ----o----X          X: the commit we are looking at;
2667         *          /           o: a commit that touches the paths;
2668         *         r            r: a root commit not touching the paths
2669         *
2670         * Detect and simplify both cases.
2671         */
2672        if (1 < cnt) {
2673                int marked = mark_redundant_parents(revs, commit);
2674                marked += mark_treesame_root_parents(revs, commit);
2675                if (marked)
2676                        marked -= leave_one_treesame_to_parent(revs, commit);
2677                if (marked)
2678                        cnt = remove_marked_parents(revs, commit);
2679        }
2680
2681        /*
2682         * A commit simplifies to itself if it is a root, if it is
2683         * UNINTERESTING, if it touches the given paths, or if it is a
2684         * merge and its parents don't simplify to one relevant commit
2685         * (the first two cases are already handled at the beginning of
2686         * this function).
2687         *
2688         * Otherwise, it simplifies to what its sole relevant parent
2689         * simplifies to.
2690         */
2691        if (!cnt ||
2692            (commit->object.flags & UNINTERESTING) ||
2693            !(commit->object.flags & TREESAME) ||
2694            (parent = one_relevant_parent(revs, commit->parents)) == NULL)
2695                st->simplified = commit;
2696        else {
2697                pst = locate_simplify_state(revs, parent);
2698                st->simplified = pst->simplified;
2699        }
2700        return tail;
2701}
2702
2703static void simplify_merges(struct rev_info *revs)
2704{
2705        struct commit_list *list, *next;
2706        struct commit_list *yet_to_do, **tail;
2707        struct commit *commit;
2708
2709        if (!revs->prune)
2710                return;
2711
2712        /* feed the list reversed */
2713        yet_to_do = NULL;
2714        for (list = revs->commits; list; list = next) {
2715                commit = list->item;
2716                next = list->next;
2717                /*
2718                 * Do not free(list) here yet; the original list
2719                 * is used later in this function.
2720                 */
2721                commit_list_insert(commit, &yet_to_do);
2722        }
2723        while (yet_to_do) {
2724                list = yet_to_do;
2725                yet_to_do = NULL;
2726                tail = &yet_to_do;
2727                while (list) {
2728                        commit = pop_commit(&list);
2729                        tail = simplify_one(revs, commit, tail);
2730                }
2731        }
2732
2733        /* clean up the result, removing the simplified ones */
2734        list = revs->commits;
2735        revs->commits = NULL;
2736        tail = &revs->commits;
2737        while (list) {
2738                struct merge_simplify_state *st;
2739
2740                commit = pop_commit(&list);
2741                st = locate_simplify_state(revs, commit);
2742                if (st->simplified == commit)
2743                        tail = &commit_list_insert(commit, tail)->next;
2744        }
2745}
2746
2747static void set_children(struct rev_info *revs)
2748{
2749        struct commit_list *l;
2750        for (l = revs->commits; l; l = l->next) {
2751                struct commit *commit = l->item;
2752                struct commit_list *p;
2753
2754                for (p = commit->parents; p; p = p->next)
2755                        add_child(revs, p->item, commit);
2756        }
2757}
2758
2759void reset_revision_walk(void)
2760{
2761        clear_object_flags(SEEN | ADDED | SHOWN);
2762}
2763
2764int prepare_revision_walk(struct rev_info *revs)
2765{
2766        int i;
2767        struct object_array old_pending;
2768        struct commit_list **next = &revs->commits;
2769
2770        memcpy(&old_pending, &revs->pending, sizeof(old_pending));
2771        revs->pending.nr = 0;
2772        revs->pending.alloc = 0;
2773        revs->pending.objects = NULL;
2774        for (i = 0; i < old_pending.nr; i++) {
2775                struct object_array_entry *e = old_pending.objects + i;
2776                struct commit *commit = handle_commit(revs, e);
2777                if (commit) {
2778                        if (!(commit->object.flags & SEEN)) {
2779                                commit->object.flags |= SEEN;
2780                                next = commit_list_append(commit, next);
2781                        }
2782                }
2783        }
2784        if (!revs->leak_pending)
2785                object_array_clear(&old_pending);
2786
2787        /* Signal whether we need per-parent treesame decoration */
2788        if (revs->simplify_merges ||
2789            (revs->limited && limiting_can_increase_treesame(revs)))
2790                revs->treesame.name = "treesame";
2791
2792        if (revs->no_walk != REVISION_WALK_NO_WALK_UNSORTED)
2793                commit_list_sort_by_date(&revs->commits);
2794        if (revs->no_walk)
2795                return 0;
2796        if (revs->limited)
2797                if (limit_list(revs) < 0)
2798                        return -1;
2799        if (revs->topo_order)
2800                sort_in_topological_order(&revs->commits, revs->sort_order);
2801        if (revs->line_level_traverse)
2802                line_log_filter(revs);
2803        if (revs->simplify_merges)
2804                simplify_merges(revs);
2805        if (revs->children.name)
2806                set_children(revs);
2807        return 0;
2808}
2809
2810static enum rewrite_result rewrite_one(struct rev_info *revs, struct commit **pp)
2811{
2812        struct commit_list *cache = NULL;
2813
2814        for (;;) {
2815                struct commit *p = *pp;
2816                if (!revs->limited)
2817                        if (add_parents_to_list(revs, p, &revs->commits, &cache) < 0)
2818                                return rewrite_one_error;
2819                if (p->object.flags & UNINTERESTING)
2820                        return rewrite_one_ok;
2821                if (!(p->object.flags & TREESAME))
2822                        return rewrite_one_ok;
2823                if (!p->parents)
2824                        return rewrite_one_noparents;
2825                if ((p = one_relevant_parent(revs, p->parents)) == NULL)
2826                        return rewrite_one_ok;
2827                *pp = p;
2828        }
2829}
2830
2831int rewrite_parents(struct rev_info *revs, struct commit *commit,
2832        rewrite_parent_fn_t rewrite_parent)
2833{
2834        struct commit_list **pp = &commit->parents;
2835        while (*pp) {
2836                struct commit_list *parent = *pp;
2837                switch (rewrite_parent(revs, &parent->item)) {
2838                case rewrite_one_ok:
2839                        break;
2840                case rewrite_one_noparents:
2841                        *pp = parent->next;
2842                        continue;
2843                case rewrite_one_error:
2844                        return -1;
2845                }
2846                pp = &parent->next;
2847        }
2848        remove_duplicate_parents(revs, commit);
2849        return 0;
2850}
2851
2852static int commit_rewrite_person(struct strbuf *buf, const char *what, struct string_list *mailmap)
2853{
2854        char *person, *endp;
2855        size_t len, namelen, maillen;
2856        const char *name;
2857        const char *mail;
2858        struct ident_split ident;
2859
2860        person = strstr(buf->buf, what);
2861        if (!person)
2862                return 0;
2863
2864        person += strlen(what);
2865        endp = strchr(person, '\n');
2866        if (!endp)
2867                return 0;
2868
2869        len = endp - person;
2870
2871        if (split_ident_line(&ident, person, len))
2872                return 0;
2873
2874        mail = ident.mail_begin;
2875        maillen = ident.mail_end - ident.mail_begin;
2876        name = ident.name_begin;
2877        namelen = ident.name_end - ident.name_begin;
2878
2879        if (map_user(mailmap, &mail, &maillen, &name, &namelen)) {
2880                struct strbuf namemail = STRBUF_INIT;
2881
2882                strbuf_addf(&namemail, "%.*s <%.*s>",
2883                            (int)namelen, name, (int)maillen, mail);
2884
2885                strbuf_splice(buf, ident.name_begin - buf->buf,
2886                              ident.mail_end - ident.name_begin + 1,
2887                              namemail.buf, namemail.len);
2888
2889                strbuf_release(&namemail);
2890
2891                return 1;
2892        }
2893
2894        return 0;
2895}
2896
2897static int commit_match(struct commit *commit, struct rev_info *opt)
2898{
2899        int retval;
2900        const char *encoding;
2901        const char *message;
2902        struct strbuf buf = STRBUF_INIT;
2903
2904        if (!opt->grep_filter.pattern_list && !opt->grep_filter.header_list)
2905                return 1;
2906
2907        /* Prepend "fake" headers as needed */
2908        if (opt->grep_filter.use_reflog_filter) {
2909                strbuf_addstr(&buf, "reflog ");
2910                get_reflog_message(&buf, opt->reflog_info);
2911                strbuf_addch(&buf, '\n');
2912        }
2913
2914        /*
2915         * We grep in the user's output encoding, under the assumption that it
2916         * is the encoding they are most likely to write their grep pattern
2917         * for. In addition, it means we will match the "notes" encoding below,
2918         * so we will not end up with a buffer that has two different encodings
2919         * in it.
2920         */
2921        encoding = get_log_output_encoding();
2922        message = logmsg_reencode(commit, NULL, encoding);
2923
2924        /* Copy the commit to temporary if we are using "fake" headers */
2925        if (buf.len)
2926                strbuf_addstr(&buf, message);
2927
2928        if (opt->grep_filter.header_list && opt->mailmap) {
2929                if (!buf.len)
2930                        strbuf_addstr(&buf, message);
2931
2932                commit_rewrite_person(&buf, "\nauthor ", opt->mailmap);
2933                commit_rewrite_person(&buf, "\ncommitter ", opt->mailmap);
2934        }
2935
2936        /* Append "fake" message parts as needed */
2937        if (opt->show_notes) {
2938                if (!buf.len)
2939                        strbuf_addstr(&buf, message);
2940                format_display_notes(&commit->object.oid, &buf, encoding, 1);
2941        }
2942
2943        /*
2944         * Find either in the original commit message, or in the temporary.
2945         * Note that we cast away the constness of "message" here. It is
2946         * const because it may come from the cached commit buffer. That's OK,
2947         * because we know that it is modifiable heap memory, and that while
2948         * grep_buffer may modify it for speed, it will restore any
2949         * changes before returning.
2950         */
2951        if (buf.len)
2952                retval = grep_buffer(&opt->grep_filter, buf.buf, buf.len);
2953        else
2954                retval = grep_buffer(&opt->grep_filter,
2955                                     (char *)message, strlen(message));
2956        strbuf_release(&buf);
2957        unuse_commit_buffer(commit, message);
2958        return opt->invert_grep ? !retval : retval;
2959}
2960
2961static inline int want_ancestry(const struct rev_info *revs)
2962{
2963        return (revs->rewrite_parents || revs->children.name);
2964}
2965
2966/*
2967 * Return a timestamp to be used for --since/--until comparisons for this
2968 * commit, based on the revision options.
2969 */
2970static timestamp_t comparison_date(const struct rev_info *revs,
2971                                   struct commit *commit)
2972{
2973        return revs->reflog_info ?
2974                get_reflog_timestamp(revs->reflog_info) :
2975                commit->date;
2976}
2977
2978enum commit_action get_commit_action(struct rev_info *revs, struct commit *commit)
2979{
2980        if (commit->object.flags & SHOWN)
2981                return commit_ignore;
2982        if (revs->unpacked && has_sha1_pack(commit->object.oid.hash))
2983                return commit_ignore;
2984        if (revs->show_all)
2985                return commit_show;
2986        if (commit->object.flags & UNINTERESTING)
2987                return commit_ignore;
2988        if (revs->min_age != -1 &&
2989            comparison_date(revs, commit) > revs->min_age)
2990                        return commit_ignore;
2991        if (revs->min_parents || (revs->max_parents >= 0)) {
2992                int n = commit_list_count(commit->parents);
2993                if ((n < revs->min_parents) ||
2994                    ((revs->max_parents >= 0) && (n > revs->max_parents)))
2995                        return commit_ignore;
2996        }
2997        if (!commit_match(commit, revs))
2998                return commit_ignore;
2999        if (revs->prune && revs->dense) {
3000                /* Commit without changes? */
3001                if (commit->object.flags & TREESAME) {
3002                        int n;
3003                        struct commit_list *p;
3004                        /* drop merges unless we want parenthood */
3005                        if (!want_ancestry(revs))
3006                                return commit_ignore;
3007                        /*
3008                         * If we want ancestry, then need to keep any merges
3009                         * between relevant commits to tie together topology.
3010                         * For consistency with TREESAME and simplification
3011                         * use "relevant" here rather than just INTERESTING,
3012                         * to treat bottom commit(s) as part of the topology.
3013                         */
3014                        for (n = 0, p = commit->parents; p; p = p->next)
3015                                if (relevant_commit(p->item))
3016                                        if (++n >= 2)
3017                                                return commit_show;
3018                        return commit_ignore;
3019                }
3020        }
3021        return commit_show;
3022}
3023
3024define_commit_slab(saved_parents, struct commit_list *);
3025
3026#define EMPTY_PARENT_LIST ((struct commit_list *)-1)
3027
3028/*
3029 * You may only call save_parents() once per commit (this is checked
3030 * for non-root commits).
3031 */
3032static void save_parents(struct rev_info *revs, struct commit *commit)
3033{
3034        struct commit_list **pp;
3035
3036        if (!revs->saved_parents_slab) {
3037                revs->saved_parents_slab = xmalloc(sizeof(struct saved_parents));
3038                init_saved_parents(revs->saved_parents_slab);
3039        }
3040
3041        pp = saved_parents_at(revs->saved_parents_slab, commit);
3042
3043        /*
3044         * When walking with reflogs, we may visit the same commit
3045         * several times: once for each appearance in the reflog.
3046         *
3047         * In this case, save_parents() will be called multiple times.
3048         * We want to keep only the first set of parents.  We need to
3049         * store a sentinel value for an empty (i.e., NULL) parent
3050         * list to distinguish it from a not-yet-saved list, however.
3051         */
3052        if (*pp)
3053                return;
3054        if (commit->parents)
3055                *pp = copy_commit_list(commit->parents);
3056        else
3057                *pp = EMPTY_PARENT_LIST;
3058}
3059
3060static void free_saved_parents(struct rev_info *revs)
3061{
3062        if (revs->saved_parents_slab)
3063                clear_saved_parents(revs->saved_parents_slab);
3064}
3065
3066struct commit_list *get_saved_parents(struct rev_info *revs, const struct commit *commit)
3067{
3068        struct commit_list *parents;
3069
3070        if (!revs->saved_parents_slab)
3071                return commit->parents;
3072
3073        parents = *saved_parents_at(revs->saved_parents_slab, commit);
3074        if (parents == EMPTY_PARENT_LIST)
3075                return NULL;
3076        return parents;
3077}
3078
3079enum commit_action simplify_commit(struct rev_info *revs, struct commit *commit)
3080{
3081        enum commit_action action = get_commit_action(revs, commit);
3082
3083        if (action == commit_show &&
3084            !revs->show_all &&
3085            revs->prune && revs->dense && want_ancestry(revs)) {
3086                /*
3087                 * --full-diff on simplified parents is no good: it
3088                 * will show spurious changes from the commits that
3089                 * were elided.  So we save the parents on the side
3090                 * when --full-diff is in effect.
3091                 */
3092                if (revs->full_diff)
3093                        save_parents(revs, commit);
3094                if (rewrite_parents(revs, commit, rewrite_one) < 0)
3095                        return commit_error;
3096        }
3097        return action;
3098}
3099
3100static void track_linear(struct rev_info *revs, struct commit *commit)
3101{
3102        if (revs->track_first_time) {
3103                revs->linear = 1;
3104                revs->track_first_time = 0;
3105        } else {
3106                struct commit_list *p;
3107                for (p = revs->previous_parents; p; p = p->next)
3108                        if (p->item == NULL || /* first commit */
3109                            !oidcmp(&p->item->object.oid, &commit->object.oid))
3110                                break;
3111                revs->linear = p != NULL;
3112        }
3113        if (revs->reverse) {
3114                if (revs->linear)
3115                        commit->object.flags |= TRACK_LINEAR;
3116        }
3117        free_commit_list(revs->previous_parents);
3118        revs->previous_parents = copy_commit_list(commit->parents);
3119}
3120
3121static struct commit *get_revision_1(struct rev_info *revs)
3122{
3123        while (1) {
3124                struct commit *commit;
3125
3126                if (revs->reflog_info)
3127                        commit = next_reflog_entry(revs->reflog_info);
3128                else
3129                        commit = pop_commit(&revs->commits);
3130
3131                if (!commit)
3132                        return NULL;
3133
3134                if (revs->reflog_info)
3135                        commit->object.flags &= ~(ADDED | SEEN | SHOWN);
3136
3137                /*
3138                 * If we haven't done the list limiting, we need to look at
3139                 * the parents here. We also need to do the date-based limiting
3140                 * that we'd otherwise have done in limit_list().
3141                 */
3142                if (!revs->limited) {
3143                        if (revs->max_age != -1 &&
3144                            comparison_date(revs, commit) < revs->max_age)
3145                                continue;
3146
3147                        if (revs->reflog_info)
3148                                try_to_simplify_commit(revs, commit);
3149                        else if (add_parents_to_list(revs, commit, &revs->commits, NULL) < 0) {
3150                                if (!revs->ignore_missing_links)
3151                                        die("Failed to traverse parents of commit %s",
3152                                                oid_to_hex(&commit->object.oid));
3153                        }
3154                }
3155
3156                switch (simplify_commit(revs, commit)) {
3157                case commit_ignore:
3158                        continue;
3159                case commit_error:
3160                        die("Failed to simplify parents of commit %s",
3161                            oid_to_hex(&commit->object.oid));
3162                default:
3163                        if (revs->track_linear)
3164                                track_linear(revs, commit);
3165                        return commit;
3166                }
3167        }
3168}
3169
3170/*
3171 * Return true for entries that have not yet been shown.  (This is an
3172 * object_array_each_func_t.)
3173 */
3174static int entry_unshown(struct object_array_entry *entry, void *cb_data_unused)
3175{
3176        return !(entry->item->flags & SHOWN);
3177}
3178
3179/*
3180 * If array is on the verge of a realloc, garbage-collect any entries
3181 * that have already been shown to try to free up some space.
3182 */
3183static void gc_boundary(struct object_array *array)
3184{
3185        if (array->nr == array->alloc)
3186                object_array_filter(array, entry_unshown, NULL);
3187}
3188
3189static void create_boundary_commit_list(struct rev_info *revs)
3190{
3191        unsigned i;
3192        struct commit *c;
3193        struct object_array *array = &revs->boundary_commits;
3194        struct object_array_entry *objects = array->objects;
3195
3196        /*
3197         * If revs->commits is non-NULL at this point, an error occurred in
3198         * get_revision_1().  Ignore the error and continue printing the
3199         * boundary commits anyway.  (This is what the code has always
3200         * done.)
3201         */
3202        if (revs->commits) {
3203                free_commit_list(revs->commits);
3204                revs->commits = NULL;
3205        }
3206
3207        /*
3208         * Put all of the actual boundary commits from revs->boundary_commits
3209         * into revs->commits
3210         */
3211        for (i = 0; i < array->nr; i++) {
3212                c = (struct commit *)(objects[i].item);
3213                if (!c)
3214                        continue;
3215                if (!(c->object.flags & CHILD_SHOWN))
3216                        continue;
3217                if (c->object.flags & (SHOWN | BOUNDARY))
3218                        continue;
3219                c->object.flags |= BOUNDARY;
3220                commit_list_insert(c, &revs->commits);
3221        }
3222
3223        /*
3224         * If revs->topo_order is set, sort the boundary commits
3225         * in topological order
3226         */
3227        sort_in_topological_order(&revs->commits, revs->sort_order);
3228}
3229
3230static struct commit *get_revision_internal(struct rev_info *revs)
3231{
3232        struct commit *c = NULL;
3233        struct commit_list *l;
3234
3235        if (revs->boundary == 2) {
3236                /*
3237                 * All of the normal commits have already been returned,
3238                 * and we are now returning boundary commits.
3239                 * create_boundary_commit_list() has populated
3240                 * revs->commits with the remaining commits to return.
3241                 */
3242                c = pop_commit(&revs->commits);
3243                if (c)
3244                        c->object.flags |= SHOWN;
3245                return c;
3246        }
3247
3248        /*
3249         * If our max_count counter has reached zero, then we are done. We
3250         * don't simply return NULL because we still might need to show
3251         * boundary commits. But we want to avoid calling get_revision_1, which
3252         * might do a considerable amount of work finding the next commit only
3253         * for us to throw it away.
3254         *
3255         * If it is non-zero, then either we don't have a max_count at all
3256         * (-1), or it is still counting, in which case we decrement.
3257         */
3258        if (revs->max_count) {
3259                c = get_revision_1(revs);
3260                if (c) {
3261                        while (revs->skip_count > 0) {
3262                                revs->skip_count--;
3263                                c = get_revision_1(revs);
3264                                if (!c)
3265                                        break;
3266                        }
3267                }
3268
3269                if (revs->max_count > 0)
3270                        revs->max_count--;
3271        }
3272
3273        if (c)
3274                c->object.flags |= SHOWN;
3275
3276        if (!revs->boundary)
3277                return c;
3278
3279        if (!c) {
3280                /*
3281                 * get_revision_1() runs out the commits, and
3282                 * we are done computing the boundaries.
3283                 * switch to boundary commits output mode.
3284                 */
3285                revs->boundary = 2;
3286
3287                /*
3288                 * Update revs->commits to contain the list of
3289                 * boundary commits.
3290                 */
3291                create_boundary_commit_list(revs);
3292
3293                return get_revision_internal(revs);
3294        }
3295
3296        /*
3297         * boundary commits are the commits that are parents of the
3298         * ones we got from get_revision_1() but they themselves are
3299         * not returned from get_revision_1().  Before returning
3300         * 'c', we need to mark its parents that they could be boundaries.
3301         */
3302
3303        for (l = c->parents; l; l = l->next) {
3304                struct object *p;
3305                p = &(l->item->object);
3306                if (p->flags & (CHILD_SHOWN | SHOWN))
3307                        continue;
3308                p->flags |= CHILD_SHOWN;
3309                gc_boundary(&revs->boundary_commits);
3310                add_object_array(p, NULL, &revs->boundary_commits);
3311        }
3312
3313        return c;
3314}
3315
3316struct commit *get_revision(struct rev_info *revs)
3317{
3318        struct commit *c;
3319        struct commit_list *reversed;
3320
3321        if (revs->reverse) {
3322                reversed = NULL;
3323                while ((c = get_revision_internal(revs)))
3324                        commit_list_insert(c, &reversed);
3325                revs->commits = reversed;
3326                revs->reverse = 0;
3327                revs->reverse_output_stage = 1;
3328        }
3329
3330        if (revs->reverse_output_stage) {
3331                c = pop_commit(&revs->commits);
3332                if (revs->track_linear)
3333                        revs->linear = !!(c && c->object.flags & TRACK_LINEAR);
3334                return c;
3335        }
3336
3337        c = get_revision_internal(revs);
3338        if (c && revs->graph)
3339                graph_update(revs->graph, c);
3340        if (!c) {
3341                free_saved_parents(revs);
3342                if (revs->previous_parents) {
3343                        free_commit_list(revs->previous_parents);
3344                        revs->previous_parents = NULL;
3345                }
3346        }
3347        return c;
3348}
3349
3350char *get_revision_mark(const struct rev_info *revs, const struct commit *commit)
3351{
3352        if (commit->object.flags & BOUNDARY)
3353                return "-";
3354        else if (commit->object.flags & UNINTERESTING)
3355                return "^";
3356        else if (commit->object.flags & PATCHSAME)
3357                return "=";
3358        else if (!revs || revs->left_right) {
3359                if (commit->object.flags & SYMMETRIC_LEFT)
3360                        return "<";
3361                else
3362                        return ">";
3363        } else if (revs->graph)
3364                return "*";
3365        else if (revs->cherry_mark)
3366                return "+";
3367        return "";
3368}
3369
3370void put_revision_mark(const struct rev_info *revs, const struct commit *commit)
3371{
3372        char *mark = get_revision_mark(revs, commit);
3373        if (!strlen(mark))
3374                return;
3375        fputs(mark, stdout);
3376        putchar(' ');
3377}