Bug fix for merge diffs and a test.

[catagits/Gitalist.git] / lib / Gitalist / Git / Object / Commit.pm

diff --git a/lib/Gitalist/Git/Object/Commit.pm b/lib/Gitalist/Git/Object/Commit.pm
index 465647d..7536a66 100644 (file)
--- a/lib/Gitalist/Git/Object/Commit.pm
+++ b/lib/Gitalist/Git/Object/Commit.pm
@@ -62,7 +62,7 @@ class Gitalist::Git::Object::Commit
 
            # If we're not comparing against something and we have multiple
            # parents then it's a merge commit so show what was merged.
-           my $sha1 = $parent eq '-c' && @{[$self->parents]} > 1
+           my $sha1 = $parent && $parent eq '-c' && @{[$self->parents]} > 1
                 ? sprintf("%s^1..%s^2", ($self->sha1) x 2)
                      : $self->sha1;