Skip to content

Commit

Permalink
make configure not clobber modified submodules at all
Browse files Browse the repository at this point in the history
this fixes issue #522 (maybe?) by not cleaning/resetting submodules which are dirty. it does not block completion of configure.
  • Loading branch information
zmike committed Jan 3, 2014
1 parent 2b487ed commit 12cee06
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions configure
Expand Up @@ -456,9 +456,8 @@ then
need_ok "git failed"

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

cd ${CFG_BUILD_DIR}
Expand Down

5 comments on commit 12cee06

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from larsbergstrom
at zmike@12cee06

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging zmike/servo/master = 12cee06 into auto

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

zmike/servo/master = 12cee06 merged ok, testing candidate = 2fa4699

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors-servo
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 2fa4699

Please sign in to comment.