Skip to content

Commit 7dd4357

Browse files
author
Junio C Hamano
committed
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 <[email protected]>
1 parent 0842acf commit 7dd4357

File tree

1 file changed

+2
-8
lines changed

1 file changed

+2
-8
lines changed

read-tree.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -629,11 +629,6 @@ int main(int argc, char **argv)
629629
continue;
630630
}
631631

632-
if (!strcmp(arg, "--head")) {
633-
head_idx = stage - 1;
634-
fn = threeway_merge;
635-
}
636-
637632
/* "-m" stands for "merge", meaning we start in stage 1 */
638633
if (!strcmp(arg, "-m")) {
639634
if (stage || merge)
@@ -657,7 +652,8 @@ int main(int argc, char **argv)
657652
}
658653
if ((update||index_only) && !merge)
659654
usage(read_tree_usage);
660-
if (merge && !fn) {
655+
656+
if (merge) {
661657
if (stage < 2)
662658
die("just how do you expect me to merge %d trees?", stage-1);
663659
switch (stage - 1) {
@@ -674,9 +670,7 @@ int main(int argc, char **argv)
674670
fn = threeway_merge;
675671
break;
676672
}
677-
}
678673

679-
if (head_idx < 0) {
680674
if (stage - 1 >= 3)
681675
head_idx = stage - 2;
682676
else

0 commit comments

Comments
 (0)