mirror of
https://github.com/capistrano/capistrano
synced 2023-03-27 23:21:18 -04:00
Merge branch 'master' of git://github.com/rmm5t/capistrano into rmm5t/master
This commit is contained in:
commit
25c383ae00
2 changed files with 2 additions and 3 deletions
|
@ -202,8 +202,7 @@ module Capistrano
|
|||
|
||||
# Returns a log of changes between the two revisions (inclusive).
|
||||
def log(from, to=nil)
|
||||
from << "..#{to}" if to
|
||||
scm :log, from
|
||||
scm :log, "#{from}..#{to}"
|
||||
end
|
||||
|
||||
# Getting the actual commit id, in case we were passed a tag
|
||||
|
|
|
@ -45,7 +45,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
|
|||
end
|
||||
|
||||
def test_log
|
||||
assert_equal "git log master", @source.log('master')
|
||||
assert_equal "git log master..", @source.log('master')
|
||||
assert_equal "git log master..branch", @source.log('master', 'branch')
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue