turn off the git-diff $PAGER by default

cpjolicoeur · Jun 11, 2009 · 8ed5b79 · 8ed5b79
1 parent 3d42389
commit 8ed5b79
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/Changelog.txt b/Changelog.txt
@@ -1,5 +1,11 @@
 = Cerberus Changelog
 
+== Version 0.6.1
+Bugfix for issues with git-diff output
+
+* Projects using the Git SCM were not getting the full diff output in their
+Publishers
+
 == Version 0.6
 New Ruby builder, bugfixes, and refactoring
 

diff --git a/lib/cerberus/constants.rb b/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'
+  VERSION = '0.6.1'
 end
diff --git a/lib/cerberus/scm/git.rb b/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)