Commit 9376c24f authored by Orgad Shaneh's avatar Orgad Shaneh Committed by Orgad Shaneh
Browse files

Git: Fix regexp for cherry-pick and revert conflict



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

Change-Id: I3a7d1dcbed1aa7c78e9a96cafdb3c0d1e65edc7a
Reviewed-by: default avatarTobias Hunger <tobias.hunger@digia.com>
parent 497eb164
......@@ -2105,7 +2105,7 @@ bool GitClient::executeAndHandleConflicts(const QString &workingDirectory,
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) ([^\\n]*)$"));
QRegExp conflictedCommit(QLatin1String("could not (?:apply|revert) ([^\\n]*)"));
conflictedCommit.indexIn(resp.stdErr);
handleMergeConflicts(workingDirectory, conflictedCommit.cap(1), abortCommand);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment