From 8ed5b799b3f92754baf13d1a3252d33f35f5ec79 Mon Sep 17 00:00:00 2001 From: Craig P Jolicoeur Date: Wed, 10 Jun 2009 21:47:14 -0400 Subject: [PATCH] turn off the git-diff $PAGER by default --- Changelog.txt | 6 ++++++ lib/cerberus/constants.rb | 4 ++-- lib/cerberus/scm/git.rb | 1 + 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Changelog.txt b/Changelog.txt index 006d56e..3e4cd14 100644 --- 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 index 8aba51a..161d3a7 100644 --- 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 index 87e5447..1489a8b 100644 --- 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)