diff options
| author |  John Keeping <john@keeping.me.uk> | 2013-03-14 20:19:40 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2013-03-14 14:29:05 -0700 |
| commit | e0976dcf83884fd0b48e90f0c62f50852e6971f6 (patch) | |
| tree | b46d2436505015c1a87b94206891a4b2c0ee1eec | |
| parent | git-difftool(1): fix formatting of --symlink description (diff) | |
| download | tgif-e0976dcf83884fd0b48e90f0c62f50852e6971f6.tar.xz | |
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>
| -rwxr-xr-x | git-difftool.perl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/git-difftool.perl b/git-difftool.perl index 0a90de4146..3cab257595 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") { |