Browse Source

Fixes parsing issue with merge commits

main
Eric Amodio 7 years ago
parent
commit
758d331e69
1 changed files with 7 additions and 1 deletions
  1. +7
    -1
      src/git/parsers/logParser.ts

+ 7
- 1
src/git/parsers/logParser.ts View File

@ -82,7 +82,13 @@ export class GitLogParser {
case 'summary': case 'summary':
entry.summary = lineParts.slice(1).join(' ').trim(); entry.summary = lineParts.slice(1).join(' ').trim();
while (++position < lines.length) { while (++position < lines.length) {
if (!lines[position]) break;
const next = lines[position];
if (!next) break;
if (next === 'filename ?') {
position--;
break;
}
entry.summary += `\n${lines[position]}`; entry.summary += `\n${lines[position]}`;
} }
break; break;

Loading…
Cancel
Save