Revision 2c733fb24c10a9d7aacc51f956bf9b7881980870 authored by Junio C Hamano on 02 February 2012, 21:41:43 UTC, committed by Junio C Hamano on 04 February 2012, 07:11:32 UTC
The only place that the issue this series addresses was observed where we read "cat-file commit" output and put it in GIT_AUTHOR_DATE in order to replay a commit with an ancient timestamp. With the previous patch alone, "git commit --date='20100917 +0900'" can be misinterpreted to mean an ancient timestamp, not September in year 2010. Guard this codepath by requring an extra '@' in front of the raw git timestamp on the parsing side. This of course needs to be compensated by updating get_author_ident_from_commit and the code for "git commit --amend" to prepend '@' to the string read from the existing commit in the GIT_AUTHOR_DATE environment variable. Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 116eb3a
t5561-http-backend.sh
#!/bin/sh
test_description='test git-http-backend'
. ./test-lib.sh
if test -n "$NO_CURL"; then
skip_all='skipping test, git built without http support'
test_done
fi
LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5561'}
. "$TEST_DIRECTORY"/lib-httpd.sh
start_httpd
GET() {
curl --include "$HTTPD_URL/$SMART/repo.git/$1" >out 2>/dev/null &&
tr '\015' Q <out |
sed '
s/Q$//
1q
' >act &&
echo "HTTP/1.1 $2" >exp &&
test_cmp exp act
}
POST() {
curl --include --data "$2" \
--header "Content-Type: application/x-$1-request" \
"$HTTPD_URL/smart/repo.git/$1" >out 2>/dev/null &&
tr '\015' Q <out |
sed '
s/Q$//
1q
' >act &&
echo "HTTP/1.1 $3" >exp &&
test_cmp exp act
}
log_div() {
echo >>"$HTTPD_ROOT_PATH"/access.log
echo "### $1" >>"$HTTPD_ROOT_PATH"/access.log
echo "###" >>"$HTTPD_ROOT_PATH"/access.log
}
. "$TEST_DIRECTORY"/t556x_common
cat >exp <<EOF
### refs/heads/master
###
GET /smart/repo.git/refs/heads/master HTTP/1.1 404 -
### getanyfile default
###
GET /smart/repo.git/HEAD HTTP/1.1 200
GET /smart/repo.git/info/refs HTTP/1.1 200
GET /smart/repo.git/objects/info/packs HTTP/1.1 200
GET /smart/repo.git/objects/info/alternates HTTP/1.1 200 -
GET /smart/repo.git/objects/info/http-alternates HTTP/1.1 200 -
GET /smart/repo.git/$LOOSE_URL HTTP/1.1 200
GET /smart/repo.git/$PACK_URL HTTP/1.1 200
GET /smart/repo.git/$IDX_URL HTTP/1.1 200
### no git-daemon-export-ok
###
GET /smart_noexport/repo.git/HEAD HTTP/1.1 404 -
GET /smart_noexport/repo.git/info/refs HTTP/1.1 404 -
GET /smart_noexport/repo.git/objects/info/packs HTTP/1.1 404 -
GET /smart_noexport/repo.git/objects/info/alternates HTTP/1.1 404 -
GET /smart_noexport/repo.git/objects/info/http-alternates HTTP/1.1 404 -
GET /smart_noexport/repo.git/$LOOSE_URL HTTP/1.1 404 -
GET /smart_noexport/repo.git/$PACK_URL HTTP/1.1 404 -
GET /smart_noexport/repo.git/$IDX_URL HTTP/1.1 404 -
### git-daemon-export-ok
###
GET /smart_noexport/repo.git/HEAD HTTP/1.1 200
GET /smart_noexport/repo.git/info/refs HTTP/1.1 200
GET /smart_noexport/repo.git/objects/info/packs HTTP/1.1 200
GET /smart_noexport/repo.git/objects/info/alternates HTTP/1.1 200 -
GET /smart_noexport/repo.git/objects/info/http-alternates HTTP/1.1 200 -
GET /smart_noexport/repo.git/$LOOSE_URL HTTP/1.1 200
GET /smart_noexport/repo.git/$PACK_URL HTTP/1.1 200
GET /smart_noexport/repo.git/$IDX_URL HTTP/1.1 200
### getanyfile true
###
GET /smart/repo.git/HEAD HTTP/1.1 200
GET /smart/repo.git/info/refs HTTP/1.1 200
GET /smart/repo.git/objects/info/packs HTTP/1.1 200
GET /smart/repo.git/objects/info/alternates HTTP/1.1 200 -
GET /smart/repo.git/objects/info/http-alternates HTTP/1.1 200 -
GET /smart/repo.git/$LOOSE_URL HTTP/1.1 200
GET /smart/repo.git/$PACK_URL HTTP/1.1 200
GET /smart/repo.git/$IDX_URL HTTP/1.1 200
### getanyfile false
###
GET /smart/repo.git/HEAD HTTP/1.1 403 -
GET /smart/repo.git/info/refs HTTP/1.1 403 -
GET /smart/repo.git/objects/info/packs HTTP/1.1 403 -
GET /smart/repo.git/objects/info/alternates HTTP/1.1 403 -
GET /smart/repo.git/objects/info/http-alternates HTTP/1.1 403 -
GET /smart/repo.git/$LOOSE_URL HTTP/1.1 403 -
GET /smart/repo.git/$PACK_URL HTTP/1.1 403 -
GET /smart/repo.git/$IDX_URL HTTP/1.1 403 -
### uploadpack default
###
GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
POST /smart/repo.git/git-upload-pack HTTP/1.1 200 -
### uploadpack true
###
GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
POST /smart/repo.git/git-upload-pack HTTP/1.1 200 -
### uploadpack false
###
GET /smart/repo.git/info/refs?service=git-upload-pack HTTP/1.1 403 -
POST /smart/repo.git/git-upload-pack HTTP/1.1 403 -
### receivepack default
###
GET /smart/repo.git/info/refs?service=git-receive-pack HTTP/1.1 403 -
POST /smart/repo.git/git-receive-pack HTTP/1.1 403 -
### receivepack true
###
GET /smart/repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
POST /smart/repo.git/git-receive-pack HTTP/1.1 200 -
### receivepack false
###
GET /smart/repo.git/info/refs?service=git-receive-pack HTTP/1.1 403 -
POST /smart/repo.git/git-receive-pack HTTP/1.1 403 -
EOF
test_expect_success 'server request log matches test results' '
sed -e "
s/^.* \"//
s/\"//
s/ [1-9][0-9]*\$//
s/^GET /GET /
" >act <"$HTTPD_ROOT_PATH"/access.log &&
test_cmp exp act
'
stop_httpd
test_done
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...