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 ca808739dba4235f0f8a5777ff4bbfe4443d1d27..390fe2f0275c05e10b64f6164d7bcad624069ed3 100644 (file)
--- a/read-tree.c
+++ b/read-tree.c
@@ -629,11 +629,6 @@ int main(int argc, char **argv)
                        continue;
                }
 
                        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)
                /* "-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 ((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) {
                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;
                }
                        fn = threeway_merge;
                        break;
                }

-       }

 
 

-       if (head_idx < 0) {

                if (stage - 1 >= 3)
                        head_idx = stage - 2;
                else
                if (stage - 1 >= 3)
                        head_idx = stage - 2;
                else