Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

auto merge of #1449 : zmike/servo/master, r=larsbergstrom

Browse source 
this fixes issue #522 (maybe?) by not cleaning/resetting submodules which are dirty. it does not block completion of configure.
This commit is contained in:
bors-servo 2014-01-03 06:04:36 -08:00
commit 2fa4699274
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
configure vendored
View file

@ -456,9 +456,8 @@ then
need_ok "git failed" need_ok "git failed"
msg "git: submodule clobber" msg "git: submodule clobber"
"${CFG_GIT}" submodule foreach --recursive git clean -dxf "${CFG_GIT}" submodule foreach --recursive \
need_ok "git failed" 'if [ -n "$(git status --porcelain)" ] ; then echo "Refusing to clobber $path" ; else git clean -dxf ; git checkout . ; fi'
"${CFG_GIT}" submodule foreach --recursive git checkout .
need_ok "git failed" need_ok "git failed"
cd ${CFG_BUILD_DIR} cd ${CFG_BUILD_DIR}