[PATCH v2 2/3] difftool: avoid double slashes in symlink targets
- From
John Keeping <john@keeping.me.uk>
- Date
- Mar 14, 2013, 20:19 UTC
- Message-ID
- <b10c6d19bd4004887868dd7626320bd676fee540.1363291949.git.john@keeping.me.uk>
- In-Reply-To
- <cover.1363291949.git.john@keeping.me.uk>
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> --- git-difftool.perl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/git-difftool.perl b/git-difftool.perl index 12231fb..e594f9c 100755 --- a/git-difftool.perl +++ b/git-difftool.perl @@ -209,7 +209,9 @@ EOF delete($ENV{GIT_INDEX_FILE}); # Changes in the working tree need special treatment since they are - # not part of the index + # not part of the index. Remove any trailing slash from $workdir + # before starting to avoid double slashes in symlink targets. + $workdir =~ s|/$||; for my $file (@working_tree) { my $dir = dirname($file); unless (-d "$rdir/$dir") {
-- 1.8.2.396.g36b63d6