feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Remove outdated comment

Browse Source 
Missed in eb1226df68.

Change-Id: Ib5d6d11bdb563882a2a651b3e26a30f006af973d
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Orgad Shaneh
2022-12-10 21:00:57 +02:00
committed by Orgad Shaneh
parent 5527573a86
commit 72751a9b98
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -744,8 +744,6 @@ static void handleConflictResponse(const VcsBase::CommandResult &result,
if (errMatch.hasMatch()) if (errMatch.hasMatch())
commit = errMatch.captured(1); commit = errMatch.captured(1);
// If interactive rebase editor window is closed, plugin is terminated
// but referenced here when the command ends
if (commit.isEmpty() && files.isEmpty()) { if (commit.isEmpty() && files.isEmpty()) {
if (m_instance->checkCommandInProgress(workingDirectory) == GitClient::NoCommand) if (m_instance->checkCommandInProgress(workingDirectory) == GitClient::NoCommand)
m_instance->endStashScope(workingDirectory); m_instance->endStashScope(workingDirectory);