summaryrefslogtreecommitdiff
path: root/xdiff-interface.c
diff options
context:
space:
mode:
authorLibravatar John Keeping <john@keeping.me.uk>2013-04-27 14:24:16 +0100
committerLibravatar Pat Thoyts <patthoyts@users.sourceforge.net>2013-06-07 23:03:29 +0100
commit2f38dd03fcefb7ad3a6db2703eeb6dd9b4fd34b6 (patch)
tree0ac14cc5c417d7059c7cf3d7138a3e0a0f752c02 /xdiff-interface.c
parentgit-gui: bring wish process to front on Mac (diff)
downloadtgif-2f38dd03fcefb7ad3a6db2703eeb6dd9b4fd34b6.tar.xz
git-gui: fix file name handling with non-empty prefix
Commit e3d06ca (git-gui: Detect full path when parsing arguments - 2012-10-02) fixed the handling of absolute paths passed to the browser and blame subcommands by checking whether the file exists without the prefix before prepending the prefix and checking again. Since we have chdir'd to the top level of the working tree before doing this, this does not work if a file with the same name exists in a subdirectory and at the top level (for example Makefile in git.git's t/ directory). Instead of doing this, revert that patch and fix absolute path issue by using "file join" to prepend the prefix to the supplied path. This will correctly handle absolute paths by skipping the prefix in that case. Acked-by: Andrew Wong <andrew.kw.w@gmail.com> Signed-off-by: John Keeping <john@keeping.me.uk> Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Diffstat (limited to 'xdiff-interface.c')
0 files changed, 0 insertions, 0 deletions