See "t9300 (fast-import), series A: re-indent".
Cc: Shawn O. Pearce <spearce@xxxxxxxxxxx>
Signed-off-by: Jonathan Nieder <jrnieder@xxxxxxxxx>
---
t/t9300-fast-import.sh | 47 +++++++++++++++++++++++------------------------
1 files changed, 23 insertions(+), 24 deletions(-)
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 1324157..ab317d6 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -488,13 +488,12 @@ reset refs/heads/other
from refs/heads/branch
INPUT_END
-test_expect_success \
- 'F: non-fast-forward update skips' \
- 'if git fast-import <input
- then
+test_expect_success 'F: non-fast-forward update skips' '
+ if git fast-import <input
+ then
echo BAD gfi did not fail
return 1
- else
+ else
if test $old_branch = `git rev-parse --verify branch^0`
then
: branch unaffected and failure returned
@@ -503,11 +502,11 @@ test_expect_success \
echo BAD gfi changed branch $old_branch
return 1
fi
- fi
- '
-test_expect_success \
- 'F: verify pack' \
- 'verify_packs'
+ fi
+'
+test_expect_success 'F: verify pack' '
+ verify_packs
+'
cat >expect <<EOF
tree `git rev-parse branch~1^{tree}`
@@ -517,10 +516,10 @@ committer $GIT_COMMITTER_NAME <$GIT_COMMITTER_EMAIL> $GIT_COMMITTER_DATE
losing things already?
EOF
-test_expect_success \
- 'F: verify other commit' \
- 'git cat-file commit other >actual &&
- test_cmp expect actual'
+test_expect_success 'F: verify other commit' '
+ git cat-file commit other >actual &&
+ test_cmp expect actual
+'
###
### series G
@@ -538,16 +537,16 @@ COMMIT
from refs/heads/branch~1
INPUT_END
-test_expect_success \
- 'G: non-fast-forward update forced' \
- 'git fast-import --force <input'
-test_expect_success \
- 'G: verify pack' \
- 'verify_packs'
-test_expect_success \
- 'G: branch changed, but logged' \
- 'test $old_branch != `git rev-parse --verify branch^0` &&
- test $old_branch = `git rev-parse --verify branch@{1}`'
+test_expect_success 'G: non-fast-forward update forced' '
+ git fast-import --force <input
+'
+test_expect_success 'G: verify pack' '
+ verify_packs
+'
+test_expect_success 'G: branch changed, but logged' '
+ test $old_branch != `git rev-parse --verify branch^0` &&
+ test $old_branch = `git rev-parse --verify branch@{1}`
+'
###
### series H
--
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