mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

submodule: defend against submodule.update = !command in .gitmodules

Browse Source 
In v2.15.4, we started to reject `submodule.update` settings in
`.gitmodules`. Let's raise a BUG if it somehow still made it through
from anywhere but the Git config.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Signed-off-by: Johannes Schindelin <Johannes.Schindelin@gmx.de>
This commit is contained in:
Jonathan Nieder
2019-12-05 01:28:28 -08:00
committed by Johannes Schindelin
parent 4cfc47de25
commit c154745074
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
builtin/submodule--helper.c
View File

@ -1482,6 +1482,8 @@ static void determine_submodule_update_strategy(struct repository *r,
die(_("Invalid update mode '%s' configured for submodule path '%s'"), die(_("Invalid update mode '%s' configured for submodule path '%s'"),
val, path); val, path);
} else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) { } else if (sub->update_strategy.type != SM_UPDATE_UNSPECIFIED) {
if (sub->update_strategy.type == SM_UPDATE_COMMAND)
BUG("how did we read update = !command from .gitmodules?");
out->type = sub->update_strategy.type; out->type = sub->update_strategy.type;
out->command = sub->update_strategy.command; out->command = sub->update_strategy.command;
} else } else