| commit | 2f5d527ffbf470bcbf11ab3af0f6eb0b7f4b3071 | |
| author | Sven Strickroth <email@cs-ware.de> | |
| Wed, 6 Feb 2019 21:22:20 +0000 (6 22:22 +0100) | ||
| committer | Sven Strickroth <email@cs-ware.de> | |
| Wed, 6 Feb 2019 21:22:20 +0000 (6 22:22 +0100) | ||
| tree | 883c1a51d3c3c01bb5db86d73e1cf5f85adcc93e | treesnapshot (tar.gz zip) |
| parent | db6d23cd1ed3eb83d87b4ff8e599af4f422e9638 | commitdiff |
Fix viewing and resolving conflicts of a submodule with a git-link-file containing a relative path
The relative git path of the submodule was passed to GitAdminDir::ReadGitLink, then a relative path in the .git file caused a wrong path to the adminDir to be generated.
Regression of commit b338858dd98c1a391aa1ec2a5e105fd94c94bced.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
The relative git path of the submodule was passed to GitAdminDir::ReadGitLink, then a relative path in the .git file caused a wrong path to the adminDir to be generated.
Regression of commit b338858dd98c1a391aa1ec2a5e105fd94c94bced.
Signed-off-by: Sven Strickroth <email@cs-ware.de>
| src/TortoiseProc/AppUtils.cpp | diffblobblamehistory | |
| src/TortoiseProc/GitDiff.cpp | diffblobblamehistory |