mirror of
https://github.com/servo/servo.git
synced 2025-08-03 04:30:10 +01:00
auto merge of #1307 : pcwalton/servo/disable-manage-submodules, r=kmcallister
r? @kmcallister
This commit is contained in:
commit
b4c0020492
1 changed files with 6 additions and 3 deletions
9
configure
vendored
9
configure
vendored
|
@ -308,9 +308,12 @@ CFG_SELF=${CFG_SRC_DIR}$(basename $0)
|
|||
CFG_CONFIGURE_ARGS="$@"
|
||||
CFG_PATH=$PATH
|
||||
|
||||
if git status $CFG_SRC_DIR/src/compiler $CFG_SRC_DIR/src/support $CFG_SRC_DIR/src/platform \
|
||||
| grep -q 'modified:.*modified content'; then
|
||||
err "Some submodule has a dirty working tree. See 'git status'."
|
||||
if [ -n "$CFG_DISABLE_MANAGE_SUBMODULES" ]
|
||||
then
|
||||
if git status $CFG_SRC_DIR/src/compiler $CFG_SRC_DIR/src/support $CFG_SRC_DIR/src/platform \
|
||||
| grep -q 'modified:.*modified content'; then
|
||||
err "Some submodule has a dirty working tree. See 'git status'."
|
||||
fi
|
||||
fi
|
||||
|
||||
OPTIONS=""
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue