summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/git/lib.rb2
-rw-r--r--lib/git/log.rb4
-rw-r--r--lib/git/object.rb2
3 files changed, 4 insertions, 4 deletions
diff --git a/lib/git/lib.rb b/lib/git/lib.rb
index 76223de..c22042f 100644
--- a/lib/git/lib.rb
+++ b/lib/git/lib.rb
@@ -62,7 +62,7 @@ module Git
arr_opts = ['--pretty=oneline']
arr_opts << "-#{opts[:count]}" if opts[:count]
arr_opts << "--since=\"#{opts[:since]}\"" if opts[:since].is_a? String
- arr_opts << "#{opts[:between][0]}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
+ arr_opts << "#{opts[:between][0].to_s}..#{opts[:between][1].to_s}" if (opts[:between] && opts[:between].size == 2)
arr_opts << opts[:object] if opts[:object].is_a? String
arr_opts << '-- ' + opts[:path_limiter] if opts[:path_limiter].is_a? String
diff --git a/lib/git/log.rb b/lib/git/log.rb
index eb625f3..c91538d 100644
--- a/lib/git/log.rb
+++ b/lib/git/log.rb
@@ -41,12 +41,12 @@ module Git
def between(sha1, sha2 = nil)
dirty_log
- @between = [@base.lib.revparse(sha1), @base.lib.revparse(sha2)]
+ @between = [sha1, sha2]
return self
end
def to_s
- self.map { |c| c.sha }.join("\n")
+ self.map { |c| c.to_s }.join("\n")
end
diff --git a/lib/git/object.rb b/lib/git/object.rb
index 2468615..aeeae89 100644
--- a/lib/git/object.rb
+++ b/lib/git/object.rb
@@ -42,7 +42,7 @@ module Git
end
def to_s
- sha
+ @objectish
end
def grep(string, path_limiter = nil, opts = {})