aboutsummaryrefslogtreecommitdiffstats
path: root/src/plugins/git/gitclient.h
diff options
context:
space:
mode:
authorOrgad Shaneh <[email protected]>2018-10-24 16:32:11 +0300
committerOrgad Shaneh <[email protected]>2018-10-25 17:52:28 +0000
commitfe873398885673fea7df8adebd3f750f79b32459 (patch)
tree00a26ec7c5d053f1e5549c7ada7e13b29f0be842 /src/plugins/git/gitclient.h
parent9c5afd8e96306b36b02e6f225ea79abcf497f279 (diff)
Git: Fix resolving top level for non-existent sub-sub-directory
When a directory is renamed, and it has sub{sub-}*directories, executing git blame on a file in the subdirectory -> Blame Revision (or parent) for the file in the previous name -> Show failed because it couldn't determine the top level directory. You can test by opening qmakeprojectmanager/wizards/filespage.cpp and blaming one of the lines that had it as qt4projectmanager/... Change-Id: I7ac964c12f1f368c5ce92e9bedd972a2bc824935 Reviewed-by: Tobias Hunger <[email protected]>
Diffstat (limited to 'src/plugins/git/gitclient.h')
-rw-r--r--src/plugins/git/gitclient.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/git/gitclient.h b/src/plugins/git/gitclient.h
index 59b64ae2027..b60cb3dfe15 100644
--- a/src/plugins/git/gitclient.h
+++ b/src/plugins/git/gitclient.h
@@ -128,7 +128,7 @@ public:
const QStringList &arguments,
bool isRebase = false);
- QString findRepositoryForDirectory(const QString &dir) const;
+ QString findRepositoryForDirectory(const QString &directory) const;
QString findGitDirForRepository(const QString &repositoryDir) const;
bool managesFile(const QString &workingDirectory, const QString &fileName) const;