Skip to content

Commit

Permalink
read-tree: remove --head option.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Junio C Hamano committed Oct 2, 2005
1 parent 0842acf commit 7dd4357
Showing 1 changed file with 2 additions and 8 deletions.
10 changes: 2 additions & 8 deletions read-tree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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) {
Expand All @@ -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
Expand Down

0 comments on commit 7dd4357

Please sign in to comment.