diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-04-22 11:26:55 -0700 |
| commit | 2903c28ebb04ad99722cd0f99a4fe09c5f3e8aa0 (patch) | |
| tree | 941d127c6d58691c6d4a882f36ffc4f9bcc5d002 | |
| parent | 13e11087fed94279a5364dd87230586fb87baf8b (diff) | |
| parent | 5446e33f35d6b27b6b760a59a6ded33fbd555190 (diff) | |
| download | git-2903c28ebb04ad99722cd0f99a4fe09c5f3e8aa0.tar.gz git-2903c28ebb04ad99722cd0f99a4fe09c5f3e8aa0.tar.xz | |
Merge branch 'lf/bundle-with-tip-wo-message' into maint
* 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 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 |