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

Git: Fix cherry-pick/revert commit resolving on conflict

Browse Source 
Change-Id: I3dee32864f1000afce098c1716307929b4da2462
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-17 10:57:00 +02:00
committed by Orgad Shaneh
parent e5e384a237
commit 610a355eb3
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2107,12 +2107,12 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,
GitPlugin::instance()->gitVersionControl()->emitRepositoryChanged(workingDirectory);
} else if (resp.stdOut.contains(QLatin1String("CONFLICT"))) {
// rebase conflict is output to stdOut
QRegExp conflictedCommit(QLatin1String("Patch failed at ([^\\n]*)\\n"));
QRegExp conflictedCommit(QLatin1String("Patch failed at ([^\\n]*)"));
conflictedCommit.indexIn(resp.stdOut);
handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
} else if (resp.stdErr.contains(QLatin1String("conflict"))) {
// cherry-pick/revert conflict is output to stdErr
QRegExp conflictedCommit(QLatin1String("could not (?:apply|revert) (.*)$"));
QRegExp conflictedCommit(QLatin1String("could not (?:apply|revert) ([^\\n]*)$"));
conflictedCommit.indexIn(resp.stdErr);
handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
}