mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'tc/http-urls-ends-with-slash'

Browse Source 
* tc/http-urls-ends-with-slash:
  http-fetch: rework url handling
  http-push: add trailing slash at arg-parse time, instead of later on
  http-push: check path length before using it
  http-push: Normalise directory names when pushing to some WebDAV servers
  http-backend: use end_url_with_slash()
  url: add str wrapper for end_url_with_slash()
  shift end_url_with_slash() from http.[ch] to url.[ch]
  t5550-http-fetch: add test for http-fetch
  t5550-http-fetch: add missing '&&'
This commit is contained in:
Junio C Hamano
2010-12-12 21:49:52 -08:00
parent 33935dca6d 6f5185bd2d
commit a0078dee90
9 changed files with 55 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
t/t5550-http-fetch.sh
View File

@ -30,7 +30,8 @@ test_expect_success 'create http-accessible bare repository' '
'
test_expect_success 'clone http repository' '
git clone $HTTPD_URL/dumb/repo.git clone &&
git clone $HTTPD_URL/dumb/repo.git clone-tmpl &&
cp -R clone-tmpl clone &&
test_cmp file clone/file
'
@ -44,11 +45,22 @@ test_expect_success 'clone http repository with authentication' '
test_expect_success 'fetch changes via http' '
echo content >>file &&
git commit -a -m two &&
git push public
git push public &&
(cd clone && git pull) &&
test_cmp file clone/file
'
test_expect_success 'fetch changes via manual http-fetch' '
cp -R clone-tmpl clone2 &&
HEAD=$(git rev-parse --verify HEAD) &&
(cd clone2 &&
git http-fetch -a -w heads/master-new $HEAD $(git config remote.origin.url) &&
git checkout master-new &&
test $HEAD = $(git rev-parse --verify HEAD)) &&
test_cmp file clone2/file
'
test_expect_success 'http remote detects correct HEAD' '
git push public master:other &&
(cd clone &&