summaryrefslogtreecommitdiff
path: root/refs.h
diff options
context:
space:
mode:
authorLibravatar Aleksander Boruch-Gruszecki <aleksander.boruchgruszecki@gmail.com>2015-02-08 17:53:53 +0100
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-02-11 11:01:50 -0800
commit204a8ffe67d2b789a34a14a06618a24756f7d9a9 (patch)
treeae27dede5a5b4501c9afd7742154554a105b2d47 /refs.h
parentMerge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5 (diff)
downloadtgif-204a8ffe67d2b789a34a14a06618a24756f7d9a9.tar.xz
merge-file: correctly open files when in a subdir
run_setup_gently() is called before merge-file. This may result in changing current working directory, which wasn't taken into account when opening a file for writing. Fix by prepending the passed prefix. Previous var is left so that error messages keep referring to the file from the user's working directory perspective. Signed-off-by: Aleksander Boruch-Gruszecki <aleksander.boruchgruszecki@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'refs.h')
0 files changed, 0 insertions, 0 deletions