From f09f2e8e63a8f3ed7c6723b5dada3aca6fc393fd Mon Sep 17 00:00:00 2001 From: Toshi MARUYAMA Date: Wed, 6 Apr 2011 06:59:50 +0000 Subject: [PATCH] scm: git: backout r5336 (#8081, #8083). Git on Redmine CI Server does not support "--no-decorate" option of "git log". git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5347 e93f8b46-1217-0410-a6f0-8f06a7374b81 --- lib/redmine/scm/adapters/git_adapter.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb index ba8cf96a2..302ded580 100644 --- a/lib/redmine/scm/adapters/git_adapter.rb +++ b/lib/redmine/scm/adapters/git_adapter.rb @@ -86,7 +86,7 @@ module Redmine def lastrev(path,rev) return nil if path.nil? - cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-decorate --no-color --date=iso --pretty=fuller --no-merges -n 1 " + cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --date=iso --pretty=fuller --no-merges -n 1 " cmd << " #{shell_quote rev} " if rev cmd << "-- #{shell_quote path} " unless path.empty? lines = [] @@ -114,7 +114,7 @@ module Redmine def revisions(path, identifier_from, identifier_to, options={}) revisions = Revisions.new - cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-decorate --no-color --raw --date=iso --pretty=fuller " + cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-color --raw --date=iso --pretty=fuller " cmd << " --reverse " if options[:reverse] cmd << " --all " if options[:all] cmd << " -n #{options[:limit].to_i} " if options[:limit] -- 2.39.5