diff options
author | Junio C Hamano <gitster@pobox.com> | 2013-01-03 10:29:32 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2013-01-03 10:29:32 -0800 |
commit | 894610af58244e46d1479acfa527483f30e896ec (patch) | |
tree | 849f724b4dfc454da2122326b7f01c7951397c8b | |
parent | b81827b6b642da698e5d32fb54d74687dcf223cc (diff) | |
parent | 950b5680bdacd3eaa4a528f4dc2d5652f1beb88d (diff) | |
download | git-894610af58244e46d1479acfa527483f30e896ec.tar.gz |
Merge branch 'da/p4merge-mktemp'
Create an empty file in $TMPDIR instead of using an empty file in
the local directory.
* da/p4merge-mktemp:
mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
-rw-r--r-- | mergetools/p4merge | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/mergetools/p4merge b/mergetools/p4merge index 295361a8aa..52f7c8f705 100644 --- a/mergetools/p4merge +++ b/mergetools/p4merge @@ -1,29 +1,21 @@ diff_cmd () { + empty_file= + # p4merge does not like /dev/null - rm_local= - rm_remote= if test "/dev/null" = "$LOCAL" then - LOCAL="./p4merge-dev-null.LOCAL.$$" - >"$LOCAL" - rm_local=true + LOCAL="$(create_empty_file)" fi if test "/dev/null" = "$REMOTE" then - REMOTE="./p4merge-dev-null.REMOTE.$$" - >"$REMOTE" - rm_remote=true + REMOTE="$(create_empty_file)" fi "$merge_tool_path" "$LOCAL" "$REMOTE" - if test -n "$rm_local" - then - rm -f "$LOCAL" - fi - if test -n "$rm_remote" + if test -n "$empty_file" then - rm -f "$REMOTE" + rm -f "$empty_file" fi } @@ -33,3 +25,10 @@ merge_cmd () { "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" check_unchanged } + +create_empty_file () { + empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$" + >"$empty_file" + + printf "$empty_file" +} |