summaryrefslogtreecommitdiff
path: root/bundle.c
diff options
context:
space:
mode:
authorLukas Fleischer <git@cryptocrack.de>2013-04-07 13:53:15 +0200
committerJunio C Hamano <gitster@pobox.com>2013-04-07 14:45:56 -0700
commit5446e33f35d6b27b6b760a59a6ded33fbd555190 (patch)
tree6e5cd11927d1aefc4da834c0e8bd0f428dfcdcee /bundle.c
parent2137ce01f83d254e4917c107901a5a04f61e8c16 (diff)
downloadgit-5446e33f35d6b27b6b760a59a6ded33fbd555190.tar.gz
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 <git@cryptocrack.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'bundle.c')
-rw-r--r--bundle.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/bundle.c b/bundle.c
index 505e07e934..4b0e5cd51b 100644
--- a/bundle.c
+++ b/bundle.c
@@ -57,7 +57,7 @@ static int parse_bundle_header(int fd, struct bundle_header *header,
* followed by SP and subject line.
*/
if (get_sha1_hex(buf.buf, sha1) ||
- (40 <= buf.len && !isspace(buf.buf[40])) ||
+ (buf.len > 40 && !isspace(buf.buf[40])) ||
(!is_prereq && buf.len <= 40)) {
if (report_path)
error(_("unrecognized header: %s%s (%d)"),