undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

read-tree: remove --head option.

Browse Source 
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>
This commit is contained in:
Junio C Hamano 2005-10-02 00:50:16 -07:00
parent 0842acff57
commit 7dd43575f8
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
read-tree.c
View File

@ -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