git/t/t7502-commit.sh, branch v2.9.2

Merge branch 'pb/t7502-drop-dup'

2016-04-06T18:39:04Z

Code clean-up. * pb/t7502-drop-dup: t/t7502 : drop duplicate test

t/t7502 : drop duplicate test

2016-03-11T20:42:26Z

This extra test was introduced erroneously by f9c0181 (t7502: test commit.status, --status and --no-status, 2010-01-13) Signed-off-by: Pranit Bauva Signed-off-by: Junio C Hamano

Merge branch 'sg/commit-cleanup-scissors' into maint

2015-08-03T17:41:30Z

"git commit --cleanup=scissors" was not careful enough to protect against getting fooled by a line that looked like scissors. * sg/commit-cleanup-scissors: commit: cope with scissors lines in commit message

Merge branch 'sg/commit-cleanup-scissors'

2015-06-24T19:21:55Z

commit: cope with scissors lines in commit message

2015-06-09T19:09:44Z

The diff and submodule shortlog appended to the commit message template by 'git commit --verbose' are not stripped when the commit message contains an indented scissors line. When cleaning up a commit message with 'git commit --verbose' or '--cleanup=scissors' the code is careful and triggers only on a pure scissors line, i.e. a line containing nothing but a comment character, a space, and the scissors cut. This is good, because people can embed scissors lines in the commit message while using 'git commit --verbose', and the text they write after their indented scissors line doesn't get deleted. While doing so, however, the cleanup function only looks at the first line matching the scissors pattern and if it doesn't start at the beginning of the line, then the function just returns without performing any cleanup. This is wrong, because a "real" scissors line added by 'git commit --verbose' might follow, and in that case the diff and submodule shortlog get included in the commit message. Fix this by changing the scissors pattern to match only at the beginning of the line, yet be careful to catch scissors on the first line as well. Helped-by: Junio C Hamano Signed-off-by: SZEDER Gábor Signed-off-by: Junio C Hamano

t7502-commit.sh: fix a broken and-chain

2015-04-28T22:55:51Z

Signed-off-by: Ramsay Jones Signed-off-by: Junio C Hamano

Merge branch 'nd/status-auto-comment-char'

2014-06-06T18:36:10Z

* nd/status-auto-comment-char: commit: allow core.commentChar=auto for character auto selection config: be strict on core.commentChar

commit: allow core.commentChar=auto for character auto selection

2014-05-19T20:37:25Z

When core.commentChar is "auto", the comment char starts with '#' as in default but if it's already in the prepared message, find another char in a small subset. This should stop surprises because git strips some lines unexpectedly. Note that git is not smart enough to recognize '#' as the comment char in custom templates and convert it if the final comment char is different. It thinks '#' lines in custom templates as part of the commit message. So don't use this with custom templates. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano

commit: print "Date" line when the user has set date

2014-05-02T21:14:21Z

When we make a commit and the author is not the same as the committer (e.g., because you used "-c $commit" or "--author=$somebody"), we print the author's name and email in both the commit-message template and as part of the commit summary. This is a safety check to give the user a chance to confirm that we are doing what they expect. This patch brings the same safety for the "date" field, which may be set by "-c" or by using "--date". Note that we explicitly do not set it for $GIT_AUTHOR_DATE, as it is probably not of interest when "git commit" is being fed its parameters by a script. Signed-off-by: Jeff King Signed-off-by: Junio C Hamano

commit: add --cleanup=scissors

2014-02-25T17:35:20Z

Since 1a72cfd (commit -v: strip diffs and submodule shortlogs from the commit message - 2013-12-05) we have a less fragile way to cut out "git status" at the end of a commit message but it's only enabled for stripping submodule shortlogs. Add new cleanup option that reuses the same mechanism for the entire "git status" without accidentally removing lines starting with '#'. Signed-off-by: Nguyễn Thái Ngọc Duy Signed-off-by: Junio C Hamano