The test script mostly uses tabs to indent, but some 4-space indents snuck in. Cc: Shawn O. Pearce <spearce@xxxxxxxxxxx> Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx> --- t/t9300-fast-import.sh | 118 ++++++++++++++++++++++++------------------------ 1 files changed, 59 insertions(+), 59 deletions(-) diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh index 8d418e4..0059298 100755 --- a/t/t9300-fast-import.sh +++ b/t/t9300-fast-import.sh @@ -82,8 +82,8 @@ EOF INPUT_END test_expect_success \ - 'A: create pack from stdin' \ - 'git fast-import --export-marks=marks.out <input && + 'A: create pack from stdin' \ + 'git fast-import --export-marks=marks.out <input && git whatchanged master' test_expect_success \ 'A: verify pack' \ @@ -272,7 +272,7 @@ M 755 0000000000000000000000000000000000000001 zero1 INPUT_END test_expect_success 'B: fail on invalid blob sha1' ' - test_must_fail git fast-import <input + test_must_fail git fast-import <input ' rm -f .git/objects/pack_* .git/objects/index_* @@ -287,7 +287,7 @@ from refs/heads/master INPUT_END test_expect_success 'B: fail on invalid branch name ".badbranchname"' ' - test_must_fail git fast-import <input + test_must_fail git fast-import <input ' rm -f .git/objects/pack_* .git/objects/index_* @@ -302,7 +302,7 @@ from refs/heads/master INPUT_END test_expect_success 'B: fail on invalid branch name "bad[branch]name"' ' - test_must_fail git fast-import <input + test_must_fail git fast-import <input ' rm -f .git/objects/pack_* .git/objects/index_* @@ -317,8 +317,8 @@ from refs/heads/master INPUT_END test_expect_success \ - 'B: accept branch name "TEMP_TAG"' \ - 'git fast-import <input && + 'B: accept branch name "TEMP_TAG"' \ + 'git fast-import <input && test -f .git/TEMP_TAG && test `git rev-parse master` = `git rev-parse TEMP_TAG^`' rm -f .git/TEMP_TAG @@ -344,8 +344,8 @@ D file3 INPUT_END test_expect_success \ - 'C: incremental import create pack from stdin' \ - 'git fast-import <input && + 'C: incremental import create pack from stdin' \ + 'git fast-import <input && git whatchanged branch' test_expect_success \ 'C: verify pack' \ @@ -402,8 +402,8 @@ EOF INPUT_END test_expect_success \ - 'D: inline data in commit' \ - 'git fast-import <input && + 'D: inline data in commit' \ + 'git fast-import <input && git whatchanged branch' test_expect_success \ 'D: verify pack' \ @@ -446,11 +446,11 @@ from refs/heads/branch^0 INPUT_END test_expect_success 'E: rfc2822 date, --date-format=raw' ' - test_must_fail git fast-import --date-format=raw <input + test_must_fail git fast-import --date-format=raw <input ' test_expect_success \ - 'E: rfc2822 date, --date-format=rfc2822' \ - 'git fast-import --date-format=rfc2822 <input' + 'E: rfc2822 date, --date-format=rfc2822' \ + 'git fast-import --date-format=rfc2822 <input' test_expect_success \ 'E: verify pack' \ 'verify_packs' @@ -486,8 +486,8 @@ from refs/heads/branch INPUT_END test_expect_success \ - 'F: non-fast-forward update skips' \ - 'if git fast-import <input + 'F: non-fast-forward update skips' \ + 'if git fast-import <input then echo BAD gfi did not fail return 1 @@ -536,8 +536,8 @@ from refs/heads/branch~1 INPUT_END test_expect_success \ - 'G: non-fast-forward update forced' \ - 'git fast-import --force <input' + 'G: non-fast-forward update forced' \ + 'git fast-import --force <input' test_expect_success \ 'G: verify pack' \ 'verify_packs' @@ -572,8 +572,8 @@ EOF INPUT_END test_expect_success \ - 'H: deletall, add 1' \ - 'git fast-import <input && + 'H: deletall, add 1' \ + 'git fast-import <input && git whatchanged H' test_expect_success \ 'H: verify pack' \ @@ -612,8 +612,8 @@ from refs/heads/branch INPUT_END test_expect_success \ - 'I: export-pack-edges' \ - 'git fast-import --export-pack-edges=edges.list <input' + 'I: export-pack-edges' \ + 'git fast-import --export-pack-edges=edges.list <input' cat >expect <<EOF .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary` @@ -646,8 +646,8 @@ COMMIT INPUT_END test_expect_success \ - 'J: reset existing branch creates empty commit' \ - 'git fast-import <input' + 'J: reset existing branch creates empty commit' \ + 'git fast-import <input' test_expect_success \ 'J: branch has 1 commit, empty tree' \ 'test 1 = `git rev-list J | wc -l` && @@ -676,12 +676,12 @@ from refs/heads/branch^1 INPUT_END test_expect_success \ - 'K: reinit branch with from' \ - 'git fast-import <input' + 'K: reinit branch with from' \ + 'git fast-import <input' test_expect_success \ - 'K: verify K^1 = branch^1' \ - 'test `git rev-parse --verify branch^1` \ - = `git rev-parse --verify K^1`' + 'K: verify K^1 = branch^1' \ + 'test `git rev-parse --verify branch^1` \ + = `git rev-parse --verify K^1`' ### ### series L @@ -751,7 +751,7 @@ cat >expect <<EXPECT_END EXPECT_END test_expect_success \ - 'L: verify internal tree sorting' \ + 'L: verify internal tree sorting' \ 'git fast-import <input && git diff-tree L^ L >output && test_cmp expect output' @@ -1227,7 +1227,7 @@ DATA INPUT_END test_expect_success 'P: fail on inline gitlink' ' - test_must_fail git fast-import <input' + test_must_fail git fast-import <input' test_tick cat >input <<INPUT_END @@ -1250,7 +1250,7 @@ M 160000 :1 sub INPUT_END test_expect_success 'P: fail on blob mark in gitlink' ' - test_must_fail git fast-import <input' + test_must_fail git fast-import <input' ### ### series Q (notes) @@ -1598,14 +1598,14 @@ hi EOF test_expect_success \ - 'R: export-marks feature results in a marks file being created' \ - 'cat input | git fast-import && - grep :1 git.marks' + 'R: export-marks feature results in a marks file being created' \ + 'cat input | git fast-import && + grep :1 git.marks' test_expect_success \ - 'R: export-marks options can be overriden by commandline options' \ - 'cat input | git fast-import --export-marks=other.marks && - grep :1 other.marks' + 'R: export-marks options can be overriden by commandline options' \ + 'cat input | git fast-import --export-marks=other.marks && + grep :1 other.marks' cat >input << EOF feature import-marks=marks.out @@ -1613,9 +1613,9 @@ feature export-marks=marks.new EOF test_expect_success \ - 'R: import to output marks works without any content' \ - 'cat input | git fast-import && - test_cmp marks.out marks.new' + 'R: import to output marks works without any content' \ + 'cat input | git fast-import && + test_cmp marks.out marks.new' cat >input <<EOF feature import-marks=nonexistant.marks @@ -1623,9 +1623,9 @@ feature export-marks=marks.new EOF test_expect_success \ - 'R: import marks prefers commandline marks file over the stream' \ - 'cat input | git fast-import --import-marks=marks.out && - test_cmp marks.out marks.new' + 'R: import marks prefers commandline marks file over the stream' \ + 'cat input | git fast-import --import-marks=marks.out && + test_cmp marks.out marks.new' cat >input <<EOF @@ -1634,10 +1634,10 @@ feature export-marks=combined.marks EOF test_expect_success 'R: multiple --import-marks= should be honoured' ' - head -n2 marks.out > one.marks && - tail -n +3 marks.out > two.marks && - git fast-import --import-marks=one.marks --import-marks=two.marks <input && - test_cmp marks.out combined.marks + head -n2 marks.out > one.marks && + tail -n +3 marks.out > two.marks && + git fast-import --import-marks=one.marks --import-marks=two.marks <input && + test_cmp marks.out combined.marks ' cat >input <<EOF @@ -1647,10 +1647,10 @@ feature export-marks=relative.out EOF test_expect_success 'R: feature relative-marks should be honoured' ' - mkdir -p .git/info/fast-import/ && - cp marks.new .git/info/fast-import/relative.in && - git fast-import <input && - test_cmp marks.new .git/info/fast-import/relative.out + mkdir -p .git/info/fast-import/ && + cp marks.new .git/info/fast-import/relative.in && + git fast-import <input && + test_cmp marks.new .git/info/fast-import/relative.out ' cat >input <<EOF @@ -1661,8 +1661,8 @@ feature export-marks=non-relative.out EOF test_expect_success 'R: feature no-relative-marks should be honoured' ' - git fast-import <input && - test_cmp marks.new non-relative.out + git fast-import <input && + test_cmp marks.new non-relative.out ' cat >input << EOF @@ -1676,8 +1676,8 @@ EOF touch empty test_expect_success 'R: quiet option results in no stats being output' ' - cat input | git fast-import 2> output && - test_cmp empty output + cat input | git fast-import 2> output && + test_cmp empty output ' cat >input <<EOF @@ -1685,11 +1685,11 @@ option git non-existing-option EOF test_expect_success 'R: die on unknown option' ' - test_must_fail git fast-import <input + test_must_fail git fast-import <input ' test_expect_success 'R: unknown commandline options are rejected' '\ - test_must_fail git fast-import --non-existing-option < /dev/null + test_must_fail git fast-import --non-existing-option < /dev/null ' cat >input <<EOF @@ -1697,7 +1697,7 @@ option non-existing-vcs non-existing-option EOF test_expect_success 'R: ignore non-git options' ' - git fast-import <input + git fast-import <input ' ## -- 1.7.2.3 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html