difftool: avoid double slashes in symlink targets
When we add tests for symlinks in "git difftool --dir-diff" it's easier to check the target path if we don't have to worry about double slashes separating directories. Remove the trailing slash (if present) from $workdir before creating the symlinks in order to avoid this. Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Junio C Hamano <gitster@pobox.com>
John Keeping committed
Mar 14, 2013 at 20:19 UTC
e0976dcf83884fd0b48e90f0c62f50852e6971f6
1 file changed
+3
-1
git-difftool.perl
+3
-1
@@ -209,7 +209,9 @@ EOF
209
delete($ENV{GIT_INDEX_FILE});
210
211
# Changes in the working tree need special treatment since they are
212
- # not part of the index
212
+ # not part of the index. Remove any trailing slash from $workdir
213
+ # before starting to avoid double slashes in symlink targets.
214
+ $workdir =~ s|/$||;
215
for my $file (@working_tree) {
216
my $dir = dirname($file);
217
unless (-d "$rdir/$dir") {