diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:40:51 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-15 12:40:51 -0700 |
| commit | e1a3f17e9d81f88ed5e62d01252167daa597e5a5 (patch) | |
| tree | 699a5a972d091f0161a8d47943a661273d61f221 | |
| parent | Merge branch 'jk/show-branch-strbuf' (diff) | |
| parent | bundle: Accept prerequisites without commit messages (diff) | |
| download | tgif-e1a3f17e9d81f88ed5e62d01252167daa597e5a5.tar.xz | |
Merge branch 'lf/bundle-with-tip-wo-message'
"git bundle" did not like a bundle created using a commit without
any message as its one of the prerequistes.
* lf/bundle-with-tip-wo-message:
bundle: Accept prerequisites without commit messages
| -rw-r--r-- | bundle.c | 2 | ||||
| -rwxr-xr-x | t/t5704-bundle.sh | 10 |
2 files changed, 11 insertions, 1 deletions
@@ -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)"), diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh index 9e43731fe5..a45c31692e 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 |