Merge branch 'gitdiff'

Changelog.txt

@@ -1,10 +1,12 @@
 = Cerberus Changelog
 
 == Version 0.6.1
-New configuration options
+New configuration options, and bugfixes
 
 * added 'build_dir' option for setting custom build directory
 * added 'setup_script' option for a custom script to be run before build command
+* Projects using the Git SCM were not getting the full diff output in their
+Publishers
 
 == Version 0.6
 New Ruby builder, bugfixes, and refactoring

lib/cerberus/constants.rb

@@ -2,7 +2,7 @@ module Cerberus
   HOME = File.expand_path(ENV['CERBERUS_HOME'] || '~/.cerberus')
   CONFIG_FILE = "#{HOME}/config.yml"
 
-  LOCK_WAIT = 30 * 60 #30 minutes
+  LOCK_WAIT = 30 * 60 # 30 minutes
 
   VERSION = '0.6.1'
 end

lib/cerberus/scm/git.rb

@@ -21,6 +21,7 @@ def update!
       encoded_url = (@config[:scm, :url].include?(' ') ? "\"#{@config[:scm, :url]}\"" : @config[:scm, :url])
       @new = true
       @status = execute("clone", "#{encoded_url} #{@path}", false)
+      execute('config', 'pager.diff false') # turn off git-diff $PAGER by default
       if branch = @config[:scm, :branch]
         execute('branch', "--track #{branch} #{remote_head}")
         execute('checkout', branch)