user/sven/git.git/builtin/commit.c, branch v1.8.3.3

Merge branch 'rs/commit-m-no-edit' into maint

2013-06-27T21:38:07Z

* rs/commit-m-no-edit: commit: don't start editor if empty message is given with -m

commit: don't start editor if empty message is given with -m

2013-05-28T21:33:01Z

If an empty message is specified with the option -m of git commit then the editor is started. That's unexpected and unnecessary. Instead of using the length of the message string for checking if the user specified one, directly remember if the option -m was given. Reported-by: Mislav Marohnić Signed-off-by: René Scharfe Signed-off-by: Junio C Hamano

pretty: save commit encoding from logmsg_reencode if the caller needs it

2013-04-18T23:28:27Z

The commit encoding is parsed by logmsg_reencode, there's no need for the caller to re-parse it again. The reencoded message now has the new encoding, not the original one. The caller would need to read commit object again before parsing. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

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

2013-04-01T15:59:24Z

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

git-commit: only append a newline to -m mesg if necessary

2013-02-19T17:30:50Z

Currently, git will append two newlines to every message supplied via the -m switch. The purpose of this is to allow -m to be supplied multiple times and have each supplied string become a paragraph in the resulting commit message. Normally, this does not cause a problem since any trailing newlines will be removed by the cleanup operation. If cleanup=verbatim for example, then the trailing newlines will not be removed and will survive into the resulting commit message. Instead, let's ensure that the string supplied to -m is newline terminated, but only append a second newline when appending additional messages. Fixes the test in t7502. Signed-off-by: Brandon Casey Reviewed-by: Jonathan Nieder Signed-off-by: Junio C Hamano

Merge branch 'maint'

2013-02-12T20:23:12Z

* maint: Replace filepattern with pathspec for consistency

sequencer.c: teach append_signoff how to detect duplicate s-o-b

2013-02-12T19:17:10Z

Teach append_signoff how to detect a duplicate s-o-b in the commit footer. This is in preparation to unify the append_signoff implementations in log-tree.c and sequencer.c. Fixes test in t3511. Signed-off-by: Brandon Casey Signed-off-by: Junio C Hamano

Replace filepattern with pathspec for consistency

2013-02-12T18:05:38Z

pathspec is the most widely used term, and is the one defined in gitglossary.txt. was used only in the synopsys for git-add and git-commit, and in git-add.txt. Get rid of it. This patch is obtained with by running: perl -pi -e 's/filepattern/pathspec/' `git grep -l filepattern` Signed-off-by: Matthieu Moy Signed-off-by: Junio C Hamano

Merge branch 'jk/read-commit-buffer-data-after-free'

2013-02-04T18:25:18Z

Clarify the ownership rule for commit->buffer field, which some callers incorrectly accessed without making sure it is populated. * jk/read-commit-buffer-data-after-free: logmsg_reencode: lazily load missing commit buffers logmsg_reencode: never return NULL commit: drop useless xstrdup of commit message

Merge branch 'jc/custom-comment-char'

2013-02-04T18:23:49Z

Allow a configuration variable core.commentchar to customize the character used to comment out the hint lines in the edited text from the default '#'. * jc/custom-comment-char: Allow custom "comment char"