Merge branch 'da/p4merge-mktemp-fix' into maint

gitster · gitster · commit 92f561d7f0f2 · 2013-02-25T08:04:05.000-08:00
* da/p4merge-mktemp-fix:
  p4merge: fix printf usage
diff --git a/mergetools/p4merge b/mergetools/p4merge
@@ -30,5 +30,5 @@ create_empty_file () {
 	empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"
 	>"$empty_file"
 
-	printf "$empty_file"
+	printf "%s" "$empty_file"
 }

Original file line number	Diff line number	Diff line change
`@@ -30,5 +30,5 @@ create_empty_file () {`
`30`	`30`	`empty_file="${TMPDIR:-/tmp}/git-difftool-p4merge-empty-file.$$"`
`31`	`31`	`>"$empty_file"`
`32`	`32`
`33`		`- printf "$empty_file"`
	`33`	`+ printf "%s" "$empty_file"`
`34`	`34`	`}`