[Buildbot-commits] [buildbot/buildbot] 2bec11: git: force submodule update so local changes/files...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 2bec118821eb326f9220a25f5cda1ae5bed5eb40
      https://github.com/buildbot/buildbot/commit/2bec118821eb326f9220a25f5cda1ae5bed5eb40
  Author: Cody P Schafer <dev at codyps.com>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  git: force submodule update so local changes/files are overwritten

Without this, we sometimes get "Your local changes to the following
files would be overwritten by checkout" when submodules are updates.

On the non-submodule side, we're already using reset instead of
checkout to avoid this.

Signed-off-by: Cody P Schafer <dev at codyps.com>


  Commit: 1fc995d3546fd82b5d272a7d02230bacd5ea6fa2
      https://github.com/buildbot/buildbot/commit/1fc995d3546fd82b5d272a7d02230bacd5ea6fa2
  Author: Dustin J. Mitchell <dustin at buildbot.net>
  Date:   2014-06-26 (Thu, 26 Jun 2014)

  Changed paths:
    M master/buildbot/steps/source/git.py
    M master/buildbot/test/unit/test_steps_source_git.py
    M master/docs/relnotes/index.rst

  Log Message:
  -----------
  Merge jmesmon/buildbot:fix-submod (PR #1167)


Compare: https://github.com/buildbot/buildbot/compare/dfd586c1ccf5...1fc995d3546f