{"thread":{"id":"15461","subject":"[PATCH 2/6] t9300, t9301: use \"git fast-import/fast-export\" without dash","startedAt":"2008-09-09T21:25:25Z","lastAt":"2008-09-09T21:25:25Z","messageCount":1,"participants":["Nanako Shiraishi"],"isPatch":true,"patchVersion":1,"patchTotal":6},"messages":[{"id":"90269","messageId":"20080910062525.6117@nanako3.lavabit.com","threadId":"15461","inReplyTo":null,"subject":"[PATCH 2/6] t9300, t9301: use \"git fast-import/fast-export\" without dash","fromName":"Nanako Shiraishi","fromEmail":"nanako3@lavabit.com","sentAt":"2008-09-09T21:25:25Z","receivedAt":"2008-09-09T21:25:25Z","isPatch":true,"sender":{"key":"nanako3@lavabit.com","avatar":"https://gravatar.com/avatar/3777b9e201c5883a62b1a6fdf7c53f2d712d1d80989146063ea861e33aad72a8?d=mp&s=160"},"body":"Also use \"git hash-object\" and \"git rev-parse\" without dash.\n\nSigned-off-by: Nanako Shiraishi <nanako3@lavabit.com>\n---\n t/t9300-fast-import.sh |   80 ++++++++++++++++++++++++------------------------\n t/t9301-fast-export.sh |    2 +-\n 2 files changed, 41 insertions(+), 41 deletions(-)\n\ndiff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh\nindex bd5d5af..328444a 100755\n--- a/t/t9300-fast-import.sh\n+++ b/t/t9300-fast-import.sh\n@@ -3,7 +3,7 @@\n # Copyright (c) 2007 Shawn Pearce\n #\n \n-test_description='test git-fast-import utility'\n+test_description='test git fast-import utility'\n . ./test-lib.sh\n . \"$TEST_DIRECTORY\"/diff-lib.sh ;# test-lib chdir's into trash\n \n@@ -59,7 +59,7 @@ M 755 :4 file4\n INPUT_END\n test_expect_success \\\n     'A: create pack from stdin' \\\n-    'git-fast-import --export-marks=marks.out <input &&\n+    'git fast-import --export-marks=marks.out <input &&\n \t git whatchanged master'\n test_expect_success \\\n \t'A: verify pack' \\\n@@ -113,7 +113,7 @@ test_expect_success \\\n \n test_expect_success \\\n \t'A: verify marks import' \\\n-\t'git-fast-import \\\n+\t'git fast-import \\\n \t\t--import-marks=marks.out \\\n \t\t--export-marks=marks.new \\\n \t\t</dev/null &&\n@@ -133,7 +133,7 @@ M 755 :2 copy-of-file2\n INPUT_END\n test_expect_success \\\n \t'A: verify marks import does not crash' \\\n-\t'git-fast-import --import-marks=marks.out <input &&\n+\t'git fast-import --import-marks=marks.out <input &&\n \t git whatchanged verify--import-marks'\n test_expect_success \\\n \t'A: verify pack' \\\n@@ -166,7 +166,7 @@ M 755 0000000000000000000000000000000000000001 zero1\n \n INPUT_END\n test_expect_success 'B: fail on invalid blob sha1' '\n-    test_must_fail git-fast-import <input\n+    test_must_fail git fast-import <input\n '\n rm -f .git/objects/pack_* .git/objects/index_*\n \n@@ -181,7 +181,7 @@ from refs/heads/master\n \n INPUT_END\n test_expect_success 'B: fail on invalid branch name \".badbranchname\"' '\n-    test_must_fail git-fast-import <input\n+    test_must_fail git fast-import <input\n '\n rm -f .git/objects/pack_* .git/objects/index_*\n \n@@ -196,7 +196,7 @@ from refs/heads/master\n \n INPUT_END\n test_expect_success 'B: fail on invalid branch name \"bad[branch]name\"' '\n-    test_must_fail git-fast-import <input\n+    test_must_fail git fast-import <input\n '\n rm -f .git/objects/pack_* .git/objects/index_*\n \n@@ -212,7 +212,7 @@ from refs/heads/master\n INPUT_END\n test_expect_success \\\n     'B: accept branch name \"TEMP_TAG\"' \\\n-    'git-fast-import <input &&\n+    'git fast-import <input &&\n \t test -f .git/TEMP_TAG &&\n \t test `git rev-parse master` = `git rev-parse TEMP_TAG^`'\n rm -f .git/TEMP_TAG\n@@ -221,7 +221,7 @@ rm -f .git/TEMP_TAG\n ### series C\n ###\n \n-newf=`echo hi newf | git-hash-object -w --stdin`\n+newf=`echo hi newf | git hash-object -w --stdin`\n oldf=`git rev-parse --verify master:file2`\n test_tick\n cat >input <<INPUT_END\n@@ -239,7 +239,7 @@ D file3\n INPUT_END\n test_expect_success \\\n     'C: incremental import create pack from stdin' \\\n-    'git-fast-import <input &&\n+    'git fast-import <input &&\n \t git whatchanged branch'\n test_expect_success \\\n \t'C: verify pack' \\\n@@ -297,7 +297,7 @@ EOF\n INPUT_END\n test_expect_success \\\n     'D: inline data in commit' \\\n-    'git-fast-import <input &&\n+    'git fast-import <input &&\n \t git whatchanged branch'\n test_expect_success \\\n \t'D: verify pack' \\\n@@ -340,11 +340,11 @@ from refs/heads/branch^0\n \n INPUT_END\n test_expect_success 'E: rfc2822 date, --date-format=raw' '\n-    test_must_fail git-fast-import --date-format=raw <input\n+    test_must_fail git fast-import --date-format=raw <input\n '\n test_expect_success \\\n     'E: rfc2822 date, --date-format=rfc2822' \\\n-    'git-fast-import --date-format=rfc2822 <input'\n+    'git fast-import --date-format=rfc2822 <input'\n test_expect_success \\\n \t'E: verify pack' \\\n \t'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'\n@@ -381,7 +381,7 @@ from refs/heads/branch\n INPUT_END\n test_expect_success \\\n     'F: non-fast-forward update skips' \\\n-    'if git-fast-import <input\n+    'if git fast-import <input\n \t then\n \t\techo BAD gfi did not fail\n \t\treturn 1\n@@ -431,7 +431,7 @@ from refs/heads/branch~1\n INPUT_END\n test_expect_success \\\n     'G: non-fast-forward update forced' \\\n-    'git-fast-import --force <input'\n+    'git fast-import --force <input'\n test_expect_success \\\n \t'G: verify pack' \\\n \t'for p in .git/objects/pack/*.pack;do git verify-pack $p||exit;done'\n@@ -467,7 +467,7 @@ EOF\n INPUT_END\n test_expect_success \\\n     'H: deletall, add 1' \\\n-    'git-fast-import <input &&\n+    'git fast-import <input &&\n \t git whatchanged H'\n test_expect_success \\\n \t'H: verify pack' \\\n@@ -507,7 +507,7 @@ from refs/heads/branch\n INPUT_END\n test_expect_success \\\n     'I: export-pack-edges' \\\n-    'git-fast-import --export-pack-edges=edges.list <input'\n+    'git fast-import --export-pack-edges=edges.list <input'\n \n cat >expect <<EOF\n .git/objects/pack/pack-.pack: `git rev-parse --verify export-boundary`\n@@ -541,7 +541,7 @@ COMMIT\n INPUT_END\n test_expect_success \\\n     'J: reset existing branch creates empty commit' \\\n-    'git-fast-import <input'\n+    'git fast-import <input'\n test_expect_success \\\n \t'J: branch has 1 commit, empty tree' \\\n \t'test 1 = `git rev-list J | wc -l` &&\n@@ -571,7 +571,7 @@ from refs/heads/branch^1\n INPUT_END\n test_expect_success \\\n     'K: reinit branch with from' \\\n-    'git-fast-import <input'\n+    'git fast-import <input'\n test_expect_success \\\n     'K: verify K^1 = branch^1' \\\n     'test `git rev-parse --verify branch^1` \\\n@@ -623,7 +623,7 @@ EXPECT_END\n \n test_expect_success \\\n     'L: verify internal tree sorting' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t git diff-tree --abbrev --raw L^ L >output &&\n \t test_cmp expect output'\n \n@@ -649,7 +649,7 @@ cat >expect <<EOF\n EOF\n test_expect_success \\\n \t'M: rename file in same subdirectory' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t git diff-tree -M -r M1^ M1 >actual &&\n \t compare_diff_raw expect actual'\n \n@@ -670,7 +670,7 @@ cat >expect <<EOF\n EOF\n test_expect_success \\\n \t'M: rename file to new subdirectory' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t git diff-tree -M -r M2^ M2 >actual &&\n \t compare_diff_raw expect actual'\n \n@@ -691,7 +691,7 @@ cat >expect <<EOF\n EOF\n test_expect_success \\\n \t'M: rename subdirectory to new subdirectory' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t git diff-tree -M -r M3^ M3 >actual &&\n \t compare_diff_raw expect actual'\n \n@@ -717,7 +717,7 @@ cat >expect <<EOF\n EOF\n test_expect_success \\\n \t'N: copy file in same subdirectory' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t git diff-tree -C --find-copies-harder -r N1^ N1 >actual &&\n \t compare_diff_raw expect actual'\n \n@@ -751,7 +751,7 @@ cat >expect <<EOF\n EOF\n test_expect_success \\\n \t'N: copy then modify subdirectory' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t git diff-tree -C --find-copies-harder -r N2^^ N2 >actual &&\n \t compare_diff_raw expect actual'\n \n@@ -775,8 +775,8 @@ INPUT_END\n \n test_expect_success \\\n \t'N: copy dirty subdirectory' \\\n-\t'git-fast-import <input &&\n-\t test `git-rev-parse N2^{tree}` = `git-rev-parse N3^{tree}`'\n+\t'git fast-import <input &&\n+\t test `git rev-parse N2^{tree}` = `git rev-parse N3^{tree}`'\n \n ###\n ### series O\n@@ -815,8 +815,8 @@ INPUT_END\n \n test_expect_success \\\n \t'O: comments are all skipped' \\\n-\t'git-fast-import <input &&\n-\t test `git-rev-parse N3` = `git-rev-parse O1`'\n+\t'git fast-import <input &&\n+\t test `git rev-parse N3` = `git rev-parse O1`'\n \n cat >input <<INPUT_END\n commit refs/heads/O2\n@@ -836,8 +836,8 @@ INPUT_END\n \n test_expect_success \\\n \t'O: blank lines not necessary after data commands' \\\n-\t'git-fast-import <input &&\n-\t test `git-rev-parse N3` = `git-rev-parse O2`'\n+\t'git fast-import <input &&\n+\t test `git rev-parse N3` = `git rev-parse O2`'\n \n test_expect_success \\\n \t'O: repack before next test' \\\n@@ -881,7 +881,7 @@ commits\n INPUT_END\n test_expect_success \\\n \t'O: blank lines not necessary after other commands' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t test 8 = `find .git/objects/pack -type f | wc -l` &&\n \t test `git rev-parse refs/tags/O3-2nd` = `git rev-parse O3^` &&\n \t git log --reverse --pretty=oneline O3 | sed s/^.*z// >actual &&\n@@ -914,7 +914,7 @@ progress I'm done!\n INPUT_END\n test_expect_success \\\n \t'O: progress outputs as requested by input' \\\n-\t'git-fast-import <input >actual &&\n+\t'git fast-import <input >actual &&\n \t grep \"progress \" <input >expect &&\n \t test_cmp expect actual'\n \n@@ -979,7 +979,7 @@ INPUT_END\n \n test_expect_success \\\n \t'P: supermodule & submodule mix' \\\n-\t'git-fast-import <input &&\n+\t'git fast-import <input &&\n \t git checkout subuse1 &&\n \t rm -rf sub && mkdir sub && cd sub &&\n \t git init &&\n@@ -989,8 +989,8 @@ test_expect_success \\\n \t git submodule init &&\n \t git submodule update'\n \n-SUBLAST=$(git-rev-parse --verify sub)\n-SUBPREV=$(git-rev-parse --verify sub^)\n+SUBLAST=$(git rev-parse --verify sub)\n+SUBPREV=$(git rev-parse --verify sub^)\n \n cat >input <<INPUT_END\n blob\n@@ -1024,8 +1024,8 @@ test_expect_success \\\n \t'P: verbatim SHA gitlinks' \\\n \t'git branch -D sub &&\n \t git gc && git prune &&\n-\t git-fast-import <input &&\n-\t test $(git-rev-parse --verify subuse2) = $(git-rev-parse --verify subuse1)'\n+\t git fast-import <input &&\n+\t test $(git rev-parse --verify subuse2) = $(git rev-parse --verify subuse1)'\n \n test_tick\n cat >input <<INPUT_END\n@@ -1045,7 +1045,7 @@ DATA\n INPUT_END\n \n test_expect_success 'P: fail on inline gitlink' '\n-    test_must_fail git-fast-import <input'\n+    test_must_fail git fast-import <input'\n \n test_tick\n cat >input <<INPUT_END\n@@ -1068,6 +1068,6 @@ M 160000 :1 sub\n INPUT_END\n \n test_expect_success 'P: fail on blob mark in gitlink' '\n-    test_must_fail git-fast-import <input'\n+    test_must_fail git fast-import <input'\n \n test_done\ndiff --git a/t/t9301-fast-export.sh b/t/t9301-fast-export.sh\nindex 3cb9f80..6ddd7c1 100755\n--- a/t/t9301-fast-export.sh\n+++ b/t/t9301-fast-export.sh\n@@ -3,7 +3,7 @@\n # Copyright (c) 2007 Johannes E. Schindelin\n #\n \n-test_description='git-fast-export'\n+test_description='git fast-export'\n . ./test-lib.sh\n \n test_expect_success 'setup' '\n-- \n1.6.0.1\n\n\n-- \nNanako Shiraishi\nhttp://ivory.ap.teacup.com/nanako3/\n"}]}