summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2014-01-08 12:13:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-01-09 19:54:12 (GMT)
commit3b32a7ca90b9c63f2306feb2a66b62b94c1a640f (patch)
tree9c36e55d9bce2b5d3adf6abc38f883a7c15461cb
parentfeefdf62c107fd63056becf547ea324dbb730e30 (diff)
downloadgit-3b32a7ca90b9c63f2306feb2a66b62b94c1a640f.zip
git-3b32a7ca90b9c63f2306feb2a66b62b94c1a640f.tar.gz
git-3b32a7ca90b9c63f2306feb2a66b62b94c1a640f.tar.bz2
t5537: fix incorrect expectation in test case 10
Commit 48d25ca adds a new commit "7" to the repo that the next test case in commit 1609488 clones from. But the next test case does not expect this commit. For these tests, it's the bottom that's important, not the top. Fix the expected commit list. While at it, fix the default http port number to 5537. Otherwise when t5536 learns to test httpd, running test in parallel may fail. References: 48d25ca fetch: add --update-shallow to accept... - 2013-12-05 1609488 smart-http: support shallow fetch/clone - 2013-12-05 Noticed-by: Jeff King <peff@peff.net> Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rwxr-xr-xt/t5537-fetch-shallow.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/t/t5537-fetch-shallow.sh b/t/t5537-fetch-shallow.sh
index 79ce472..b0fa738 100755
--- a/t/t5537-fetch-shallow.sh
+++ b/t/t5537-fetch-shallow.sh
@@ -178,7 +178,7 @@ if test -n "$NO_CURL" -o -z "$GIT_TEST_HTTPD"; then
test_done
fi
-LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5536'}
+LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5537'}
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
@@ -190,6 +190,7 @@ test_expect_success 'clone http repository' '
git fsck &&
git log --format=%s origin/master >actual &&
cat <<EOF >expect &&
+7
6
5
4