From: Junio C Hamano <junkio@cox.net>
Date: Sun, 2 Oct 2005 07:50:16 +0000 (-0700)
Subject: read-tree: remove --head option.
X-Git-Tag: v0.99.8~6
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=7dd43575f8641c8a73b1e976715056ebdc773904;p=git.git

read-tree: remove --head option.

Initially it was to allow specifying more than one remote to
allow creation of an Octopus, but it is not being used.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/read-tree.c b/read-tree.c
index ca808739d..390fe2f02 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -629,11 +629,6 @@ int main(int argc, char **argv)
 			continue;
 		}
 
-		if (!strcmp(arg, "--head")) {
-			head_idx = stage - 1;
-			fn = threeway_merge;
-		}
-
 		/* "-m" stands for "merge", meaning we start in stage 1 */
 		if (!strcmp(arg, "-m")) {
 			if (stage || merge)
@@ -657,7 +652,8 @@ int main(int argc, char **argv)
 	}
 	if ((update||index_only) && !merge)
 		usage(read_tree_usage);
-	if (merge && !fn) {
+
+	if (merge) {
 		if (stage < 2)
 			die("just how do you expect me to merge %d trees?", stage-1);
 		switch (stage - 1) {
@@ -674,9 +670,7 @@ int main(int argc, char **argv)
 			fn = threeway_merge;
 			break;
 		}
-	}
 
-	if (head_idx < 0) {
 		if (stage - 1 >= 3)
 			head_idx = stage - 2;
 		else