diff options
| author | Orgad Shaneh <[email protected]> | 2021-07-07 12:13:36 +0300 |
|---|---|---|
| committer | Orgad Shaneh <[email protected]> | 2021-07-07 10:16:54 +0000 |
| commit | d2aa0f4ed9cd721b2658550e69ea3059d8f70f77 (patch) | |
| tree | ad407f348785949007094219ff72360231950301 /src/plugins/git/gitclient.cpp | |
| parent | e065107fa537238aa65c097d24b649a0de9f5f9b (diff) | |
Git: Fix regression on cherry-pick
Amends commit 55f768e1b0a2f49977a48972b243d3efa255e337.
Fixes: QTCREATORBUG-25975
Change-Id: Ie49b64f777bd7155cc226b70c0c473a5ac1ce282
Reviewed-by: Robert Löhning <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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) |