| commit | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d | |
| author | David Aguilar <davvid@gmail.com> | |
| Thu, 27 Dec 2012 00:45:29 +0000 (26 16:45 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 27 Dec 2012 02:13:15 +0000 (26 18:13 -0800) | ||
| tree | 2654842e7328bfa17c47fecf0e99c95e9665233d | treesnapshot (tar.gz zip) |
| parent | 18499ba694711c02a5bc729b7f8e362dd760b10a | commitdiff |
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>
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>
| mergetools/p4merge | diffblobblamehistory |