diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2018-03-09 15:25:50 +0100 |
|---|---|---|
| committer | Ola Røer Thorsen <ola@silentwings.no> | 2018-03-12 07:59:01 +0000 |
| commit | 57523e6cd3fe880b03dec8adddb304341f13261b (patch) | |
| tree | afad30c040cbb393e5824eea35b5c8120803d5b4 /share | |
| parent | 0ea6691c8fa0b91c496aa53679064a2e18c19e10 (diff) | |
vcs module: Make sure the git meta data directory is absolute
git rev-parse --git-dir prints a relative or an absolute path, depending
on whether you call it from the repository base directory or not. Our
code now accounts for that.
Change-Id: Iac5eeb0fc55fe83d6c588efbcf97cab6786a4f89
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Reviewed-by: Ola Røer Thorsen <ola@silentwings.no>
Diffstat (limited to 'share')
| -rw-r--r-- | share/qbs/modules/vcs/vcs-module.qbs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/share/qbs/modules/vcs/vcs-module.qbs b/share/qbs/modules/vcs/vcs-module.qbs index 290547713..a56eb3b49 100644 --- a/share/qbs/modules/vcs/vcs-module.qbs +++ b/share/qbs/modules/vcs/vcs-module.qbs @@ -51,6 +51,8 @@ Module { found = true; type = "git"; metaDataBaseDir = detector.readStdOut().trim(); + if (!FileInfo.isAbsolutePath(metaDataBaseDir)) + metaDataBaseDir = FileInfo.joinPaths(theRepoDir, metaDataBaseDir); return; } if (detector.exec(tool || "svn", |