summaryrefslogtreecommitdiff
path: root/builtin/clone.c
diff options
context:
space:
mode:
authorDavid Aguilar <davvid@gmail.com>2012-12-27 00:45:29 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-12-27 02:13:15 (GMT)
commit950b5680bdacd3eaa4a528f4dc2d5652f1beb88d (patch)
tree2654842e7328bfa17c47fecf0e99c95e9665233d /builtin/clone.c
parent18499ba694711c02a5bc729b7f8e362dd760b10a (diff)
downloadgit-950b5680bdacd3eaa4a528f4dc2d5652f1beb88d.zip
git-950b5680bdacd3eaa4a528f4dc2d5652f1beb88d.tar.gz
git-950b5680bdacd3eaa4a528f4dc2d5652f1beb88d.tar.bz2
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
Use $TMPDIR when creating the /dev/null placeholder for p4merge. This prevents users from finding a seemingly random untracked file in their worktree. This is different than what mergetool does with $LOCAL and $REMOTE because those files exist to aid users when resolving merges. p4merge's /dev/null placeholder is not helpful in that situation so it is sensible to keep it out of the worktree. Reported-by: Jeremy Morton <admin@game-point.net> Signed-off-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin/clone.c')
0 files changed, 0 insertions, 0 deletions