summaryrefslogtreecommitdiff
path: root/git-mergetool.sh
diff options
context:
space:
mode:
authorLibravatar Eric Wong <normalperson@yhbt.net>2014-08-03 01:44:08 +0000
committerLibravatar Eric Wong <normalperson@yhbt.net>2014-09-14 08:08:24 +0000
commit4950eed520ce3dbb786e33fe8a8dc48e492998b4 (patch)
tree50f8746f5a2e34f974912561089b9026e6705c62 /git-mergetool.sh
parentgit-svn: branch: avoid systematic prompt for cert/pass (diff)
downloadtgif-4950eed520ce3dbb786e33fe8a8dc48e492998b4.tar.xz
git svn: info: correctly handle absolute path args
Calling "git svn info $(pwd)" would hit: "Reading from filehandle failed at ..." errors due to improper prefixing and canonicalization. Strip the toplevel path from absolute filesystem paths to ensure downstream canonicalization routines are only exposed to paths tracked in git (or SVN). v2: Thanks to Andrej Manduch for originally noticing the issue and fixing my original version of this to handle more corner cases such as "/path/to/top/../top" and "/path/to/top/../top/file" as shown in the new test cases. v3: Fix pathname portability problems pointed out by Johannes Sixt with a hint from brian m. carlson. Cc: Johannes Sixt <j6t@kdbg.org> Cc: "brian m. carlson" <sandals@crustytoothpaste.net> Signed-off-by: Andrej Manduch <amanduch@gmail.com> Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 'git-mergetool.sh')
0 files changed, 0 insertions, 0 deletions