From 296fa99334ff9fc0ca1ea01bce5f53d7ae248d5f Mon Sep 17 00:00:00 2001 From: Andrew Pimlott Date: Mon, 1 Jul 2013 09:20:35 -0700 Subject: [PATCH 1/2] lib-rebase: document exec_ in FAKE_LINES Signed-off-by: Andrew Pimlott Signed-off-by: Junio C Hamano --- t/lib-rebase.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 6ccf797091..8098a88c82 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. From f66d000b0d7d6d3c858f3aacd9a67d4809ac8011 Mon Sep 17 00:00:00 2001 From: Andrew Pimlott Date: Mon, 1 Jul 2013 09:20:36 -0700 Subject: [PATCH 2/2] t7500: fix flipped actual/expect Signed-off-by: Andrew Pimlott Signed-off-by: Junio C Hamano --- t/t7500-commit.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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.