Add additional testcases for D/F conflicts
[git/jnareb-git.git] / t / t5541-http-push.sh
blob795dc2bcdf98e582dd2f05d901b791ab4225ce3b
1 #!/bin/sh
3 # Copyright (c) 2008 Clemens Buchacher <drizzd@aon.at>
6 test_description='test smart pushing over http via http-backend'
7 . ./test-lib.sh
9 if test -n "$NO_CURL"; then
10 say 'skipping test, git built without http support'
11 test_done
14 ROOT_PATH="$PWD"
15 LIB_HTTPD_PORT=${LIB_HTTPD_PORT-'5541'}
16 . "$TEST_DIRECTORY"/lib-httpd.sh
17 start_httpd
19 test_expect_success 'setup remote repository' '
20 cd "$ROOT_PATH" &&
21 mkdir test_repo &&
22 cd test_repo &&
23 git init &&
24 : >path1 &&
25 git add path1 &&
26 test_tick &&
27 git commit -m initial &&
28 cd - &&
29 git clone --bare test_repo test_repo.git &&
30 cd test_repo.git &&
31 git config http.receivepack true &&
32 ORIG_HEAD=$(git rev-parse --verify HEAD) &&
33 cd - &&
34 mv test_repo.git "$HTTPD_DOCUMENT_ROOT_PATH"
37 test_expect_success 'clone remote repository' '
38 cd "$ROOT_PATH" &&
39 git clone $HTTPD_URL/smart/test_repo.git test_repo_clone
42 test_expect_success 'push to remote repository' '
43 cd "$ROOT_PATH"/test_repo_clone &&
44 : >path2 &&
45 git add path2 &&
46 test_tick &&
47 git commit -m path2 &&
48 HEAD=$(git rev-parse --verify HEAD) &&
49 git push &&
50 (cd "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git &&
51 test $HEAD = $(git rev-parse --verify HEAD))
54 test_expect_success 'push already up-to-date' '
55 git push
58 test_expect_success 'create and delete remote branch' '
59 cd "$ROOT_PATH"/test_repo_clone &&
60 git checkout -b dev &&
61 : >path3 &&
62 git add path3 &&
63 test_tick &&
64 git commit -m dev &&
65 git push origin dev &&
66 git push origin :dev &&
67 test_must_fail git show-ref --verify refs/remotes/origin/dev
70 cat >exp <<EOF
71 GET /smart/test_repo.git/info/refs?service=git-upload-pack HTTP/1.1 200
72 POST /smart/test_repo.git/git-upload-pack HTTP/1.1 200
73 GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
74 POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
75 GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
76 GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
77 POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
78 GET /smart/test_repo.git/info/refs?service=git-receive-pack HTTP/1.1 200
79 POST /smart/test_repo.git/git-receive-pack HTTP/1.1 200
80 EOF
81 test_expect_success 'used receive-pack service' '
82 sed -e "
83 s/^.* \"//
84 s/\"//
85 s/ [1-9][0-9]*\$//
86 s/^GET /GET /
87 " >act <"$HTTPD_ROOT_PATH"/access.log &&
88 test_cmp exp act
91 test_http_push_nonff "$HTTPD_DOCUMENT_ROOT_PATH"/test_repo.git \
92 "$ROOT_PATH"/test_repo_clone master
94 test_expect_success 'push fails for non-fast-forward refs unmatched by remote helper' '
95 # create a dissimilarly-named remote ref so that git is unable to match the
96 # two refs (viz. local, remote) unless an explicit refspec is provided.
97 git push origin master:retsam
99 echo "change changed" > path2 &&
100 git commit -a -m path2 --amend &&
102 # push master too; this ensures there is at least one '"'push'"' command to
103 # the remote helper and triggers interaction with the helper.
104 !(git push -v origin +master master:retsam >output 2>&1) &&
106 grep "^ + [a-f0-9]*\.\.\.[a-f0-9]* *master -> master (forced update)$" output &&
107 grep "^ ! \[rejected\] *master -> retsam (non-fast-forward)$" output &&
109 grep "To prevent you from losing history, non-fast-forward updates were rejected" \
110 output
113 stop_httpd
114 test_done