mirror of
https://github.com/git/git.git
synced 2024-11-16 14:04:52 +01:00
5446e33f35
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>
71 lines
1.8 KiB
Bash
Executable file
71 lines
1.8 KiB
Bash
Executable file
#!/bin/sh
|
|
|
|
test_description='some bundle related tests'
|
|
. ./test-lib.sh
|
|
|
|
test_expect_success 'setup' '
|
|
test_commit initial &&
|
|
test_tick &&
|
|
git tag -m tag tag &&
|
|
test_commit second &&
|
|
test_commit third &&
|
|
git tag -d initial &&
|
|
git tag -d second &&
|
|
git tag -d third
|
|
'
|
|
|
|
test_expect_success 'tags can be excluded by rev-list options' '
|
|
git bundle create bundle --all --since=7.Apr.2005.15:16:00.-0700 &&
|
|
git ls-remote bundle > output &&
|
|
! grep tag output
|
|
'
|
|
|
|
test_expect_success 'die if bundle file cannot be created' '
|
|
mkdir adir &&
|
|
test_must_fail git bundle create adir --all
|
|
'
|
|
|
|
test_expect_failure 'bundle --stdin' '
|
|
echo master | git bundle create stdin-bundle.bdl --stdin &&
|
|
git ls-remote stdin-bundle.bdl >output &&
|
|
grep master output
|
|
'
|
|
|
|
test_expect_failure 'bundle --stdin <rev-list options>' '
|
|
echo master | git bundle create hybrid-bundle.bdl --stdin tag &&
|
|
git ls-remote hybrid-bundle.bdl >output &&
|
|
grep master output
|
|
'
|
|
|
|
test_expect_success 'empty bundle file is rejected' '
|
|
: >empty-bundle &&
|
|
test_must_fail git fetch empty-bundle
|
|
'
|
|
|
|
# This triggers a bug in older versions where the resulting line (with
|
|
# --pretty=oneline) was longer than a 1024-char buffer.
|
|
test_expect_success 'ridiculously long subject in boundary' '
|
|
: >file4 &&
|
|
test_tick &&
|
|
git add file4 &&
|
|
printf "%01200d\n" 0 | git commit -F - &&
|
|
test_commit fifth &&
|
|
git bundle create long-subject-bundle.bdl HEAD^..HEAD &&
|
|
git bundle list-heads long-subject-bundle.bdl >heads &&
|
|
test -s heads &&
|
|
git fetch long-subject-bundle.bdl &&
|
|
sed -n "/^-/{p;q;}" long-subject-bundle.bdl >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
|