Browse Source

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
maint
Junio C Hamano 12 years ago
parent
commit
e1a3f17e9d
  1. 2
      bundle.c
  2. 10
      t/t5704-bundle.sh

2
bundle.c

@ -57,7 +57,7 @@ static int parse_bundle_header(int fd, struct bundle_header *header, @@ -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)"),

10
t/t5704-bundle.sh

@ -58,4 +58,14 @@ test_expect_success 'ridiculously long subject in boundary' ' @@ -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

Loading…
Cancel
Save