[PATCH 08/24] t9300 (fast-import), series A: re-indent
- From
Jonathan Nieder <jrnieder@gmail.com>
- Date
- Sep 24, 2010, 07:16 UTC
- Message-ID
- <20100924071631.GI4666@burratino>
- In-Reply-To
- <20100924065900.GA4666@burratino>
This was originally an old-fashioned test script, with formatting that might now look unfamiliar:
test_expect_success \ 'series A: foo bar baz' \ 'test commands && more test commands'
The apostrophes after tab make indenting more trouble than it ought to be and the alignment cannot be preserved with the <<- operator working. The initial and final apostrophes on command lines makes patches that add new lines to a test harder to read. The title aligned with the test code makes the test description harder to take in at a glance.
So switch to the usual modern style:
test_expect_success 'series A: foo bar baz' ' test commands && more test commands '
No other change intended.
Cc: Shawn O. Pearce <spearce@spearce.net> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- t/t9300-fast-import.sh | 99 ++++++++++++++++++++++++----------------------- 1 files changed, 51 insertions(+), 48 deletions(-)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 0059298..10dc720 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -81,13 +81,12 @@ An annotated tag without a tagger EOF INPUT_END -test_expect_success \ - 'A: create pack from stdin' \ - 'git fast-import --export-marks=marks.out <input && - git whatchanged master' -test_expect_success \ - 'A: verify pack' \ - 'verify_packs' +test_expect_success 'A: create pack from stdin' ' + git fast-import --export-marks=marks.out <input && + git whatchanged master' +test_expect_success 'A: verify pack' ' + verify_packs +' cat >expect <<EOF author $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE @@ -95,37 +94,40 @@ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE initial EOF -test_expect_success \ - 'A: verify commit' \ - 'git cat-file commit master >commit && +test_expect_success 'A: verify commit' ' + git cat-file commit master >commit && sed 1d <commit >actual && - test_cmp expect actual' + test_cmp expect actual +' cat >expect <<EOF 100644 blob file2 100644 blob file3 100755 blob file4 EOF -test_expect_success \ - 'A: verify tree' \ - 'git cat-file -p master^{tree} >tree && - sed "s/ [0-9a-f]* / /" <tree >actual && - test_cmp expect actual' +test_expect_success 'A: verify tree' ' + git cat-file -p master^{tree} >tree && + sed "s/ [0-9a-f]* / /" <tree >actual && + test_cmp expect actual +' echo "$file2_data" >expect -test_expect_success \ - 'A: verify file2' \ - 'git cat-file blob master:file2 >actual && test_cmp expect actual' +test_expect_success 'A: verify file2' ' + git cat-file blob master:file2 >actual && + test_cmp expect actual +' echo "$file3_data" >expect -test_expect_success \ - 'A: verify file3' \ - 'git cat-file blob master:file3 >actual && test_cmp expect actual' +test_expect_success 'A: verify file3' ' + git cat-file blob master:file3 >actual && + test_cmp expect actual +' printf "$file4_data" >expect -test_expect_success \ - 'A: verify file4' \ - 'git cat-file blob master:file4 >actual && test_cmp expect actual' +test_expect_success 'A: verify file4' ' + git cat-file blob master:file4 >actual && + test_cmp expect actual +' test_expect_success 'A: verify tag/series-A' ' master=$(git rev-parse --verify refs/heads/master) && @@ -153,17 +155,17 @@ test_expect_success 'setup: compute expected marks' ' } >expect ' -test_expect_success \ - 'A: verify marks output' \ - 'test_cmp expect marks.out' +test_expect_success 'A: verify marks output' ' + test_cmp expect marks.out +' -test_expect_success \ - 'A: verify marks import' \ - 'git fast-import \ +test_expect_success 'A: verify marks import' ' + git fast-import \ --import-marks=marks.out \ --export-marks=marks.new \ </dev/null && - test_cmp expect marks.new' + test_cmp expect marks.new +' test_tick cat >input <<INPUT_END @@ -177,21 +179,21 @@ from :5 M 755 :2 copy-of-file2 INPUT_END -test_expect_success \ - 'A: verify marks import does not crash' \ - 'git fast-import --import-marks=marks.out <input && - git whatchanged verify--import-marks' -test_expect_success \ - 'A: verify pack' \ - 'verify_packs' -test_expect_success \ - 'A: verify diff' \ - 'echo ":000000 100755 $zeroes $file2_id A copy-of-file2" >expect && - echo $file2_id >expect.copy && - git diff-tree -M -r master verify--import-marks >actual && - git rev-parse --verify verify--import-marks:copy-of-file2 >actual.copy && - compare_diff_raw expect actual && - test_cmp expect.copy actual.copy' +test_expect_success 'A: verify marks import does not crash' ' + git fast-import --import-marks=marks.out <input && + git whatchanged verify--import-marks +' +test_expect_success 'A: verify pack' ' + verify_packs +' +test_expect_success 'A: verify diff' ' + echo ":000000 100755 $zeroes $file2_id A copy-of-file2" >expect && + echo $file2_id >expect.copy && + git diff-tree -M -r master verify--import-marks >actual && + git rev-parse --verify verify--import-marks:copy-of-file2 >actual.copy && + compare_diff_raw expect actual && + test_cmp expect.copy actual.copy +' test_expect_success 'A: export marks with large values' ' test_tick && @@ -252,7 +254,8 @@ test_expect_success 'A: export marks with large values' ' cat input.blob input.commit | git fast-import --export-marks=marks.large && git ls-tree refs/heads/verify--dump-marks >tree.out && test_cmp tree.exp_s tree.out && - test_cmp marks.exp marks.large' + test_cmp marks.exp marks.large +' ### ### series B
-- 1.7.2.3