1 files changed, 6 insertions, 1 deletions
diff --git a/gitk b/gitk
index 922701ca75..1606c38d09 100755
--- a/gitk
+++ b/gitk
@@ -174,10 +174,15 @@ proc parsecommit {id contents listed} {
 	    }
 	} else {
 	    if {$comment == {}} {
-		set headline $line
+		set headline [string trim $line]
 	    } else {
 		append comment "\n"
 	    }
+	    if {!$listed} {
+		# git-rev-list indents the comment by 4 spaces;
+		# if we got this via git-cat-file, add the indentation
+		append comment "    "
+	    }
 	    append comment $line
 	}
     }