mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
* maint:
  t7500: fix flipped actual/expect
  lib-rebase: document exec_ in FAKE_LINES
This commit is contained in:
Junio C Hamano
2013-07-01 12:46:54 -07:00
parent 51f11d69b1 f66d000b0d
commit 8c4e4ec3ff
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
t/lib-rebase.sh
View File

@ -17,6 +17,8 @@
# ("squash", "fixup", "edit", or "reword") and the SHA1 taken # ("squash", "fixup", "edit", or "reword") and the SHA1 taken
# from the specified line. # from the specified line.
# #
# "exec_cmd_with_args" -- add an "exec cmd with args" line.
#
# "#" -- Add a comment line. # "#" -- Add a comment line.
# #
# ">" -- Add a blank line. # ">" -- Add a blank line.

6
t/t7500-commit.sh
View File

@ -13,9 +13,9 @@ commit_msg_is () {
expect=commit_msg_is.expect expect=commit_msg_is.expect
actual=commit_msg_is.actual actual=commit_msg_is.actual
printf "%s" "$(git log --pretty=format:%s%b -1)" >$expect && printf "%s" "$(git log --pretty=format:%s%b -1)" >"$actual" &&
printf "%s" "$1" >$actual && printf "%s" "$1" >"$expect" &&
test_i18ncmp $expect $actual test_i18ncmp "$expect" "$actual"
} }
# A sanity check to see if commit is working at all. # A sanity check to see if commit is working at all.