Skip to content

Make external diff command work again (fixes #163) #166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tibirna merged 1 commit into from
Oct 15, 2025
Merged

Make external diff command work again (fixes #163) #166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions src/mainimpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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());
}
Expand Down
1 change: 0 additions & 1 deletion src/mainimpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
Loading