diff --git a/repo_commit.go b/repo_commit.go
index 0d2d5e498..528991881 100644
--- a/repo_commit.go
+++ b/repo_commit.go
@@ -101,7 +101,11 @@ l:
 				sig, err := newGPGSignatureFromCommitline(data, (nextline+1)+sigindex, true)
 				if err == nil && sig != nil {
 					// remove signature from commit message
-					cm = cm[:sigindex-1]
+					if sigindex == 0 {
+						cm = cm[:0]
+					} else {
+						cm = cm[:sigindex-1]
+					}
 					commit.Signature = sig
 				}
 			}