From 610a355eb393dc461fbbcc2286d626a009b79f73 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Sun, 17 Feb 2013 10:57:00 +0200 Subject: [PATCH] Git: Fix cherry-pick/revert commit resolving on conflict Change-Id: I3dee32864f1000afce098c1716307929b4da2462 Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 07c7bc6c834..351108acdba 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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); }