Merge branch 'maint'
* maint: t7500: fix flipped actual/expect lib-rebase: document exec_ in FAKE_LINES
This commit is contained in:
commit
8c4e4ec3ff
@ -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.
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user