summaryrefslogtreecommitdiff
path: root/xdiff/xmerge.c
diff options
context:
space:
mode:
authorLibravatar Jiang Xin <worldhello.net@gmail.com>2013-10-14 10:29:39 +0800
committerLibravatar Jonathan Nieder <jrnieder@gmail.com>2013-10-14 07:00:26 -0700
commit7fbd422162f2b49bc06a29a063f519450165dc86 (patch)
tree206305e4a38d3e6858d89f7d11dfb48fb0b082c0 /xdiff/xmerge.c
parenttest: use unambigous leading path (/foo) for MSYS (diff)
downloadtgif-7fbd422162f2b49bc06a29a063f519450165dc86.tar.xz
relative_path should honor dos-drive-prefix
Tvangeste found that the "relative_path" function could not work properly on Windows if "in" and "prefix" have DOS drive prefix (such as "C:/windows"). ($gmane/234434) E.g., When execute: test-path-utils relative_path "C:/a/b" "D:/x/y", should return "C:/a/b", but returns "../../C:/a/b", which is wrong. So make relative_path honor DOS drive prefix, and add test cases for it in t0060. Reported-by: Tvangeste <i.4m.l33t@yandex.ru> Helped-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Jiang Xin <worldhello.net@gmail.com> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
Diffstat (limited to 'xdiff/xmerge.c')
0 files changed, 0 insertions, 0 deletions