diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-01 19:46:54 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-01 19:46:54 (GMT) |
| commit | 8c4e4ec3ff053331c845331645a437b01b1f0de6 (patch) | |
| tree | 2eb332d5fa1ce82ba8d561ab3abb5bd27e2fcf6a | |
| parent | 51f11d69b16ab6614b79b3b4c12d35ca2b450a22 (diff) | |
| parent | f66d000b0d7d6d3c858f3aacd9a67d4809ac8011 (diff) | |
| download | git-8c4e4ec3ff053331c845331645a437b01b1f0de6.zip git-8c4e4ec3ff053331c845331645a437b01b1f0de6.tar.gz git-8c4e4ec3ff053331c845331645a437b01b1f0de6.tar.bz2 | |
Merge branch 'maint'
* maint:
t7500: fix flipped actual/expect
lib-rebase: document exec_ in FAKE_LINES
| -rw-r--r-- | t/lib-rebase.sh | 2 | ||||
| -rwxr-xr-x | t/t7500-commit.sh | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/t/lib-rebase.sh b/t/lib-rebase.sh index 2451e6b..8ff87fb 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 436b7b6..bdc1f29 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. |