[Buildbot-commits] [buildbot/buildbot] 3add6d: fix execution of git merge-base and remove extrane...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/buildbot/buildbot
  Commit: 3add6d54bc2a64dd326fe371323c7bd9ab440363
      https://github.com/buildbot/buildbot/commit/3add6d54bc2a64dd326fe371323c7bd9ab440363
  Author: socantre <seth.cantrell at gmail.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M master/contrib/git_buildbot.py

  Log Message:
  -----------
  fix execution of git merge-base and remove extraneous newlines

commands.getoutput was producing an error message "'{' is not recognized as an internal or external command," I assume it was trying to run the command in a subshell using sh syntax, which is not valid in a cmd.exe shell.

The whole script should probably be converted to 'subprocess'

Also `if baserev != oldrev:` was failing due to the newline printed after the revision number by the command 'git merge-base'.


  Commit: 6c4d702d667465cd663fd3181da52f9f437302c2
      https://github.com/buildbot/buildbot/commit/6c4d702d667465cd663fd3181da52f9f437302c2
  Author: Mikhail Sobolev <mss at mawhrin.net>
  Date:   2014-11-08 (Sat, 08 Nov 2014)

  Changed paths:
    M master/contrib/git_buildbot.py

  Log Message:
  -----------
  Merge pull request #1310 from socantre/patch-1

fix execution of merge-base and remove extraneous newlines


Compare: https://github.com/buildbot/buildbot/compare/fe57daf3c133...6c4d702d6674