diff options
| author | Orgad Shaneh <orgad.shaneh@audiocodes.com> | 2013-10-02 00:18:39 +0300 |
|---|---|---|
| committer | Orgad Shaneh <orgads@gmail.com> | 2013-10-11 12:43:25 +0200 |
| commit | fdb6ef90fc7a695e2b8d37abdfcf48fe0d8afb03 (patch) | |
| tree | dbf64e035c2a58235ad16b0e0d575f300e56db36 /src/plugins/git/gitclient.cpp | |
| parent | 6f24665e7e133d9d64ea07ae37e35b9e1a1e83a7 (diff) | |
| download | qt-creator-fdb6ef90fc7a695e2b8d37abdfcf48fe0d8afb03.tar.gz | |
VCS: Do not try to add files that are already tracked
Task-number: QTCREATORBUG-2455
Change-Id: I4b1fa9676ad4a8d7293e035e4d6103251bef8aee
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>
Reviewed-by: Cristian Tibirna <tibirna@kde.org>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Diffstat (limited to 'src/plugins/git/gitclient.cpp')
| -rw-r--r-- | src/plugins/git/gitclient.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
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 { |