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

Git: Fix regexp for cherry-pick and revert conflict

Browse Source 
Output should contain a \n in the end, so $ is counter-productive

Change-Id: I3a7d1dcbed1aa7c78e9a96cafdb3c0d1e65edc7a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
This commit is contained in:
Orgad Shaneh
2013-02-28 11:31:47 +02:00
committed by Orgad Shaneh
parent 497eb16455
commit 9376c24fd0
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2105,7 +2105,7 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,
handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand); handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
} else if (resp.stdErr.contains(QLatin1String("conflict"))) { } else if (resp.stdErr.contains(QLatin1String("conflict"))) {
// cherry-pick/revert conflict is output to stdErr // cherry-pick/revert conflict is output to stdErr
QRegExp conflictedCommit(QLatin1String("could not (?:apply|revert) ([^\\n]*)$")); QRegExp conflictedCommit(QLatin1String("could not (?:apply|revert) ([^\\n]*)"));
conflictedCommit.indexIn(resp.stdErr); conflictedCommit.indexIn(resp.stdErr);
handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand); handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
} }