Merge pull request #166 from hartwork/fix-external-diff-regression

Make external diff command work again (fixes #163)

Author: tibirna

src/mainimpl.cpp

@@ -291,10 +291,8 @@ void MainImpl::ActExternalDiff_activated() {
 	}
 }
 
-const QRegularExpression MainImpl::emptySha("0*");
-
 QString MainImpl::copyFileToDiffIfNeeded(QStringList* filenames, QString sha) {
-	if (emptySha.match(sha).hasMatch())
+	if (sha == QGit::ZERO_SHA)
 	{
 		return QString(curDir + "/" + rv->st.fileName());
 	}

src/mainimpl.h

@@ -187,7 +187,6 @@ protected slots:
 	QString textToFind;
 	QRegularExpression shortLogRE;
 	QRegularExpression longLogRE;
-	static const QRegularExpression emptySha;
 	QMap<QString, QVariant> revision_variables; // variables used in generic input dialogs
 	bool setRepositoryBusy;