Merge branch 'js/rerere'

[git.git] / revision.c

diff --git a/revision.c b/revision.c
index 56819f8220b379575fd0e68d970acbffd9ed0249..4dae5342eb6e14758c93fa4b2942d7c053111d04 100644 (file)
--- a/revision.c
+++ b/revision.c
@@ -6,7 +6,6 @@
 #include "diff.h"
 #include "refs.h"
 #include "revision.h"
-#include <regex.h>
 #include "grep.h"
 
 static char *path_name(struct name_path *path, const char *name)
@@ -853,8 +852,8 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
                                revs->boundary = 1;
                                continue;
                        }
-                       if (!strcmp(arg, "--no-left-right")) {
-                               revs->no_left_right = 1;
+                       if (!strcmp(arg, "--left-right")) {
+                               revs->left_right = 1;
                                continue;
                        }
                        if (!strcmp(arg, "--objects")) {
@@ -1055,18 +1054,13 @@ int setup_revisions(int argc, const char **argv, struct rev_info *revs, const ch
 void prepare_revision_walk(struct rev_info *revs)
 {
        int nr = revs->pending.nr;
-       int has_symmetric = 0;
        struct object_array_entry *list = revs->pending.objects;
 
        revs->pending.nr = 0;
        revs->pending.alloc = 0;
        revs->pending.objects = NULL;
        while (--nr >= 0) {
-               struct commit *commit;
-
-               if (list->item->flags & SYMMETRIC_LEFT)
-                       has_symmetric = 1;
-               commit = handle_commit(revs, list->item, list->name);
+               struct commit *commit = handle_commit(revs, list->item, list->name);
                if (commit) {
                        if (!(commit->object.flags & SEEN)) {
                                commit->object.flags |= SEEN;
@@ -1078,8 +1072,6 @@ void prepare_revision_walk(struct rev_info *revs)
 
        if (revs->no_walk)
                return;
-       if (!revs->no_left_right && has_symmetric)
-               revs->left_right = 1;
        if (revs->limited)
                limit_list(revs);
        if (revs->topo_order)