Merge pull request #140 from millnet-maho/ensure-diffmerges-separate

Override any log.diffMerges configuration that could spell disaster for file history parsing
tibirna · Sep 7, 2023 · df6326c · df6326c
2 parents 679836a + 74730eb
commit df6326c
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/git.cpp b/src/git.cpp
@@ -2170,7 +2170,7 @@ bool Git::startParseProc(SCList initCmd, FileHistory* fh, SCRef buf) {
 
 bool Git::startRevList(SCList args, FileHistory* fh) {
 
-        QString baseCmd("git log --topo-order --no-color "
+        QString baseCmd("git -c log.diffMerges=separate log --topo-order --no-color "
 
 #ifndef Q_OS_WIN32
                         "--log-size " // FIXME broken on Windows