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

Merge branch 'bc/append-signed-off-by'

Browse Source 
Consolidate codepaths that inspect log-message-to-be and decide to
add a new Signed-off-by line in various commands.

* bc/append-signed-off-by:
  git-commit: populate the edit buffer with 2 blank lines before s-o-b
  Unify appending signoff in format-patch, commit and sequencer
  format-patch: update append_signoff prototype
  t4014: more tests about appending s-o-b lines
  sequencer.c: teach append_signoff to avoid adding a duplicate newline
  sequencer.c: teach append_signoff how to detect duplicate s-o-b
  sequencer.c: always separate "(cherry picked from" from commit body
  sequencer.c: require a conforming footer to be preceded by a blank line
  sequencer.c: recognize "(cherry picked from ..." as part of s-o-b footer
  t/t3511: add some tests of 'cherry-pick -s' functionality
  t/test-lib-functions.sh: allow to specify the tag name to test_commit
  commit, cherry-pick -s: remove broken support for multiline rfc2822 fields
  sequencer.c: rework search for start of footer to improve clarity
This commit is contained in:
Junio C Hamano
2013-04-01 08:59:23 -07:00
parent f161fb041e 8c613fd5ef
commit 900c8ecb5c
10 changed files with 650 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
t/test-lib-functions.sh
View File

@ -135,12 +135,12 @@ test_pause () {
fi
}
# Call test_commit with the arguments "<message> [<file> [<contents>]]"
# Call test_commit with the arguments "<message> [<file> [<contents> [<tag>]]]"
#
# This will commit a file with the given contents and the given commit
# message. It will also add a tag with <message> as name.
# message, and tag the resulting commit with the given tag name.
#
# Both <file> and <contents> default to <message>.
# <file>, <contents>, and <tag> all default to <message>.
test_commit () {
notick= &&
@ -168,7 +168,7 @@ test_commit () {
test_tick
fi &&
git commit $signoff -m "$1" &&
git tag "$1"
git tag "${4:-$1}"
}
# Call test_merge with the arguments "<message> <commit>", where <commit>