kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'da/p4merge-mktemp' into maint 

* da/p4merge-mktemp:
  mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder
maint
Junio C Hamano 2013-02-25 08:03:20 -08:00
parent 4f021b34f2 950b5680bd
commit a8e00d7b83
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mergetools/p4merge
View File

@ -1,29 +1,21 @@
diff_cmd () { diff_cmd () {
empty_file=

# p4merge does not like /dev/null # p4merge does not like /dev/null
rm_local=
rm_remote=
if test "/dev/null" = "$LOCAL" if test "/dev/null" = "$LOCAL"
then then
LOCAL="./p4merge-dev-null.LOCAL.$$" LOCAL="$(create_empty_file)"
>"$LOCAL"
rm_local=true
fi fi
if test "/dev/null" = "$REMOTE" if test "/dev/null" = "$REMOTE"
then then
REMOTE="./p4merge-dev-null.REMOTE.$$" REMOTE="$(create_empty_file)"
>"$REMOTE"
rm_remote=true
fi fi


"$merge_tool_path" "$LOCAL" "$REMOTE" "$merge_tool_path" "$LOCAL" "$REMOTE"


if test -n "$rm_local" if test -n "$empty_file"
then then
rm -f "$LOCAL" rm -f "$empty_file"
fi
if test -n "$rm_remote"
then
rm -f "$REMOTE"
fi fi
} }


@ -33,3 +25,10 @@ merge_cmd () {
"$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED" "$merge_tool_path" "$BASE" "$LOCAL" "$REMOTE" "$MERGED"
check_unchanged check_unchanged
} }

create_empty_file () {
empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
>"$empty_file"

printf "$empty_file"
}