summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rast <trast@student.ethz.ch>2012-02-23 10:42:23 +0100
committerJunio C Hamano <gitster@pobox.com>2012-02-23 13:53:27 -0800
commit8a557bb77fc009b00f7952f0d3d6ebd33079f70e (patch)
treee2e2fd250009b3067baeb73d92910b7de43306f6
parent1c5f93b9a69f4c1c3d09853243562b9ae3bf79a6 (diff)
downloadgit-8a557bb77fc009b00f7952f0d3d6ebd33079f70e.tar.gz
t5704: match tests to modern styletr/maint-bundle-long-subject
The test did not adhere to the current style on several counts: . empty lines around the test blocks, but within the test string . ': > file' or even just '> file' with an extra space . inconsistent indentation . hand-rolled commits instead of using test_commit Fix all of them. There's a catch to the last point: test_commit creates a tag, which the original test did not create. We still change it to test_commit, and explicitly delete the tags, so as to highlight that the test relies on not having them. Signed-off-by: Thomas Rast <trast@student.ethz.ch> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5704-bundle.sh33
1 files changed, 8 insertions, 25 deletions
diff --git a/t/t5704-bundle.sh b/t/t5704-bundle.sh
index af19994aa7..a51c8b0560 100755
--- a/t/t5704-bundle.sh
+++ b/t/t5704-bundle.sh
@@ -4,59 +4,42 @@ test_description='some bundle related tests'
. ./test-lib.sh
test_expect_success 'setup' '
-
- : > file &&
- git add file &&
- test_tick &&
- git commit -m initial &&
+ test_commit initial &&
test_tick &&
git tag -m tag tag &&
- : > file2 &&
- git add file2 &&
- : > file3 &&
- test_tick &&
- git commit -m second &&
- git add file3 &&
- test_tick &&
- git commit -m third
-
+ 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
-
+ : >empty-bundle &&
+ test_must_fail git fetch empty-bundle
'
# This triggers a bug in older versions where the resulting line (with