summaryrefslogtreecommitdiff
path: root/mergetools/kdiff3
diff options
context:
space:
mode:
authorLibravatar Jonathan Nieder <jrnieder@gmail.com>2011-11-16 02:03:36 -0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-11-17 15:06:27 -0800
commit418c9b176cbabf954b6325cca0bea7f9be251afe (patch)
treeda1efd67a778b6c9b4782fa69ef53ba64dbc4c75 /mergetools/kdiff3
parentGit 1.7.8-rc3 (diff)
downloadtgif-418c9b176cbabf954b6325cca0bea7f9be251afe.tar.xz
do not let git_path clobber errno when reporting errors
Because git_path() calls vsnprintf(), code like fd = open(git_path("SQUASH_MSG"), O_WRONLY | O_CREAT, 0666); die_errno(_("Could not write to '%s'"), git_path("SQUASH_MSG")); can end up printing an error indicator from vsnprintf() instead of open() by mistake. Store the path we are trying to write to in a temporary variable and pass _that_ to die_errno(), so the messages written by git cherry-pick/revert and git merge can avoid this source of confusion. Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'mergetools/kdiff3')
0 files changed, 0 insertions, 0 deletions