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>
Junio C Hamano committed
Oct 2, 2005 at 00:50 UTC
7dd43575f8641c8a73b1e976715056ebdc773904
1 file changed
+2
-8
read-tree.c
+2
-8
@@ -629,11 +629,6 @@ int main(int argc, char **argv)
629
continue;
630
}
631
632
- if (!strcmp(arg, "--head")) {
633
- head_idx = stage - 1;
634
- fn = threeway_merge;
635
- }
636
-
632
/* "-m" stands for "merge", meaning we start in stage 1 */
633
if (!strcmp(arg, "-m")) {
634
if (stage || merge)
@@ -657,7 +652,8 @@ int main(int argc, char **argv)
652
}
653
if ((update||index_only) && !merge)
654
usage(read_tree_usage);
660
- if (merge && !fn) {
655
+
656
+ if (merge) {
657
if (stage < 2)
658
die("just how do you expect me to merge %d trees?", stage-1);
659
switch (stage - 1) {
@@ -674,9 +670,7 @@ int main(int argc, char **argv)
670
fn = threeway_merge;
671
break;
672
}
677
- }
673
679
- if (head_idx < 0) {
674
if (stage - 1 >= 3)
675
head_idx = stage - 2;
676
else