summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorLibravatar David Aguilar <davvid@gmail.com>2021-09-30 18:37:53 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2021-09-30 18:48:51 -0700
commit4ac9f15492b69ef3a0334ca66b1ef4be00c79b47 (patch)
treeca3fbd829dbf1b5ccfad7e598dbe2548aa6247f5 /merge-recursive.c
parentMerge branch 'da/difftool-dir-diff-symlink-fix' into da/difftool (diff)
downloadtgif-4ac9f15492b69ef3a0334ca66b1ef4be00c79b47.tar.xz
difftool: create a tmpdir path without repeated slashes
The paths generated by difftool are passed to user-facing diff tools. Using paths with repeated slashes in them is a cosmetic blemish that is exposed to users and can be avoided. Use a strbuf to create the buffer used for the dir-diff tmpdir. Strip trailing slashes from the value read from TMPDIR to avoid repeated slashes in the generated paths. Adjust the error handling to avoid leaking strbufs and to avoid returning -1 to cmd_main(). Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.c')
0 files changed, 0 insertions, 0 deletions