development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-07-17 11:07:55 +00:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

mergetools/p4merge: Handle "/dev/null"

Browse source 
p4merge does not properly handle the case where "/dev/null"
is passed as a filename.

Work it around by creating a temporary file for this purpose.

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>
---

 Needs to be amended with Tested-by when a report comes...
This commit is contained in:
David Aguilar 2012-10-10 20:22:36 -07:00 committed by Junio C Hamano
parent 40701adbcb
commit 3facc60031
1 changed files with 25 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
mergetools/p4merge
View file

@ -1,5 +1,30 @@
diff_cmd () {
# 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
fi
if test "/dev/null" = "$REMOTE"
then
REMOTE="./p4merge-dev-null.REMOTE.$$"
>"$REMOTE"
rm_remote=true
fi
"$merge_tool_path" "$LOCAL" "$REMOTE"
if test -n "$rm_local"
then
rm -f "$LOCAL"
fi
if test -n "$rm_remote"
then
rm -f "$REMOTE"
fi
}
merge_cmd () {