delta/git.git/t/t7500-commit.sh, branch sb/string-list

commit: do not complain of empty messages from -C

2014-04-28T16:58:09+00:00

When we pick another commit's message, we die() immediately
if we find that it's empty and we are not going to run an
editor (i.e., when running "-C" instead of "-c").  However,
this check is redundant and harmful.

It's redundant because we will already notice the empty
message later, after we would have run the editor, and die
there (just as we would for a regular, not "-C" case, where
the user provided an empty message in the editor).

It's harmful for a few reasons:

  1. It does not respect --allow-empty-message. As a result,
     a "git rebase -i" cannot "pick" such a commit. So you
     cannot even go back in time to fix it with a "reword"
     or "edit" instruction.

  2. It does not take into account other ways besides the
     editor to modify the message. For example, "git commit
     -C empty-commit -m foo" could take the author
     information from empty-commit, but add a message to it.
     There's more to do to make that work correctly (and
     right now we explicitly forbid "-C with -m"), but this
     removes one roadblock.

  3. The existing check is not enough to prevent segfaults.
     We try to find the "\n\n" header/body boundary in the
     commit. If it is at the end of the string (i.e., no
     body), _or_ if we cannot find it at all (i.e., a
     truncated commit object), we consider the message
     empty. With "-C", that's OK; we die in either case. But
     with "-c", we continue on, and in the case of a
     truncated commit may end up dereferencing NULL+2.

Signed-off-by: Jeff King 
Signed-off-by: Junio C Hamano

t7500: fix flipped actual/expect

2013-07-01T16:53:00+00:00

Signed-off-by: Andrew Pimlott 
Signed-off-by: Junio C Hamano

t7500: use test_config to set/unset git config variables

2013-03-25T15:50:53+00:00

Instead of using construct such as:
    test_when_finished "git config --unset "
    git config  
uses
    test_config  
The latter takes care of removing  at the end of the test.

Signed-off-by: Yann Droneaud 
Signed-off-by: Junio C Hamano

Merge branch 'bf/commit-template-no-cleanup'

2011-05-13T18:03:08+00:00

* bf/commit-template-no-cleanup:
  Do not strip empty lines / trailing spaces from a commit message template

Do not strip empty lines / trailing spaces from a commit message template

2011-05-11T18:20:28+00:00

Templates should be just that: A form that the user fills out, and forms
have blanks. If people are attached to not having extra whitespace in the
editor, they can simply clean up their templates.

Added test with editor adding even more whitespace.

Signed-off-by: Boris Faure 
Based-on-patch-by:Sebastian Schuberth 
Signed-off-by: Junio C Hamano

i18n: use test_i18ncmp in t7500

2011-04-13T22:52:47+00:00

Signed-off-by: Junio C Hamano

Merge branch 'ab/i18n-st'

2011-04-02T00:55:55+00:00

* ab/i18n-st: (69 commits)
  i18n: git-shortlog basic messages
  i18n: git-revert split up "could not revert/apply" message
  i18n: git-revert literal "me" messages
  i18n: git-revert "Your local changes" message
  i18n: git-revert basic messages
  i18n: git-notes GIT_NOTES_REWRITE_MODE error message
  i18n: git-notes basic commands
  i18n: git-gc "Auto packing the repository" message
  i18n: git-gc basic messages
  i18n: git-describe basic messages
  i18n: git-clean clean.requireForce messages
  i18n: git-clean basic messages
  i18n: git-bundle basic messages
  i18n: git-archive basic messages
  i18n: git-status "renamed: " message
  i18n: git-status "Initial commit" message
  i18n: git-status "Changes to be committed" message
  i18n: git-status shortstatus messages
  i18n: git-status "nothing to commit" messages
  i18n: git-status basic messages
  ...

Conflicts:
	builtin/branch.c
	builtin/checkout.c
	builtin/clone.c
	builtin/commit.c
	builtin/grep.c
	builtin/merge.c
	builtin/push.c
	builtin/revert.c
	t/t3507-cherry-pick-conflict.sh
	t/t7607-merge-overwrite.sh

i18n: git-commit "enter the commit message" message

2011-03-10T07:52:54+00:00

Gettextize the "# Please enter the commit message for your changes."
message. Several tests in t7500-commit.sh and t7502-commit.sh assume
that this message starts with a newline. Change the tests to to skip
under GETTEXT_POISON=YesPlease.

These fail under GETTEXT_POISON=YesPlease because the poison editor
message doesn't do the right thing with comments and line breaks, so
these messages will be incorrectly broken up across lines.

This test should not be skipped under a hypothetical future testing
mode that tests Git under language locales, since those messages
should all start with a newline like the original.

Signed-off-by: Ævar Arnfjörð Bjarmason 
Signed-off-by: Junio C Hamano

Merge branch 'jn/maint-commit-missing-template'

2011-03-04T23:02:27+00:00

* jn/maint-commit-missing-template:
  commit: error out for missing commit message template

commit: error out for missing commit message template

2011-02-25T20:13:55+00:00

When "git commit" was rewritten in C (v1.5.4-rc0~78^2~30,
2007-11-08), a subtle bug in --template was introduced.  If the
file named by a --template parameter is missing, previously git
would error out with a message:

	Commit template file does not exist.

but in the C version the --template parameter gets ignored and
the default template is used.

t7500 has two tests for this case which would have caught it, except
that with the default $EDITOR, the commit message template is left
unmodified, causing 'git commit' to error out and the test to
succeed.

Signed-off-by: Jonathan Nieder 
Signed-off-by: Junio C Hamano