From 5446e33f35d6b27b6b760a59a6ded33fbd555190 Mon Sep 17 00:00:00 2001 From: Lukas Fleischer Date: Sun, 7 Apr 2013 13:53:15 +0200 Subject: bundle: Accept prerequisites without commit messages While explicitly stating that the commit message in a prerequisite line is optional, we required all lines with 40 or more characters to contain a space after the object name, bailing out if a line consisted of an object name only. This was to allow bundling a history to a commit without an message, but the code forgot that it already called rtrim() to remove that whitespace. As a workaround, only check for SP when the line has more than 40 characters. Signed-off-by: Lukas Fleischer Signed-off-by: Junio C Hamano --- t/t5704-bundle.sh | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 't/t5704-bundle.sh') diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index 9e43731fe..a45c31692 100755 --- a/t/t5704-bundle.sh +++ b/t/t5704-bundle.sh @@ -58,4 +58,14 @@ test_expect_success 'ridiculously long subject in boundary' ' grep "^-[0-9a-f]\\{40\\} " boundary ' +test_expect_success 'prerequisites with an empty commit message' ' + : >file1 && + git add file1 && + test_tick && + git commit --allow-empty-message -m "" && + test_commit file2 && + git bundle create bundle HEAD^.. && + git bundle verify bundle +' + test_done -- cgit v1.2.1