2012-11-28 22:11:01 +00:00
|
|
|
#!/bin/sh
|
|
|
|
#
|
|
|
|
# Copyright (c) 2010 Sverre Rabbelier
|
|
|
|
#
|
|
|
|
|
|
|
|
test_description='Test remote-helper import and export commands'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
2013-04-14 10:57:07 +00:00
|
|
|
. "$TEST_DIRECTORY"/lib-gpg.sh
|
2012-11-28 22:11:01 +00:00
|
|
|
|
|
|
|
compare_refs() {
|
|
|
|
git --git-dir="$1/.git" rev-parse --verify $2 >expect &&
|
|
|
|
git --git-dir="$3/.git" rev-parse --verify $4 >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
}
|
|
|
|
|
|
|
|
test_expect_success 'setup repository' '
|
2012-11-28 22:11:04 +00:00
|
|
|
git init server &&
|
|
|
|
(cd server &&
|
2012-11-28 22:11:01 +00:00
|
|
|
echo content >file &&
|
|
|
|
git add file &&
|
2012-11-28 22:11:04 +00:00
|
|
|
git commit -m one)
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'cloning from local repo' '
|
2012-11-28 22:11:04 +00:00
|
|
|
git clone "testgit::${PWD}/server" local &&
|
|
|
|
test_cmp server/file local/file
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'create new commit on remote' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd server &&
|
2012-11-28 22:11:01 +00:00
|
|
|
echo content >>file &&
|
2012-11-28 22:11:04 +00:00
|
|
|
git commit -a -m two)
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'pulling from local repo' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd local && git pull) &&
|
|
|
|
test_cmp server/file local/file
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'pushing to local repo' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd local &&
|
2012-11-28 22:11:01 +00:00
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m three &&
|
|
|
|
git push) &&
|
2012-11-28 22:11:04 +00:00
|
|
|
compare_refs local HEAD server HEAD
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch new branch' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd server &&
|
|
|
|
git reset --hard &&
|
2012-11-28 22:11:01 +00:00
|
|
|
git checkout -b new &&
|
|
|
|
echo content >>file &&
|
2012-11-28 22:11:04 +00:00
|
|
|
git commit -a -m five
|
2012-11-28 22:11:01 +00:00
|
|
|
) &&
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd local &&
|
2012-11-28 22:11:01 +00:00
|
|
|
git fetch origin new
|
|
|
|
) &&
|
2012-11-28 22:11:04 +00:00
|
|
|
compare_refs server HEAD local FETCH_HEAD
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch multiple branches' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd local &&
|
2012-11-28 22:11:01 +00:00
|
|
|
git fetch
|
|
|
|
) &&
|
2012-11-28 22:11:04 +00:00
|
|
|
compare_refs server master local refs/remotes/origin/master &&
|
|
|
|
compare_refs server new local refs/remotes/origin/new
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push when remote has extra refs' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd local &&
|
2012-11-28 22:11:02 +00:00
|
|
|
git reset --hard origin/master &&
|
2012-11-28 22:11:01 +00:00
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m six &&
|
|
|
|
git push
|
|
|
|
) &&
|
2012-11-28 22:11:04 +00:00
|
|
|
compare_refs local master server master
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push new branch by name' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd local &&
|
2012-11-28 22:11:01 +00:00
|
|
|
git checkout -b new-name &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m seven &&
|
|
|
|
git push origin new-name
|
|
|
|
) &&
|
2012-11-28 22:11:04 +00:00
|
|
|
compare_refs local HEAD server refs/heads/new-name
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_failure 'push new branch with old:new refspec' '
|
2012-11-28 22:11:04 +00:00
|
|
|
(cd local &&
|
2012-11-28 22:11:01 +00:00
|
|
|
git push origin new-name:new-refspec
|
|
|
|
) &&
|
2012-11-28 22:11:04 +00:00
|
|
|
compare_refs local HEAD server refs/heads/new-refspec
|
2012-11-28 22:11:01 +00:00
|
|
|
'
|
|
|
|
|
2013-11-12 20:56:56 +00:00
|
|
|
test_expect_success 'forced push' '
|
|
|
|
(cd local &&
|
|
|
|
git checkout -b force-test &&
|
|
|
|
echo content >> file &&
|
|
|
|
git commit -a -m eight &&
|
|
|
|
git push origin force-test &&
|
|
|
|
echo content >> file &&
|
|
|
|
git commit -a --amend -m eight-modified &&
|
|
|
|
git push --force origin force-test
|
|
|
|
) &&
|
|
|
|
compare_refs local refs/heads/force-test server refs/heads/force-test
|
|
|
|
'
|
|
|
|
|
2012-11-28 22:11:05 +00:00
|
|
|
test_expect_success 'cloning without refspec' '
|
|
|
|
GIT_REMOTE_TESTGIT_REFSPEC="" \
|
2013-04-18 04:14:31 +00:00
|
|
|
git clone "testgit::${PWD}/server" local2 2>error &&
|
|
|
|
grep "This remote helper should implement refspec capability" error &&
|
2012-11-28 22:11:05 +00:00
|
|
|
compare_refs local2 HEAD server HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'pulling without refspecs' '
|
|
|
|
(cd local2 &&
|
|
|
|
git reset --hard &&
|
2013-04-18 04:14:31 +00:00
|
|
|
GIT_REMOTE_TESTGIT_REFSPEC="" git pull 2>../error) &&
|
|
|
|
grep "This remote helper should implement refspec capability" error &&
|
2012-11-28 22:11:05 +00:00
|
|
|
compare_refs local2 HEAD server HEAD
|
|
|
|
'
|
|
|
|
|
2013-04-18 04:14:30 +00:00
|
|
|
test_expect_success 'pushing without refspecs' '
|
2012-11-28 22:11:05 +00:00
|
|
|
test_when_finished "(cd local2 && git reset --hard origin)" &&
|
|
|
|
(cd local2 &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m ten &&
|
2013-04-25 17:18:37 +00:00
|
|
|
GIT_REMOTE_TESTGIT_REFSPEC="" &&
|
|
|
|
export GIT_REMOTE_TESTGIT_REFSPEC &&
|
|
|
|
test_must_fail git push 2>../error) &&
|
2013-04-18 04:14:30 +00:00
|
|
|
grep "remote-helper doesn.t support push; refspec needed" error
|
2012-11-28 22:11:05 +00:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'pulling without marks' '
|
|
|
|
(cd local2 &&
|
|
|
|
GIT_REMOTE_TESTGIT_NO_MARKS=1 git pull) &&
|
|
|
|
compare_refs local2 HEAD server HEAD
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_failure 'pushing without marks' '
|
|
|
|
test_when_finished "(cd local2 && git reset --hard origin)" &&
|
|
|
|
(cd local2 &&
|
|
|
|
echo content >>file &&
|
|
|
|
git commit -a -m twelve &&
|
|
|
|
GIT_REMOTE_TESTGIT_NO_MARKS=1 git push) &&
|
|
|
|
compare_refs local2 HEAD server HEAD
|
|
|
|
'
|
|
|
|
|
fast-export: don't handle uninteresting refs
They have been marked as UNINTERESTING for a reason, lets respect
that. Currently the first ref is handled properly, but not the
rest. Assuming that all the refs point at the same commit in the
following example:
% git fast-export master ^uninteresting ^foo ^bar
reset refs/heads/bar
from :0
reset refs/heads/foo
from :0
reset refs/heads/uninteresting
from :0
% git fast-export ^uninteresting ^foo ^bar master
reset refs/heads/master
from :0
reset refs/heads/bar
from :0
reset refs/heads/foo
from :0
Clearly this is wrong; the negative refs should be ignored.
After this patch:
% git fast-export ^uninteresting ^foo ^bar master
# nothing
% git fast-export master ^uninteresting ^foo ^bar
# nothing
And even more, it would only happen if the ref is pointing to exactly
the same commit, but not otherwise:
% git fast-export ^next next
reset refs/heads/next
from :0
% git fast-export ^next next^{commit}
# nothing
% git fast-export ^next next~0
# nothing
% git fast-export ^next next~1
# nothing
% git fast-export ^next next~2
# nothing
The reason this happens is that before traversing the commits,
fast-export checks if any of the refs point to the same object, and any
duplicated ref gets added to a list in order to issue 'reset' commands
after the traversing. Unfortunately, it's not even checking if the
commit is flagged as UNINTERESTING. The fix of course, is to check it.
However, in order to do it properly we need to get the UNINTERESTING
flag from the command line, not from the commit object, because
"^foo bar" will mark the commit 'bar' uninteresting if foo and bar
points at the same commit. rev_cmdline_info, which was introduced
exactly to handle this situation, contains all the information we
need for get_tags_and_duplicates(), plus the ref flag. This way the
rest of the positive refs will remain untouched; it's only the
negative ones that change in behavior.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-28 22:23:59 +00:00
|
|
|
test_expect_success 'push all with existing object' '
|
|
|
|
(cd local &&
|
|
|
|
git branch dup2 master &&
|
|
|
|
git push origin --all
|
|
|
|
) &&
|
|
|
|
compare_refs local dup2 server dup2
|
|
|
|
'
|
|
|
|
|
fast-export: make sure updated refs get updated
When an object has already been exported (and thus is in the marks) it's
flagged as SHOWN, so it will not be exported again, even if in a later
time it's exported through a different ref.
We don't need the object to be exported again, but we want the ref
updated, which doesn't happen.
Since we can't know if a ref was exported or not, let's just assume that
if the commit was marked (flags & SHOWN), the user still wants the ref
updated.
IOW: If it's specified in the command line, it will get updated,
regardless of whether or not the object was marked.
So:
% git branch test master
% git fast-export $mark_flags master
% git fast-export $mark_flags test
Would export 'test' properly.
Additionally, this fixes issues with remote helpers; now they can push
refs whose objects have already been exported, and a few other issues as
well. Update the tests accordingly.
Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2012-11-28 22:24:00 +00:00
|
|
|
test_expect_success 'push ref with existing object' '
|
|
|
|
(cd local &&
|
|
|
|
git branch dup master &&
|
|
|
|
git push origin dup
|
|
|
|
) &&
|
|
|
|
compare_refs local dup server dup
|
|
|
|
'
|
|
|
|
|
2013-04-14 10:57:07 +00:00
|
|
|
test_expect_success GPG 'push signed tag' '
|
|
|
|
(cd local &&
|
|
|
|
git checkout master &&
|
|
|
|
git tag -s -m signed-tag signed-tag &&
|
|
|
|
git push origin signed-tag
|
|
|
|
) &&
|
2013-04-14 10:57:08 +00:00
|
|
|
compare_refs local signed-tag^{} server signed-tag^{} &&
|
|
|
|
test_must_fail compare_refs local signed-tag server signed-tag
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success GPG 'push signed tag with signed-tags capability' '
|
|
|
|
(cd local &&
|
|
|
|
git checkout master &&
|
|
|
|
git tag -s -m signed-tag signed-tag-2 &&
|
|
|
|
GIT_REMOTE_TESTGIT_SIGNED_TAGS=1 git push origin signed-tag-2
|
|
|
|
) &&
|
|
|
|
compare_refs local signed-tag-2 server signed-tag-2
|
2013-04-14 10:57:07 +00:00
|
|
|
'
|
|
|
|
|
2013-04-18 04:14:33 +00:00
|
|
|
test_expect_success 'push update refs' '
|
|
|
|
(cd local &&
|
|
|
|
git checkout -b update master &&
|
|
|
|
echo update >>file &&
|
|
|
|
git commit -a -m update &&
|
2013-05-10 12:08:29 +00:00
|
|
|
git push origin update &&
|
2013-04-18 04:14:33 +00:00
|
|
|
git rev-parse --verify remotes/origin/update >expect &&
|
|
|
|
git rev-parse --verify testgit/origin/heads/update >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-09-03 15:45:14 +00:00
|
|
|
test_expect_success 'push update refs disabled by no-private-update' '
|
|
|
|
(cd local &&
|
|
|
|
echo more-update >>file &&
|
|
|
|
git commit -a -m more-update &&
|
|
|
|
git rev-parse --verify testgit/origin/heads/update >expect &&
|
|
|
|
GIT_REMOTE_TESTGIT_NO_PRIVATE_UPDATE=t git push origin update &&
|
|
|
|
git rev-parse --verify testgit/origin/heads/update >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-05-10 12:08:30 +00:00
|
|
|
test_expect_success 'push update refs failure' '
|
|
|
|
(cd local &&
|
|
|
|
git checkout update &&
|
|
|
|
echo "update fail" >>file &&
|
|
|
|
git commit -a -m "update fail" &&
|
|
|
|
git rev-parse --verify testgit/origin/heads/update >expect &&
|
2014-05-20 21:18:11 +00:00
|
|
|
test_expect_code 1 env GIT_REMOTE_TESTGIT_FAILURE="non-fast forward" \
|
|
|
|
git push origin update &&
|
2013-05-10 12:08:30 +00:00
|
|
|
git rev-parse --verify testgit/origin/heads/update >actual &&
|
|
|
|
test_cmp expect actual
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2014-05-20 21:18:11 +00:00
|
|
|
clean_mark () {
|
|
|
|
cut -f 2 -d ' ' "$1" |
|
|
|
|
git cat-file --batch-check |
|
|
|
|
grep commit |
|
|
|
|
sort >$(basename "$1")
|
|
|
|
}
|
|
|
|
|
|
|
|
cmp_marks () {
|
|
|
|
test_when_finished "rm -rf git.marks testgit.marks" &&
|
|
|
|
clean_mark ".git/testgit/$1/git.marks" &&
|
|
|
|
clean_mark ".git/testgit/$1/testgit.marks" &&
|
|
|
|
test_cmp git.marks testgit.marks
|
|
|
|
}
|
|
|
|
|
2013-04-10 21:15:52 +00:00
|
|
|
test_expect_success 'proper failure checks for fetching' '
|
2014-05-20 21:18:11 +00:00
|
|
|
(cd local &&
|
|
|
|
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git fetch 2>error &&
|
2013-04-10 21:15:52 +00:00
|
|
|
cat error &&
|
|
|
|
grep -q "Error while running fast-import" error
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'proper failure checks for pushing' '
|
2014-03-18 18:54:05 +00:00
|
|
|
(cd local &&
|
2014-05-20 21:18:11 +00:00
|
|
|
git checkout -b crash master &&
|
|
|
|
echo crash >>file &&
|
|
|
|
git commit -a -m crash &&
|
|
|
|
test_must_fail env GIT_REMOTE_TESTGIT_FAILURE=1 git push --all &&
|
|
|
|
cmp_marks origin
|
2013-04-10 21:15:52 +00:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-05-03 23:41:59 +00:00
|
|
|
test_expect_success 'push messages' '
|
|
|
|
(cd local &&
|
|
|
|
git checkout -b new_branch master &&
|
|
|
|
echo new >>file &&
|
|
|
|
git commit -a -m new &&
|
|
|
|
git push origin new_branch &&
|
|
|
|
git fetch origin &&
|
|
|
|
echo new >>file &&
|
|
|
|
git commit -a -m new &&
|
|
|
|
git push origin new_branch 2> msg &&
|
|
|
|
! grep "\[new branch\]" msg
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2012-11-28 22:11:01 +00:00
|
|
|
test_done
|