From d2aa0f4ed9cd721b2658550e69ea3059d8f70f77 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 7 Jul 2021 12:13:36 +0300 Subject: [PATCH] Git: Fix regression on cherry-pick MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amends commit 55f768e1b0a2f49977a48972b243d3efa255e337. Fixes: QTCREATORBUG-25975 Change-Id: Ie49b64f777bd7155cc226b70c0c473a5ac1ce282 Reviewed-by: Robert Löhning --- 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 c9173666133..c1bbeec724c 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -1823,7 +1823,7 @@ bool GitClient::isRemoteCommit(const QString &workingDirectory, const QString &c { QtcProcess proc; vcsFullySynchronousExec(proc, workingDirectory, {"branch", "-r", "--contains", commit}, silentFlags); - return proc.rawStdOut().isEmpty(); + return !proc.rawStdOut().isEmpty(); } bool GitClient::isFastForwardMerge(const QString &workingDirectory, const QString &branch)