From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 1 Jul 2013 19:46:54 +0000 (-0700)
Subject: Merge branch 'maint'
X-Git-Tag: v1.8.4-rc0~88
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8c4e4ec3ff053331c845331645a437b01b1f0de6?hp=51f11d69b16ab6614b79b3b4c12d35ca2b450a22

Merge branch 'maint'

* maint:
t7500: fix flipped actual/expect
lib-rebase: document exec_ in FAKE_LINES
---

diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh
index 2451e6b1ea..8ff87fb3f9 100644
--- a/t/lib-rebase.sh
+++ b/t/lib-rebase.sh
@@ -17,6 +17,8 @@
 #       ("squash", "fixup", "edit", or "reword") and the SHA1 taken
 #       from the specified line.
 #
+#   "exec_cmd_with_args" -- add an "exec cmd with args" line.
+#
 #   "#" -- Add a comment line.
 #
 #   ">" -- Add a blank line.
diff --git a/t/t7500-commit.sh b/t/t7500-commit.sh
index 436b7b606e..bdc1f29503 100755
--- a/t/t7500-commit.sh
+++ b/t/t7500-commit.sh
@@ -13,9 +13,9 @@ commit_msg_is () {
 	expect=commit_msg_is.expect
 	actual=commit_msg_is.actual
 
-	printf "%s" "$(git log --pretty=format:%s%b -1)" >$expect &&
-	printf "%s" "$1" >$actual &&
-	test_i18ncmp $expect $actual
+	printf "%s" "$(git log --pretty=format:%s%b -1)" >"$actual" &&
+	printf "%s" "$1" >"$expect" &&
+	test_i18ncmp "$expect" "$actual"
 }
 
 # A sanity check to see if commit is working at all.