From fdb6ef90fc7a695e2b8d37abdfcf48fe0d8afb03 Mon Sep 17 00:00:00 2001 From: Orgad Shaneh Date: Wed, 2 Oct 2013 00:18:39 +0300 Subject: VCS: Do not try to add files that are already tracked Task-number: QTCREATORBUG-2455 Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee Reviewed-by: Nikita Baryshnikov Reviewed-by: Cristian Tibirna Reviewed-by: Tobias Hunger --- src/plugins/git/gitclient.cpp | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'src/plugins/git/gitclient.cpp') diff --git a/src/plugins/git/gitclient.cpp b/src/plugins/git/gitclient.cpp index 413f663e90..eab02e8c05 100644 --- a/src/plugins/git/gitclient.cpp +++ b/src/plugins/git/gitclient.cpp @@ -972,6 +972,15 @@ QString GitClient::findGitDirForRepository(const QString &repositoryDir) const return res; } +bool GitClient::managesFile(const QString &workingDirectory, const QString &fileName) const +{ + QByteArray output; + QStringList arguments; + arguments << QLatin1String("ls-files") << QLatin1String("--error-unmatch") << fileName; + return fullySynchronousGit(workingDirectory, arguments, &output, 0, + VcsBasePlugin::SuppressCommandLogging); +} + VcsBase::VcsBaseEditorWidget *GitClient::findExistingVCSEditor(const char *registerDynamicProperty, const QString &dynamicPropertyValue) const { -- cgit v1.2.1