t5537: fix incorrect expectation in test case 10
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>
Wed, 8 Jan 2014 12:13:19 +0000 (19:13 +0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Jan 2014 19:54:12 +0000 (11:54 -0800)
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>
t/t5537-fetch-shallow.sh
index 79ce47287ba10c81d5ab78aeec4bb257c5989bcf..b0fa7387cbe082a72e26590be8e621c922e91eba 100755 (executable)
@@ -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