user/sven/git.git/t/t7500-commit.sh, branch v1.8.0.2

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

2011-05-13T18:03:08Z

* 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:28Z

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:47Z

Signed-off-by: Junio C Hamano

Merge branch 'ab/i18n-st'

2011-04-02T00:55:55Z

* 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:54Z

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:27Z

* 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:55Z

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

t/t7500-commit.sh: use test_cmp instead of test

2011-02-21T18:55:53Z

Change commit_msg_is() in t/t7500-commit.sh to use test_cmp instead of the shell's test function. Now if a test fails we'll get test_cmp output showing us what failed. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano

add tests of commit --squash

2010-11-04T20:53:36Z

t7500: test expected behavior of commit --squash t3415: test interaction of commit --squash with rebase --autosquash t3900: test commit --squash with i18n encodings Signed-off-by: Pat Notz Signed-off-by: Junio C Hamano

add tests of commit --fixup

2010-11-04T20:53:35Z

t7500: test expected behavior of commit --fixup t3415: test interaction of commit --fixup with rebase --autosquash t3900: test commit --fixup with i18n encodings Signed-off-by: Pat Notz Signed-off-by: Junio C Hamano