aboutsummaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2009-02-05 21:20:56 +0100
committerJohannes Sixt <j6t@kdbg.org>2009-03-19 21:47:14 +0100
commit8586f98bd29bd4ad3d0e62a3be4a4d59ff8b27cd (patch)
tree9f77af9f35b1524fc476bf12824ea239fe14eef8 /t/t5515-fetch-merge-logic.sh
parentd5d9de1b10f478b57803f5f2868ed2334c84e09b (diff)
downloadgit-8586f98bd29bd4ad3d0e62a3be4a4d59ff8b27cd.tar.gz
git-8586f98bd29bd4ad3d0e62a3be4a4d59ff8b27cd.tar.xz
test-lib: Simplify test counting.
Since the test case counter was incremented very late, there were a few users of the counter had to do their own incrementing. Now we increment it early and simplify these users. Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
-rwxr-xr-xt/t5515-fetch-merge-logic.sh3
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t5515-fetch-merge-logic.sh b/t/t5515-fetch-merge-logic.sh
index 1f4608d8b..dbb927dec 100755
--- a/t/t5515-fetch-merge-logic.sh
+++ b/t/t5515-fetch-merge-logic.sh
@@ -129,8 +129,7 @@ do
'' | '#'*) continue ;;
esac
test=`echo "$cmd" | sed -e 's|[/ ][/ ]*|_|g'`
- cnt=`expr $test_count + 1`
- pfx=`printf "%04d" $cnt`
+ pfx=`printf "%04d" $test_count`
expect_f="$TEST_DIRECTORY/t5515/fetch.$test"
actual_f="$pfx-fetch.$test"
expect_r="$TEST_DIRECTORY/t5515/refs.$test"