feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Git: Fix regression on cherry-pick

Browse Source 
Amends commit 55f768e1b0.

Fixes: QTCREATORBUG-25975
Change-Id: Ie49b64f777bd7155cc226b70c0c473a5ac1ce282
Reviewed-by: Robert Löhning <robert.loehning@qt.io>
This commit is contained in:
Orgad Shaneh
2021-07-07 12:13:36 +03:00
committed by Orgad Shaneh
parent e065107fa5
commit d2aa0f4ed9
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/git/gitclient.cpp
View File

@@ -1823,7 +1823,7 @@ bool GitClient::isRemoteCommit(const QString &workingDirectory, const QString &c
{ {
QtcProcess proc; QtcProcess proc;
vcsFullySynchronousExec(proc, workingDirectory, {"branch", "-r", "--contains", commit}, silentFlags); 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) bool GitClient::isFastForwardMerge(const QString &workingDirectory, const QString &branch)