From 9376c24fd0c531a8a361131d2fb833f1f503ad20 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Thu, 28 Feb 2013 11:31:47 +0200 Subject: [PATCH] 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: Tobias Hunger --- src/plugins/git/gitclient.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index eb1bdff345b..413a6cd79b6 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -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); }