From: Junio C Hamano <junkio@cox.net>
Date: Tue, 19 Dec 2006 10:28:16 +0000 (-0800)
Subject: Revert "Make left-right automatic."
X-Git-Tag: v1.5.0-rc0~53^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8dce82356221df894a1b0dd5a4189ad3169a5069;p=git.git

Revert "Make left-right automatic."

This reverts commit 5761231975ceffa531d86d9bab0f9a9a370674f6.

Feeding symmetric difference to gitk is so useful, and it is the
same for other graphical Porcelains.  Rather than forcing them
to pass --no-left-right, making it optional.

Noticed and reported by Jeff King.
---

diff --git a/revision.c b/revision.c
index 56819f822..d84f46e5a 100644
--- a/revision.c
+++ b/revision.c
@@ -853,8 +853,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 +1055,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 +1073,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)
diff --git a/revision.h b/revision.h
index b2ab81488..4585463a4 100644
--- a/revision.h
+++ b/revision.h
@@ -41,7 +41,6 @@ struct rev_info {
 			limited:1,
 			unpacked:1, /* see also ignore_packed below */
 			boundary:1,
-			no_left_right:1,
 			left_right:1,
 			parents:1;