don't skip meta tags without --force

and make sure we have a space after the meta tag

1 files changed, 5 insertions, 5 deletions

diff --git a/git-dch b/git-dch
index 491a2439..9935f0f9 100755
--- a/git-dch
+++ b/git-dch
@@ -155,15 +155,15 @@ def parse_commit(repo, commit,meta, short):
         author = m.group('author')
     for line in commit[4:]:
         if line.startswith('    '): # commit body
-            if short and msg:
-                continue
             line = line[4:]
-            if line.startswith('Closes:'):
+            if line.startswith('Closes: '):
                 bugs += [ line.split(' ', 1)[1].strip() ]
-            elif line.startswith('Thanks:'):
+            elif line.startswith('Thanks: '):
                 thanks = line.split(' ', 1)[1].strip()
             else: # normal commit message
-                if line.strip(): # don't add all whitespace lines
+                if short and msg:
+                    continue
+                elif line.strip(): # don't add all whitespace lines
                     msg += line
         else:
             break