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

GitClient: Replace rev-list command with QtcProcess

Browse Source 
There is no need to use VcsCommand when NoOutput is passed.
Get rid of asyncUpstreamStatus().

Change-Id: Iae6869be9640c7662545906d28314ac47cd69e3d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
Jarek Kobus
2022-09-01 16:42:54 +02:00
parent 28fdeefe6f
commit 4e74e2aa03
3 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3166,15 +3166,6 @@ bool GitClient::synchronousSetTrackingBranch(const FilePath &workingDirectory,
return result.result() == ProcessResult::FinishedWithSuccess;
}
VcsCommand *GitClient::asyncUpstreamStatus(const FilePath &workingDirectory,
const QString &branch,
const QString &upstream)
{
const QStringList args {"rev-list", noColorOption, "--left-right", "--count",
branch + "..." + upstream};
return vcsExec(workingDirectory, args, nullptr, false, VcsCommand::NoOutput);
}
void GitClient::handleMergeConflicts(const FilePath &workingDir, const QString &commit,
const QStringList &files, const QString &abortCommand)
{