summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-05 23:18:29 +0000
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>2011-04-05 23:18:29 +0000
commite338f522dd6a409268c76d5162ce18d59253213e (patch)
treefbdb144c2ca193b6a07f7f2dcb904b44e5cd1405
parentab10e187a64e7bb58c618b2df48eaef267879849 (diff)
downloadredmine-e338f522dd6a409268c76d5162ce18d59253213e.tar.gz
redmine-e338f522dd6a409268c76d5162ce18d59253213e.zip
Merged r5334 from trunk.
scm: git: add "--no-decorate" option in "git log". git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.1-stable@5336 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r--lib/redmine/scm/adapters/git_adapter.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/redmine/scm/adapters/git_adapter.rb b/lib/redmine/scm/adapters/git_adapter.rb
index 302ded580..ba8cf96a2 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-color --date=iso --pretty=fuller --no-merges -n 1 "
+ cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-decorate --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-color --raw --date=iso --pretty=fuller "
+ cmd = "#{GIT_BIN} --git-dir #{target('')} log --no-decorate --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]