diff options
| author | Brandon Casey <drafnel@gmail.com> | 2013-02-22 14:05:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-02-23 00:03:00 -0800 |
| commit | 8c613fd5efa1c3bbd48845ed91c533192e699c08 (patch) | |
| tree | f8e42a81f5469406ad5f04324ef8e1ce7e2f6d00 /t/t7502-commit.sh | |
| parent | 959a26231f53b9cc7da40d36c550aef193647731 (diff) | |
| download | git-8c613fd5efa1c3bbd48845ed91c533192e699c08.tar.gz git-8c613fd5efa1c3bbd48845ed91c533192e699c08.tar.xz | |
git-commit: populate the edit buffer with 2 blank lines before s-o-b
'commit -s' populates the edit buffer with a blank line before the
Signed-off-by line, to allow the user to immediately start typing
the log message. But commit 33f2f9ab removed this space, forcing
the user to first push the Signed-off-by line down to open a place
to type the log message.
Fix this regression and let's ensure that the Signed-off-by line is
preceded by two blank lines, instead of just one, to hint that
something should be filled in, and that a blank line should separate
it from the body and the Signed-off-by line.
Add a test for this behavior.
Reported-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Brandon Casey <drafnel@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t7502-commit.sh')
| -rwxr-xr-x | t/t7502-commit.sh | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/t/t7502-commit.sh b/t/t7502-commit.sh index deb187eb7..c06a7526c 100755 --- a/t/t7502-commit.sh +++ b/t/t7502-commit.sh @@ -349,6 +349,18 @@ test_expect_success 'A single-liner subject with a token plus colon is not a foo ' +test_expect_success 'commit -s places sob on third line after two empty lines' ' + git commit -s --allow-empty --allow-empty-message && + cat <<-EOF >expect && + + + Signed-off-by: $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> + + EOF + sed -e "/^#/d" -e "s/^:.*//" .git/COMMIT_EDITMSG >actual && + test_cmp expect actual +' + write_script .git/FAKE_EDITOR <<\EOF mv "$1" "$1.orig" ( |