2007-06-08 09:43:22 +02:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
2013-04-02 09:40:30 +02:00
|
|
|
test_description='Basic fetch/push functionality.
|
|
|
|
|
|
|
|
|
|
This test checks the following functionality:
|
|
|
|
|
|
|
|
|
|
* command-line syntax
|
|
|
|
|
* refspecs
|
|
|
|
|
* fast-forward detection, and overriding it
|
|
|
|
|
* configuration
|
|
|
|
|
* hooks
|
|
|
|
|
* --porcelain output format
|
|
|
|
|
* hiderefs
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 14:11:19 +01:00
|
|
|
* reflogs
|
2013-04-02 09:40:30 +02:00
|
|
|
'
|
2007-06-08 09:43:22 +02:00
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
|
|
D=`pwd`
|
|
|
|
|
|
|
|
|
|
mk_empty () {
|
2013-04-02 09:40:31 +02:00
|
|
|
repo_name="$1"
|
|
|
|
|
rm -fr "$repo_name" &&
|
|
|
|
|
mkdir "$repo_name" &&
|
2007-06-08 09:43:22 +02:00
|
|
|
(
|
2013-04-02 09:40:31 +02:00
|
|
|
cd "$repo_name" &&
|
2007-07-04 14:06:04 +02:00
|
|
|
git init &&
|
2009-02-11 11:28:03 +01:00
|
|
|
git config receive.denyCurrentBranch warn &&
|
2007-07-04 14:06:04 +02:00
|
|
|
mv .git/hooks .git/hooks-disabled
|
2007-06-08 09:43:22 +02:00
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-09 10:23:53 +02:00
|
|
|
mk_test () {
|
2013-04-02 09:40:31 +02:00
|
|
|
repo_name="$1"
|
|
|
|
|
shift
|
|
|
|
|
|
|
|
|
|
mk_empty "$repo_name" &&
|
2007-06-09 10:23:53 +02:00
|
|
|
(
|
|
|
|
|
for ref in "$@"
|
|
|
|
|
do
|
2013-04-02 09:40:31 +02:00
|
|
|
git push "$repo_name" $the_first_commit:refs/$ref ||
|
2013-03-19 00:14:26 +01:00
|
|
|
exit
|
2007-06-09 10:23:53 +02:00
|
|
|
done &&
|
2013-04-02 09:40:31 +02:00
|
|
|
cd "$repo_name" &&
|
2007-06-09 10:23:53 +02:00
|
|
|
for ref in "$@"
|
|
|
|
|
do
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_first_commit" >expect &&
|
|
|
|
|
git show-ref -s --verify refs/$ref >actual &&
|
|
|
|
|
test_cmp expect actual ||
|
|
|
|
|
exit
|
2007-06-09 10:23:53 +02:00
|
|
|
done &&
|
|
|
|
|
git fsck --full
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
2011-09-28 17:39:35 +02:00
|
|
|
mk_test_with_hooks() {
|
2013-04-02 09:40:31 +02:00
|
|
|
repo_name=$1
|
2011-09-28 17:39:35 +02:00
|
|
|
mk_test "$@" &&
|
|
|
|
|
(
|
2013-04-02 09:40:31 +02:00
|
|
|
cd "$repo_name" &&
|
2011-09-28 17:39:35 +02:00
|
|
|
mkdir .git/hooks &&
|
|
|
|
|
cd .git/hooks &&
|
|
|
|
|
|
|
|
|
|
cat >pre-receive <<-'EOF' &&
|
|
|
|
|
#!/bin/sh
|
|
|
|
|
cat - >>pre-receive.actual
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >update <<-'EOF' &&
|
|
|
|
|
#!/bin/sh
|
|
|
|
|
printf "%s %s %s\n" "$@" >>update.actual
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-receive <<-'EOF' &&
|
|
|
|
|
#!/bin/sh
|
|
|
|
|
cat - >>post-receive.actual
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-update <<-'EOF' &&
|
|
|
|
|
#!/bin/sh
|
|
|
|
|
for ref in "$@"
|
|
|
|
|
do
|
|
|
|
|
printf "%s\n" "$ref" >>post-update.actual
|
|
|
|
|
done
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
chmod +x pre-receive update post-receive post-update
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
2008-11-07 23:20:33 +01:00
|
|
|
mk_child() {
|
2013-04-02 09:40:31 +02:00
|
|
|
rm -rf "$2" &&
|
|
|
|
|
git clone "$1" "$2"
|
2008-11-07 23:20:33 +01:00
|
|
|
}
|
|
|
|
|
|
2007-06-09 10:23:53 +02:00
|
|
|
check_push_result () {
|
2013-04-02 09:40:31 +02:00
|
|
|
repo_name="$1"
|
|
|
|
|
shift
|
|
|
|
|
|
2007-06-09 10:23:53 +02:00
|
|
|
(
|
2013-04-02 09:40:31 +02:00
|
|
|
cd "$repo_name" &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$1" >expect &&
|
|
|
|
|
shift &&
|
2007-06-09 10:23:53 +02:00
|
|
|
for ref in "$@"
|
|
|
|
|
do
|
2013-03-19 00:13:41 +01:00
|
|
|
git show-ref -s --verify refs/$ref >actual &&
|
|
|
|
|
test_cmp expect actual ||
|
|
|
|
|
exit
|
2007-06-09 10:23:53 +02:00
|
|
|
done &&
|
|
|
|
|
git fsck --full
|
|
|
|
|
)
|
|
|
|
|
}
|
|
|
|
|
|
2007-06-08 09:43:22 +02:00
|
|
|
test_expect_success setup '
|
|
|
|
|
|
2010-04-20 00:08:31 +02:00
|
|
|
>path1 &&
|
2007-06-08 09:43:22 +02:00
|
|
|
git add path1 &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -a -m repo &&
|
2007-06-09 10:23:53 +02:00
|
|
|
the_first_commit=$(git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
|
2010-04-20 00:08:31 +02:00
|
|
|
>path2 &&
|
2007-06-09 10:23:53 +02:00
|
|
|
git add path2 &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -a -m second &&
|
2007-06-08 09:43:22 +02:00
|
|
|
the_commit=$(git show-ref -s --verify refs/heads/master)
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'fetch without wildcard' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 09:43:22 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
|
|
|
|
git fetch .. refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2007-06-08 09:43:22 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'fetch with wildcard' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 09:43:22 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
|
|
|
|
git config remote.up.url .. &&
|
|
|
|
|
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
|
git fetch up &&
|
|
|
|
|
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2007-06-08 09:43:22 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2008-02-20 19:43:53 +01:00
|
|
|
test_expect_success 'fetch with insteadOf' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2008-02-20 19:43:53 +01:00
|
|
|
(
|
2008-04-12 21:32:00 +02:00
|
|
|
TRASH=$(pwd)/ &&
|
2008-02-20 19:43:53 +01:00
|
|
|
cd testrepo &&
|
2008-05-04 07:37:59 +02:00
|
|
|
git config "url.$TRASH.insteadOf" trash/ &&
|
2008-02-20 19:43:53 +01:00
|
|
|
git config remote.up.url trash/. &&
|
|
|
|
|
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
|
git fetch up &&
|
|
|
|
|
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2008-02-20 19:43:53 +01:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2009-09-07 10:56:33 +02:00
|
|
|
test_expect_success 'fetch with pushInsteadOf (should not rewrite)' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2009-09-07 10:56:33 +02:00
|
|
|
(
|
|
|
|
|
TRASH=$(pwd)/ &&
|
|
|
|
|
cd testrepo &&
|
|
|
|
|
git config "url.trash/.pushInsteadOf" "$TRASH" &&
|
|
|
|
|
git config remote.up.url "$TRASH." &&
|
|
|
|
|
git config remote.up.fetch "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
|
git fetch up &&
|
|
|
|
|
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2009-09-07 10:56:33 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2007-06-08 09:43:22 +02:00
|
|
|
test_expect_success 'push without wildcard' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 09:43:22 +02:00
|
|
|
|
|
|
|
|
git push testrepo refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2007-06-08 09:43:22 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with wildcard' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2007-06-08 09:43:22 +02:00
|
|
|
|
|
|
|
|
git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2007-06-08 09:43:22 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2008-02-20 19:43:53 +01:00
|
|
|
test_expect_success 'push with insteadOf' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2008-05-04 07:37:59 +02:00
|
|
|
TRASH="$(pwd)/" &&
|
2013-03-19 00:12:11 +01:00
|
|
|
test_config "url.$TRASH.insteadOf" trash/ &&
|
2008-02-20 19:43:53 +01:00
|
|
|
git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2008-02-20 19:43:53 +01:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2009-09-07 10:56:33 +02:00
|
|
|
test_expect_success 'push with pushInsteadOf' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2009-09-07 10:56:33 +02:00
|
|
|
TRASH="$(pwd)/" &&
|
2013-03-19 00:12:11 +01:00
|
|
|
test_config "url.$TRASH.pushInsteadOf" trash/ &&
|
2009-09-07 10:56:33 +02:00
|
|
|
git push trash/testrepo refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2009-09-07 10:56:33 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with pushInsteadOf and explicit pushurl (pushInsteadOf should not rewrite)' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2013-04-03 18:34:48 +02:00
|
|
|
test_config "url.trash2/.pushInsteadOf" testrepo/ &&
|
|
|
|
|
test_config "url.trash3/.pusnInsteadOf" trash/wrong &&
|
2013-03-19 00:12:11 +01:00
|
|
|
test_config remote.r.url trash/wrong &&
|
2013-04-03 18:34:48 +02:00
|
|
|
test_config remote.r.pushurl "testrepo/" &&
|
2009-09-07 10:56:33 +02:00
|
|
|
git push r refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2009-09-07 10:56:33 +02:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2007-06-09 10:23:53 +02:00
|
|
|
test_expect_success 'push with matching heads' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2013-01-05 01:08:26 +01:00
|
|
|
git push testrepo : &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master
|
2007-06-09 10:23:53 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2008-04-28 17:32:12 +02:00
|
|
|
test_expect_success 'push with matching heads on the command line' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2008-04-28 17:32:12 +02:00
|
|
|
git push testrepo : &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master
|
2008-04-28 17:32:12 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'failed (non-fast-forward) push with matching heads' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2008-04-28 17:32:12 +02:00
|
|
|
git push testrepo : &&
|
|
|
|
|
git commit --amend -massaged &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git push testrepo &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
2008-04-28 17:32:12 +02:00
|
|
|
git reset --hard $the_commit
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --force with matching heads' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2008-04-28 17:32:12 +02:00
|
|
|
git push testrepo : &&
|
|
|
|
|
git commit --amend -massaged &&
|
2013-01-05 01:08:26 +01:00
|
|
|
git push --force testrepo : &&
|
2013-04-02 09:40:31 +02:00
|
|
|
! check_push_result testrepo $the_commit heads/master &&
|
2008-04-28 17:32:12 +02:00
|
|
|
git reset --hard $the_commit
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with matching heads and forced update' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2008-04-28 17:32:12 +02:00
|
|
|
git push testrepo : &&
|
|
|
|
|
git commit --amend -massaged &&
|
|
|
|
|
git push testrepo +: &&
|
2013-04-02 09:40:31 +02:00
|
|
|
! check_push_result testrepo $the_commit heads/master &&
|
2008-04-28 17:32:12 +02:00
|
|
|
git reset --hard $the_commit
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2007-06-09 10:23:53 +02:00
|
|
|
test_expect_success 'push with no ambiguity (1)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2007-06-09 10:23:53 +02:00
|
|
|
git push testrepo master:master &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master
|
2007-06-09 10:23:53 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with no ambiguity (2)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo remotes/origin/master &&
|
2007-11-11 15:01:47 +01:00
|
|
|
git push testrepo master:origin/master &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit remotes/origin/master
|
2007-06-09 10:23:53 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2007-11-11 15:01:47 +01:00
|
|
|
test_expect_success 'push with colon-less refspec, no ambiguity' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master heads/t/master &&
|
2007-11-11 15:01:47 +01:00
|
|
|
git branch -f t/master master &&
|
|
|
|
|
git push testrepo master &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
|
|
|
|
check_push_result testrepo $the_first_commit heads/t/master
|
2007-11-11 15:01:47 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2007-06-09 10:23:53 +02:00
|
|
|
test_expect_success 'push with weak ambiguity (1)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master remotes/origin/master &&
|
2007-06-09 10:23:53 +02:00
|
|
|
git push testrepo master:master &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
|
|
|
|
check_push_result testrepo $the_first_commit remotes/origin/master
|
2007-06-09 10:23:53 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with weak ambiguity (2)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master remotes/origin/master remotes/another/master &&
|
2007-06-09 10:23:53 +02:00
|
|
|
git push testrepo master:master &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
|
|
|
|
check_push_result testrepo $the_first_commit remotes/origin/master remotes/another/master
|
2007-06-09 10:23:53 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2008-04-23 11:21:45 +02:00
|
|
|
test_expect_success 'push with ambiguity' '
|
2007-06-09 10:23:53 +02:00
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/frotz tags/frotz &&
|
2013-03-19 00:14:26 +01:00
|
|
|
test_must_fail git push testrepo master:frotz &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_first_commit heads/frotz tags/frotz
|
2007-06-09 10:37:14 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with colon-less refspec (1)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/frotz tags/frotz &&
|
2007-06-09 10:37:14 +02:00
|
|
|
git branch -f frotz master &&
|
|
|
|
|
git push testrepo frotz &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/frotz &&
|
|
|
|
|
check_push_result testrepo $the_first_commit tags/frotz
|
2007-06-09 10:37:14 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with colon-less refspec (2)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/frotz tags/frotz &&
|
2007-06-09 10:37:14 +02:00
|
|
|
if git show-ref --verify -q refs/heads/frotz
|
|
|
|
|
then
|
|
|
|
|
git branch -D frotz
|
|
|
|
|
fi &&
|
|
|
|
|
git tag -f frotz &&
|
2012-11-30 02:41:37 +01:00
|
|
|
git push -f testrepo frotz &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit tags/frotz &&
|
|
|
|
|
check_push_result testrepo $the_first_commit heads/frotz
|
2007-06-09 10:37:14 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with colon-less refspec (3)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo &&
|
2007-06-09 10:37:14 +02:00
|
|
|
if git show-ref --verify -q refs/tags/frotz
|
|
|
|
|
then
|
|
|
|
|
git tag -d frotz
|
|
|
|
|
fi &&
|
|
|
|
|
git branch -f frotz master &&
|
|
|
|
|
git push testrepo frotz &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/frotz &&
|
2007-07-01 17:48:54 +02:00
|
|
|
test 1 = $( cd testrepo && git show-ref | wc -l )
|
2007-06-09 10:37:14 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with colon-less refspec (4)' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo &&
|
2007-06-09 10:37:14 +02:00
|
|
|
if git show-ref --verify -q refs/heads/frotz
|
|
|
|
|
then
|
|
|
|
|
git branch -D frotz
|
|
|
|
|
fi &&
|
|
|
|
|
git tag -f frotz &&
|
|
|
|
|
git push testrepo frotz &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit tags/frotz &&
|
2007-07-01 17:48:54 +02:00
|
|
|
test 1 = $( cd testrepo && git show-ref | wc -l )
|
2007-06-09 10:37:14 +02:00
|
|
|
|
2007-06-09 10:23:53 +02:00
|
|
|
'
|
|
|
|
|
|
2011-06-16 15:42:48 +02:00
|
|
|
test_expect_success 'push head with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo &&
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
git push testrepo master:branch &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/branch
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2011-06-16 15:42:48 +02:00
|
|
|
test_expect_success 'push tag with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo &&
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
git tag -f v1.0 &&
|
|
|
|
|
git push testrepo v1.0:tag &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit tags/tag
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2011-06-16 15:42:48 +02:00
|
|
|
test_expect_success 'push sha1 with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo &&
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
test_must_fail git push testrepo `git rev-parse master`:foo
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2011-06-16 15:42:48 +02:00
|
|
|
test_expect_success 'push ref expression with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo &&
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
test_must_fail git push testrepo master^:branch
|
|
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2007-11-11 15:35:07 +01:00
|
|
|
test_expect_success 'push with HEAD' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2007-11-11 15:35:07 +01:00
|
|
|
git checkout master &&
|
|
|
|
|
git push testrepo HEAD &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master
|
2007-11-11 15:35:07 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with HEAD nonexisting at remote' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2007-11-11 15:35:07 +01:00
|
|
|
git checkout -b local master &&
|
|
|
|
|
git push testrepo HEAD &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/local
|
2007-11-11 15:35:07 +01:00
|
|
|
'
|
|
|
|
|
|
2008-02-20 18:54:05 +01:00
|
|
|
test_expect_success 'push with +HEAD' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2008-02-20 18:54:05 +01:00
|
|
|
git checkout master &&
|
|
|
|
|
git branch -D local &&
|
|
|
|
|
git checkout -b local &&
|
|
|
|
|
git push testrepo master local &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
|
|
|
|
check_push_result testrepo $the_commit heads/local &&
|
2008-02-20 18:54:05 +01:00
|
|
|
|
|
|
|
|
# Without force rewinding should fail
|
|
|
|
|
git reset --hard HEAD^ &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git push testrepo HEAD &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/local &&
|
2008-02-20 18:54:05 +01:00
|
|
|
|
|
|
|
|
# With force rewinding should succeed
|
|
|
|
|
git push testrepo +HEAD &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_first_commit heads/local
|
2008-02-20 18:54:05 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2011-06-16 15:42:48 +02:00
|
|
|
test_expect_success 'push HEAD with non-existent, incomplete dest' '
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo &&
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
git checkout master &&
|
|
|
|
|
git push testrepo HEAD:branch &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/branch
|
push: allow unqualified dest refspecs to DWIM
Previously, a push like:
git push remote src:dst
would go through the following steps:
1. check for an unambiguous 'dst' on the remote; if it
exists, then push to that ref
2. otherwise, check if 'dst' begins with 'refs/'; if it
does, create a new ref
3. otherwise, complain because we don't know where in the
refs hierarchy to put 'dst'
However, in some cases, we can guess about the ref type of
'dst' based on the ref type of 'src'. Specifically, before
complaining we now check:
2.5. if 'src' resolves to a ref starting with refs/heads
or refs/tags, then prepend that to 'dst'
So now this creates a new branch on the remote, whereas it
previously failed with an error message:
git push master:newbranch
Note that, by design, we limit this DWIM behavior only to
source refs which resolve exactly (including symrefs which
resolve to existing refs). We still complain on a partial
destination refspec if the source is a raw sha1, or a ref
expression such as 'master~10'.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-04-23 11:16:06 +02:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2008-02-20 18:54:05 +01:00
|
|
|
test_expect_success 'push with config remote.*.push = HEAD' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/local &&
|
2008-02-20 18:54:05 +01:00
|
|
|
git checkout master &&
|
|
|
|
|
git branch -f local $the_commit &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
|
|
|
|
git checkout local &&
|
|
|
|
|
git reset --hard $the_first_commit
|
|
|
|
|
) &&
|
2013-03-19 00:12:11 +01:00
|
|
|
test_config remote.there.url testrepo &&
|
|
|
|
|
test_config remote.there.push HEAD &&
|
|
|
|
|
test_config branch.master.remote there &&
|
2008-02-20 18:54:05 +01:00
|
|
|
git push &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
|
|
|
|
check_push_result testrepo $the_first_commit heads/local
|
2008-02-20 18:54:05 +01:00
|
|
|
'
|
|
|
|
|
|
2013-04-02 09:40:33 +02:00
|
|
|
test_expect_success 'push with remote.pushdefault' '
|
|
|
|
|
mk_test up_repo heads/master &&
|
|
|
|
|
mk_test down_repo heads/master &&
|
|
|
|
|
test_config remote.up.url up_repo &&
|
|
|
|
|
test_config remote.down.url down_repo &&
|
|
|
|
|
test_config branch.master.remote up &&
|
|
|
|
|
test_config remote.pushdefault down &&
|
2013-04-18 20:47:59 +02:00
|
|
|
test_config push.default matching &&
|
2013-04-02 09:40:33 +02:00
|
|
|
git push &&
|
|
|
|
|
check_push_result up_repo $the_first_commit heads/master &&
|
|
|
|
|
check_push_result down_repo $the_commit heads/master
|
2008-02-20 18:54:05 +01:00
|
|
|
'
|
|
|
|
|
|
2009-06-09 18:01:35 +02:00
|
|
|
test_expect_success 'push with config remote.*.pushurl' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2009-06-09 18:01:35 +02:00
|
|
|
git checkout master &&
|
2013-03-19 00:12:11 +01:00
|
|
|
test_config remote.there.url test2repo &&
|
|
|
|
|
test_config remote.there.pushurl testrepo &&
|
2013-01-05 01:08:26 +01:00
|
|
|
git push there : &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master
|
2009-06-09 18:01:35 +02:00
|
|
|
'
|
|
|
|
|
|
2013-04-02 09:40:34 +02:00
|
|
|
test_expect_success 'push with config branch.*.pushremote' '
|
|
|
|
|
mk_test up_repo heads/master &&
|
|
|
|
|
mk_test side_repo heads/master &&
|
|
|
|
|
mk_test down_repo heads/master &&
|
|
|
|
|
test_config remote.up.url up_repo &&
|
|
|
|
|
test_config remote.pushdefault side_repo &&
|
|
|
|
|
test_config remote.down.url down_repo &&
|
|
|
|
|
test_config branch.master.remote up &&
|
|
|
|
|
test_config branch.master.pushremote down &&
|
2013-04-18 20:47:59 +02:00
|
|
|
test_config push.default matching &&
|
2013-04-02 09:40:34 +02:00
|
|
|
git push &&
|
|
|
|
|
check_push_result up_repo $the_first_commit heads/master &&
|
|
|
|
|
check_push_result side_repo $the_first_commit heads/master &&
|
|
|
|
|
check_push_result down_repo $the_commit heads/master
|
2009-06-09 18:01:35 +02:00
|
|
|
'
|
|
|
|
|
|
2014-02-24 09:59:03 +01:00
|
|
|
test_expect_success 'branch.*.pushremote config order is irrelevant' '
|
|
|
|
|
mk_test one_repo heads/master &&
|
|
|
|
|
mk_test two_repo heads/master &&
|
|
|
|
|
test_config remote.one.url one_repo &&
|
|
|
|
|
test_config remote.two.url two_repo &&
|
|
|
|
|
test_config branch.master.pushremote two_repo &&
|
|
|
|
|
test_config remote.pushdefault one_repo &&
|
|
|
|
|
test_config push.default matching &&
|
|
|
|
|
git push &&
|
|
|
|
|
check_push_result one_repo $the_first_commit heads/master &&
|
|
|
|
|
check_push_result two_repo $the_commit heads/master
|
|
|
|
|
'
|
|
|
|
|
|
2007-10-11 21:32:27 +02:00
|
|
|
test_expect_success 'push with dry-run' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
|
|
|
|
old_commit=$(git show-ref -s --verify refs/heads/master)
|
|
|
|
|
) &&
|
2013-01-05 01:08:26 +01:00
|
|
|
git push --dry-run testrepo : &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $old_commit heads/master
|
2007-10-11 21:32:27 +02:00
|
|
|
'
|
|
|
|
|
|
2007-11-29 02:02:53 +01:00
|
|
|
test_expect_success 'push updates local refs' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
mk_child testrepo child &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd child &&
|
2008-11-07 23:20:33 +01:00
|
|
|
git pull .. master &&
|
2007-11-29 02:02:53 +01:00
|
|
|
git push &&
|
2010-04-20 00:08:31 +02:00
|
|
|
test $(git rev-parse master) = \
|
|
|
|
|
$(git rev-parse remotes/origin/master)
|
|
|
|
|
)
|
2007-11-29 02:02:53 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2008-11-05 21:55:54 +01:00
|
|
|
test_expect_success 'push updates up-to-date local refs' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
mk_child testrepo child1 &&
|
|
|
|
|
mk_child testrepo child2 &&
|
2008-11-07 23:20:33 +01:00
|
|
|
(cd child1 && git pull .. master && git push) &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd child2 &&
|
2008-11-05 21:55:54 +01:00
|
|
|
git pull ../child1 master &&
|
|
|
|
|
git push &&
|
2010-04-20 00:08:31 +02:00
|
|
|
test $(git rev-parse master) = \
|
|
|
|
|
$(git rev-parse remotes/origin/master)
|
|
|
|
|
)
|
2008-11-05 21:55:54 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push preserves up-to-date packed refs' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
mk_child testrepo child &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd child &&
|
2008-11-05 21:55:54 +01:00
|
|
|
git push &&
|
2010-04-20 00:08:31 +02:00
|
|
|
! test -f .git/refs/remotes/origin/master
|
|
|
|
|
)
|
2008-11-05 21:55:54 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2007-11-29 02:02:53 +01:00
|
|
|
test_expect_success 'push does not update local refs on failure' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
mk_child testrepo child &&
|
2008-11-07 23:20:33 +01:00
|
|
|
mkdir testrepo/.git/hooks &&
|
2010-05-20 20:57:52 +02:00
|
|
|
echo "#!/no/frobnication/today" >testrepo/.git/hooks/pre-receive &&
|
2008-11-07 23:20:33 +01:00
|
|
|
chmod +x testrepo/.git/hooks/pre-receive &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd child &&
|
2008-11-07 23:20:33 +01:00
|
|
|
git pull .. master
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git push &&
|
2007-11-29 02:02:53 +01:00
|
|
|
test $(git rev-parse master) != \
|
2010-04-20 00:08:31 +02:00
|
|
|
$(git rev-parse remotes/origin/master)
|
|
|
|
|
)
|
2007-11-29 02:02:53 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'allow deleting an invalid remote ref' '
|
|
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2007-11-29 02:02:53 +01:00
|
|
|
rm -f testrepo/.git/objects/??/* &&
|
|
|
|
|
git push testrepo :refs/heads/master &&
|
2008-07-12 17:47:52 +02:00
|
|
|
(cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
|
2007-11-29 02:02:53 +01:00
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
2011-09-28 17:39:35 +02:00
|
|
|
test_expect_success 'pushing valid refs triggers post-receive and post-update hooks' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test_with_hooks testrepo heads/master heads/next &&
|
2011-09-28 17:39:35 +02:00
|
|
|
orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
newmaster=$(git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
|
|
|
|
|
newnext=$_z40 &&
|
|
|
|
|
git push testrepo refs/heads/master:refs/heads/master :refs/heads/next &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo/.git &&
|
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
|
|
|
|
$orgmaster $newmaster refs/heads/master
|
|
|
|
|
$orgnext $newnext refs/heads/next
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master $orgmaster $newmaster
|
|
|
|
|
refs/heads/next $orgnext $newnext
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
|
|
|
|
$orgmaster $newmaster refs/heads/master
|
|
|
|
|
$orgnext $newnext refs/heads/next
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master
|
|
|
|
|
refs/heads/next
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'deleting dangling ref triggers hooks with correct args' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test_with_hooks testrepo heads/master &&
|
2011-09-28 17:39:35 +02:00
|
|
|
rm -f testrepo/.git/objects/??/* &&
|
|
|
|
|
git push testrepo :refs/heads/master &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo/.git &&
|
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
|
|
|
|
$_z40 $_z40 refs/heads/master
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master $_z40 $_z40
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
|
|
|
|
$_z40 $_z40 refs/heads/master
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'deletion of a non-existent ref is not fed to post-receive and post-update hooks' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test_with_hooks testrepo heads/master &&
|
2011-09-28 17:39:35 +02:00
|
|
|
orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
newmaster=$(git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
git push testrepo master :refs/heads/nonexistent &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo/.git &&
|
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
|
|
|
|
$orgmaster $newmaster refs/heads/master
|
|
|
|
|
$_z40 $_z40 refs/heads/nonexistent
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master $orgmaster $newmaster
|
|
|
|
|
refs/heads/nonexistent $_z40 $_z40
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
|
|
|
|
$orgmaster $newmaster refs/heads/master
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'deletion of a non-existent ref alone does trigger post-receive and post-update hooks' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test_with_hooks testrepo heads/master &&
|
2011-09-28 17:39:35 +02:00
|
|
|
git push testrepo :refs/heads/nonexistent &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo/.git &&
|
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
|
|
|
|
$_z40 $_z40 refs/heads/nonexistent
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
|
|
|
|
refs/heads/nonexistent $_z40 $_z40
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
|
test_path_is_missing post-receive.actual &&
|
|
|
|
|
test_path_is_missing post-update.actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'mixed ref updates, deletes, invalid deletes trigger hooks with correct input' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test_with_hooks testrepo heads/master heads/next heads/pu &&
|
2011-09-28 17:39:35 +02:00
|
|
|
orgmaster=$(cd testrepo && git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
newmaster=$(git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
orgnext=$(cd testrepo && git show-ref -s --verify refs/heads/next) &&
|
|
|
|
|
newnext=$_z40 &&
|
|
|
|
|
orgpu=$(cd testrepo && git show-ref -s --verify refs/heads/pu) &&
|
|
|
|
|
newpu=$(git show-ref -s --verify refs/heads/master) &&
|
|
|
|
|
git push testrepo refs/heads/master:refs/heads/master \
|
|
|
|
|
refs/heads/master:refs/heads/pu :refs/heads/next \
|
|
|
|
|
:refs/heads/nonexistent &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo/.git &&
|
|
|
|
|
cat >pre-receive.expect <<-EOF &&
|
|
|
|
|
$orgmaster $newmaster refs/heads/master
|
|
|
|
|
$orgnext $newnext refs/heads/next
|
|
|
|
|
$orgpu $newpu refs/heads/pu
|
|
|
|
|
$_z40 $_z40 refs/heads/nonexistent
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master $orgmaster $newmaster
|
|
|
|
|
refs/heads/next $orgnext $newnext
|
|
|
|
|
refs/heads/pu $orgpu $newpu
|
|
|
|
|
refs/heads/nonexistent $_z40 $_z40
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-receive.expect <<-EOF &&
|
|
|
|
|
$orgmaster $newmaster refs/heads/master
|
|
|
|
|
$orgnext $newnext refs/heads/next
|
|
|
|
|
$orgpu $newpu refs/heads/pu
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
cat >post-update.expect <<-EOF &&
|
|
|
|
|
refs/heads/master
|
|
|
|
|
refs/heads/next
|
|
|
|
|
refs/heads/pu
|
|
|
|
|
EOF
|
|
|
|
|
|
|
|
|
|
test_cmp pre-receive.expect pre-receive.actual &&
|
|
|
|
|
test_cmp update.expect update.actual &&
|
|
|
|
|
test_cmp post-receive.expect post-receive.actual &&
|
|
|
|
|
test_cmp post-update.expect post-update.actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2009-12-30 20:57:42 +01:00
|
|
|
test_expect_success 'allow deleting a ref using --delete' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2009-12-30 20:57:42 +01:00
|
|
|
(cd testrepo && git config receive.denyDeleteCurrent warn) &&
|
|
|
|
|
git push testrepo --delete master &&
|
|
|
|
|
(cd testrepo && test_must_fail git rev-parse --verify refs/heads/master)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'allow deleting a tag using --delete' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2009-12-30 20:57:42 +01:00
|
|
|
git tag -a -m dummy_message deltag heads/master &&
|
|
|
|
|
git push testrepo --tags &&
|
|
|
|
|
(cd testrepo && git rev-parse --verify -q refs/tags/deltag) &&
|
|
|
|
|
git push testrepo --delete tag deltag &&
|
|
|
|
|
(cd testrepo && test_must_fail git rev-parse --verify refs/tags/deltag)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --delete without args aborts' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2009-12-30 20:57:42 +01:00
|
|
|
test_must_fail git push testrepo --delete
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --delete refuses src:dest refspecs' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2009-12-30 20:57:42 +01:00
|
|
|
test_must_fail git push testrepo --delete master:foo
|
|
|
|
|
'
|
|
|
|
|
|
2008-11-09 02:49:27 +01:00
|
|
|
test_expect_success 'warn on push to HEAD of non-bare repository' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2008-11-09 02:49:27 +01:00
|
|
|
git checkout master &&
|
2010-04-20 00:08:31 +02:00
|
|
|
git config receive.denyCurrentBranch warn
|
|
|
|
|
) &&
|
2008-11-09 02:49:27 +01:00
|
|
|
git push testrepo master 2>stderr &&
|
2009-02-01 02:34:05 +01:00
|
|
|
grep "warning: updating the current branch" stderr
|
2008-11-09 02:49:27 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'deny push to HEAD of non-bare repository' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2008-11-09 02:49:27 +01:00
|
|
|
git checkout master &&
|
2010-04-20 00:08:31 +02:00
|
|
|
git config receive.denyCurrentBranch true
|
|
|
|
|
) &&
|
2008-11-09 02:49:27 +01:00
|
|
|
test_must_fail git push testrepo master
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'allow push to HEAD of bare repository (bare)' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2008-11-09 02:49:27 +01:00
|
|
|
git checkout master &&
|
|
|
|
|
git config receive.denyCurrentBranch true &&
|
2010-04-20 00:08:31 +02:00
|
|
|
git config core.bare true
|
|
|
|
|
) &&
|
2008-11-09 02:49:27 +01:00
|
|
|
git push testrepo master 2>stderr &&
|
2009-02-01 02:34:05 +01:00
|
|
|
! grep "warning: updating the current branch" stderr
|
2008-11-09 02:49:27 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'allow push to HEAD of non-bare repository (config)' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2008-11-09 02:49:27 +01:00
|
|
|
git checkout master &&
|
|
|
|
|
git config receive.denyCurrentBranch false
|
|
|
|
|
) &&
|
|
|
|
|
git push testrepo master 2>stderr &&
|
2009-02-01 02:34:05 +01:00
|
|
|
! grep "warning: updating the current branch" stderr
|
2008-11-09 02:49:27 +01:00
|
|
|
'
|
|
|
|
|
|
2008-11-10 22:47:11 +01:00
|
|
|
test_expect_success 'fetch with branches' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2008-11-10 22:47:11 +01:00
|
|
|
git branch second $the_first_commit &&
|
|
|
|
|
git checkout second &&
|
|
|
|
|
echo ".." > testrepo/.git/branches/branch1 &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2008-11-10 22:47:11 +01:00
|
|
|
git fetch branch1 &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/heads/branch1" >expect &&
|
|
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
|
test_cmp expect actual
|
2008-11-10 22:47:11 +01:00
|
|
|
) &&
|
|
|
|
|
git checkout master
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'fetch with branches containing #' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2008-11-10 22:47:11 +01:00
|
|
|
echo "..#second" > testrepo/.git/branches/branch2 &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2008-11-10 22:47:11 +01:00
|
|
|
git fetch branch2 &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_first_commit commit refs/heads/branch2" >expect &&
|
|
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
|
test_cmp expect actual
|
2008-11-10 22:47:11 +01:00
|
|
|
) &&
|
|
|
|
|
git checkout master
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with branches' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2008-11-10 22:47:11 +01:00
|
|
|
git checkout second &&
|
|
|
|
|
echo "testrepo" > .git/branches/branch1 &&
|
|
|
|
|
git push branch1 &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_first_commit commit refs/heads/master" >expect &&
|
|
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
|
test_cmp expect actual
|
2008-11-10 22:47:11 +01:00
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push with branches containing #' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2008-11-10 22:47:11 +01:00
|
|
|
echo "testrepo#branch3" > .git/branches/branch2 &&
|
|
|
|
|
git push branch2 &&
|
2010-04-20 00:08:31 +02:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_first_commit commit refs/heads/branch3" >expect &&
|
|
|
|
|
git for-each-ref refs/heads >actual &&
|
|
|
|
|
test_cmp expect actual
|
2008-11-10 22:47:11 +01:00
|
|
|
) &&
|
|
|
|
|
git checkout master
|
|
|
|
|
'
|
|
|
|
|
|
2010-04-20 00:19:18 +02:00
|
|
|
test_expect_success 'push into aliased refs (consistent)' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
mk_child testrepo child1 &&
|
|
|
|
|
mk_child testrepo child2 &&
|
2010-04-20 00:19:18 +02:00
|
|
|
(
|
|
|
|
|
cd child1 &&
|
|
|
|
|
git branch foo &&
|
|
|
|
|
git symbolic-ref refs/heads/bar refs/heads/foo
|
|
|
|
|
git config receive.denyCurrentBranch false
|
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd child2 &&
|
|
|
|
|
>path2 &&
|
|
|
|
|
git add path2 &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -a -m child2 &&
|
|
|
|
|
git branch foo &&
|
|
|
|
|
git branch bar &&
|
|
|
|
|
git push ../child1 foo bar
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push into aliased refs (inconsistent)' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
mk_child testrepo child1 &&
|
|
|
|
|
mk_child testrepo child2 &&
|
2010-04-20 00:19:18 +02:00
|
|
|
(
|
|
|
|
|
cd child1 &&
|
|
|
|
|
git branch foo &&
|
|
|
|
|
git symbolic-ref refs/heads/bar refs/heads/foo
|
|
|
|
|
git config receive.denyCurrentBranch false
|
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd child2 &&
|
|
|
|
|
>path2 &&
|
|
|
|
|
git add path2 &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -a -m child2 &&
|
|
|
|
|
git branch foo &&
|
|
|
|
|
>path3 &&
|
|
|
|
|
git add path3 &&
|
|
|
|
|
test_tick &&
|
|
|
|
|
git commit -a -m child2 &&
|
|
|
|
|
git branch bar &&
|
|
|
|
|
test_must_fail git push ../child1 foo bar 2>stderr &&
|
|
|
|
|
grep "refusing inconsistent update" stderr
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2012-11-30 02:41:37 +01:00
|
|
|
test_expect_success 'push requires --force to update lightweight tag' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
mk_child testrepo child1 &&
|
|
|
|
|
mk_child testrepo child2 &&
|
2012-11-30 02:41:37 +01:00
|
|
|
(
|
|
|
|
|
cd child1 &&
|
|
|
|
|
git tag Tag &&
|
|
|
|
|
git push ../child2 Tag &&
|
|
|
|
|
git push ../child2 Tag &&
|
|
|
|
|
>file1 &&
|
|
|
|
|
git add file1 &&
|
|
|
|
|
git commit -m "file1" &&
|
|
|
|
|
git tag -f Tag &&
|
|
|
|
|
test_must_fail git push ../child2 Tag &&
|
|
|
|
|
git push --force ../child2 Tag &&
|
|
|
|
|
git tag -f Tag &&
|
|
|
|
|
test_must_fail git push ../child2 Tag HEAD~ &&
|
|
|
|
|
git push --force ../child2 Tag
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2010-02-27 05:52:16 +01:00
|
|
|
test_expect_success 'push --porcelain' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2010-02-27 05:52:16 +01:00
|
|
|
echo >.git/foo "To testrepo" &&
|
|
|
|
|
echo >>.git/foo "* refs/heads/master:refs/remotes/origin/master [new branch]" &&
|
|
|
|
|
echo >>.git/foo "Done" &&
|
|
|
|
|
git push >.git/bar --porcelain testrepo refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
2013-03-19 00:13:41 +01:00
|
|
|
echo "$the_commit commit refs/remotes/origin/master" >expect &&
|
|
|
|
|
git for-each-ref refs/remotes/origin >actual &&
|
|
|
|
|
test_cmp expect actual
|
2010-02-27 05:52:16 +01:00
|
|
|
) &&
|
2010-03-12 06:51:57 +01:00
|
|
|
test_cmp .git/foo .git/bar
|
2010-02-27 05:52:16 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --porcelain bad url' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2010-02-27 05:52:16 +01:00
|
|
|
test_must_fail git push >.git/bar --porcelain asdfasdfasd refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
test_must_fail grep -q Done .git/bar
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --porcelain rejected' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2010-02-27 05:52:16 +01:00
|
|
|
git push testrepo refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
(cd testrepo &&
|
|
|
|
|
git reset --hard origin/master^
|
|
|
|
|
git config receive.denyCurrentBranch true) &&
|
|
|
|
|
|
|
|
|
|
echo >.git/foo "To testrepo" &&
|
|
|
|
|
echo >>.git/foo "! refs/heads/master:refs/heads/master [remote rejected] (branch is currently checked out)" &&
|
|
|
|
|
|
|
|
|
|
test_must_fail git push >.git/bar --porcelain testrepo refs/heads/master:refs/heads/master &&
|
2010-03-12 06:51:57 +01:00
|
|
|
test_cmp .git/foo .git/bar
|
2010-02-27 05:52:16 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --porcelain --dry-run rejected' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_empty testrepo &&
|
2010-02-27 05:52:16 +01:00
|
|
|
git push testrepo refs/heads/master:refs/remotes/origin/master &&
|
|
|
|
|
(cd testrepo &&
|
|
|
|
|
git reset --hard origin/master
|
|
|
|
|
git config receive.denyCurrentBranch true) &&
|
|
|
|
|
|
|
|
|
|
echo >.git/foo "To testrepo" &&
|
|
|
|
|
echo >>.git/foo "! refs/heads/master^:refs/heads/master [rejected] (non-fast-forward)" &&
|
|
|
|
|
echo >>.git/foo "Done" &&
|
|
|
|
|
|
|
|
|
|
test_must_fail git push >.git/bar --porcelain --dry-run testrepo refs/heads/master^:refs/heads/master &&
|
2010-03-12 06:51:57 +01:00
|
|
|
test_cmp .git/foo .git/bar
|
2010-02-27 05:52:16 +01:00
|
|
|
'
|
|
|
|
|
|
2012-02-22 23:43:41 +01:00
|
|
|
test_expect_success 'push --prune' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master heads/second heads/foo heads/bar &&
|
2013-01-05 01:08:26 +01:00
|
|
|
git push --prune testrepo : &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
|
|
|
|
check_push_result testrepo $the_first_commit heads/second &&
|
|
|
|
|
! check_push_result testrepo $the_first_commit heads/foo heads/bar
|
2012-02-22 23:43:41 +01:00
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --prune refspec' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo tmp/master tmp/second tmp/foo tmp/bar &&
|
2012-02-22 23:43:41 +01:00
|
|
|
git push --prune testrepo "refs/heads/*:refs/tmp/*" &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit tmp/master &&
|
|
|
|
|
check_push_result testrepo $the_first_commit tmp/second &&
|
|
|
|
|
! check_push_result testrepo $the_first_commit tmp/foo tmp/bar
|
2012-02-22 23:43:41 +01:00
|
|
|
'
|
|
|
|
|
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 01:08:30 +01:00
|
|
|
for configsection in transfer receive
|
|
|
|
|
do
|
|
|
|
|
test_expect_success "push to update a ref hidden by $configsection.hiderefs" '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master hidden/one hidden/two hidden/three &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 01:08:30 +01:00
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
|
|
|
|
git config $configsection.hiderefs refs/hidden
|
|
|
|
|
) &&
|
|
|
|
|
|
|
|
|
|
# push to unhidden ref succeeds normally
|
|
|
|
|
git push testrepo master:refs/heads/master &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit heads/master &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 01:08:30 +01:00
|
|
|
|
|
|
|
|
# push to update a hidden ref should fail
|
|
|
|
|
test_must_fail git push testrepo master:refs/hidden/one &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_first_commit hidden/one &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 01:08:30 +01:00
|
|
|
|
|
|
|
|
# push to delete a hidden ref should fail
|
|
|
|
|
test_must_fail git push testrepo :refs/hidden/two &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_first_commit hidden/two &&
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 01:08:30 +01:00
|
|
|
|
|
|
|
|
# idempotent push to update a hidden ref should fail
|
|
|
|
|
test_must_fail git push testrepo $the_first_commit:refs/hidden/three &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_first_commit hidden/three
|
upload/receive-pack: allow hiding ref hierarchies
A repository may have refs that are only used for its internal
bookkeeping purposes that should not be exposed to the others that
come over the network.
Teach upload-pack to omit some refs from its initial advertisement
by paying attention to the uploadpack.hiderefs multi-valued
configuration variable. Do the same to receive-pack via the
receive.hiderefs variable. As a convenient short-hand, allow using
transfer.hiderefs to set the value to both of these variables.
Any ref that is under the hierarchies listed on the value of these
variable is excluded from responses to requests made by "ls-remote",
"fetch", etc. (for upload-pack) and "push" (for receive-pack).
Because these hidden refs do not count as OUR_REF, an attempt to
fetch objects at the tip of them will be rejected, and because these
refs do not get advertised, "git push :" will not see local branches
that have the same name as them as "matching" ones to be sent.
An attempt to update/delete these hidden refs with an explicit
refspec, e.g. "git push origin :refs/hidden/22", is rejected. This
is not a new restriction. To the pusher, it would appear that there
is no such ref, so its push request will conclude with "Now that I
sent you all the data, it is time for you to update the refs. I saw
that the ref did not exist when I started pushing, and I want the
result to point at this commit". The receiving end will apply the
compare-and-swap rule to this request and rejects the push with
"Well, your update request conflicts with somebody else; I see there
is such a ref.", which is the right thing to do. Otherwise a push to
a hidden ref will always be "the last one wins", which is not a good
default.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-01-19 01:08:30 +01:00
|
|
|
'
|
|
|
|
|
done
|
|
|
|
|
|
2013-01-29 23:02:15 +01:00
|
|
|
test_expect_success 'fetch exact SHA1' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master hidden/one &&
|
2013-01-29 23:02:15 +01:00
|
|
|
git push testrepo master:refs/hidden/one &&
|
|
|
|
|
(
|
|
|
|
|
cd testrepo &&
|
|
|
|
|
git config transfer.hiderefs refs/hidden
|
|
|
|
|
) &&
|
2013-04-02 09:40:31 +02:00
|
|
|
check_push_result testrepo $the_commit hidden/one &&
|
2013-01-29 23:02:15 +01:00
|
|
|
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_child testrepo child &&
|
2013-01-29 23:02:15 +01:00
|
|
|
(
|
|
|
|
|
cd child &&
|
|
|
|
|
|
|
|
|
|
# make sure $the_commit does not exist here
|
|
|
|
|
git repack -a -d &&
|
|
|
|
|
git prune &&
|
|
|
|
|
test_must_fail git cat-file -t $the_commit &&
|
|
|
|
|
|
|
|
|
|
# fetching the hidden object should fail by default
|
|
|
|
|
test_must_fail git fetch -v ../testrepo $the_commit:refs/heads/copy &&
|
|
|
|
|
test_must_fail git rev-parse --verify refs/heads/copy &&
|
|
|
|
|
|
|
|
|
|
# the server side can allow it to succeed
|
|
|
|
|
(
|
|
|
|
|
cd ../testrepo &&
|
|
|
|
|
git config uploadpack.allowtipsha1inwant true
|
|
|
|
|
) &&
|
|
|
|
|
|
|
|
|
|
git fetch -v ../testrepo $the_commit:refs/heads/copy &&
|
|
|
|
|
result=$(git rev-parse --verify refs/heads/copy) &&
|
|
|
|
|
test "$the_commit" = "$result"
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2013-03-04 21:09:50 +01:00
|
|
|
test_expect_success 'fetch follows tags by default' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2013-03-04 21:09:50 +01:00
|
|
|
rm -fr src dst &&
|
|
|
|
|
git init src &&
|
|
|
|
|
(
|
|
|
|
|
cd src &&
|
|
|
|
|
git pull ../testrepo master &&
|
|
|
|
|
git tag -m "annotated" tag &&
|
|
|
|
|
git for-each-ref >tmp1 &&
|
|
|
|
|
(
|
|
|
|
|
cat tmp1
|
|
|
|
|
sed -n "s|refs/heads/master$|refs/remotes/origin/master|p" tmp1
|
|
|
|
|
) |
|
|
|
|
|
sort -k 3 >../expect
|
|
|
|
|
) &&
|
|
|
|
|
git init dst &&
|
|
|
|
|
(
|
|
|
|
|
cd dst &&
|
|
|
|
|
git remote add origin ../src &&
|
|
|
|
|
git config branch.master.remote origin &&
|
|
|
|
|
git config branch.master.merge refs/heads/master &&
|
|
|
|
|
git pull &&
|
|
|
|
|
git for-each-ref >../actual
|
|
|
|
|
) &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-04 00:41:15 +01:00
|
|
|
test_expect_success 'pushing a specific ref applies remote.$name.push as refmap' '
|
|
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
rm -fr src dst &&
|
|
|
|
|
git init src &&
|
|
|
|
|
git init --bare dst &&
|
|
|
|
|
(
|
|
|
|
|
cd src &&
|
|
|
|
|
git pull ../testrepo master &&
|
|
|
|
|
git branch next &&
|
|
|
|
|
git config remote.dst.url ../dst &&
|
|
|
|
|
git config remote.dst.push "+refs/heads/*:refs/remotes/src/*" &&
|
|
|
|
|
git push dst master &&
|
|
|
|
|
git show-ref refs/heads/master |
|
|
|
|
|
sed -e "s|refs/heads/|refs/remotes/src/|" >../dst/expect
|
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd dst &&
|
|
|
|
|
test_must_fail git show-ref refs/heads/next &&
|
|
|
|
|
test_must_fail git show-ref refs/heads/master &&
|
|
|
|
|
git show-ref refs/remotes/src/master >actual
|
|
|
|
|
) &&
|
|
|
|
|
test_cmp dst/expect dst/actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'with no remote.$name.push, it is not used as refmap' '
|
|
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
rm -fr src dst &&
|
|
|
|
|
git init src &&
|
|
|
|
|
git init --bare dst &&
|
|
|
|
|
(
|
|
|
|
|
cd src &&
|
|
|
|
|
git pull ../testrepo master &&
|
|
|
|
|
git branch next &&
|
|
|
|
|
git config remote.dst.url ../dst &&
|
2013-12-04 01:23:35 +01:00
|
|
|
git config push.default matching &&
|
push: use remote.$name.push as a refmap
Since f2690487 (fetch: opportunistically update tracking refs,
2013-05-11), we stopped taking a non-storing refspec given on the
command line of "git fetch" literally, and instead started mapping
it via remote.$name.fetch refspecs. This allows
$ git fetch origin master
from the 'origin' repository, which is configured with
[remote "origin"]
fetch = +refs/heads/*:refs/remotes/origin/*
to update refs/remotes/origin/master with the result, as if the
command line were
$ git fetch origin +master:refs/remotes/origin/master
to reduce surprises and improve usability. Before that change, a
refspec on the command line without a colon was only to fetch the
history and leave the result in FETCH_HEAD, without updating the
remote-tracking branches.
When you are simulating a fetch from you by your mothership with a
push by you into your mothership, instead of having:
[remote "satellite"]
fetch = +refs/heads/*:refs/remotes/satellite/*
on the mothership repository and running:
mothership$ git fetch satellite
you would have:
[remote "mothership"]
push = +refs/heads/*:refs/remotes/satellite/*
on your satellite machine, and run:
satellite$ git push mothership
Because we so far did not make the corresponding change to the push
side, this command:
satellite$ git push mothership master
does _not_ allow you on the satellite to only push 'master' out but
still to the usual destination (i.e. refs/remotes/satellite/master).
Implement the logic to map an unqualified refspec given on the
command line via the remote.$name.push refspec. This will bring a
bit more symmetry between "fetch" and "push".
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2013-12-04 00:41:15 +01:00
|
|
|
git push dst master &&
|
|
|
|
|
git show-ref refs/heads/master >../dst/expect
|
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd dst &&
|
|
|
|
|
test_must_fail git show-ref refs/heads/next &&
|
|
|
|
|
git show-ref refs/heads/master >actual
|
|
|
|
|
) &&
|
|
|
|
|
test_cmp dst/expect dst/actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-12-04 01:23:35 +01:00
|
|
|
test_expect_success 'with no remote.$name.push, upstream mapping is used' '
|
|
|
|
|
mk_test testrepo heads/master &&
|
|
|
|
|
rm -fr src dst &&
|
|
|
|
|
git init src &&
|
|
|
|
|
git init --bare dst &&
|
|
|
|
|
(
|
|
|
|
|
cd src &&
|
|
|
|
|
git pull ../testrepo master &&
|
|
|
|
|
git branch next &&
|
|
|
|
|
git config remote.dst.url ../dst &&
|
|
|
|
|
git config remote.dst.fetch "+refs/heads/*:refs/remotes/dst/*" &&
|
|
|
|
|
git config push.default upstream &&
|
|
|
|
|
|
|
|
|
|
git config branch.master.merge refs/heads/trunk &&
|
|
|
|
|
git config branch.master.remote dst &&
|
|
|
|
|
|
|
|
|
|
git push dst master &&
|
|
|
|
|
git show-ref refs/heads/master |
|
|
|
|
|
sed -e "s|refs/heads/master|refs/heads/trunk|" >../dst/expect
|
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd dst &&
|
|
|
|
|
test_must_fail git show-ref refs/heads/master &&
|
|
|
|
|
test_must_fail git show-ref refs/heads/next &&
|
|
|
|
|
git show-ref refs/heads/trunk >actual
|
|
|
|
|
) &&
|
|
|
|
|
test_cmp dst/expect dst/actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-03-04 21:09:50 +01:00
|
|
|
test_expect_success 'push does not follow tags by default' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2013-03-04 21:09:50 +01:00
|
|
|
rm -fr src dst &&
|
|
|
|
|
git init src &&
|
|
|
|
|
git init --bare dst &&
|
|
|
|
|
(
|
|
|
|
|
cd src &&
|
|
|
|
|
git pull ../testrepo master &&
|
|
|
|
|
git tag -m "annotated" tag &&
|
|
|
|
|
git checkout -b another &&
|
|
|
|
|
git commit --allow-empty -m "future commit" &&
|
|
|
|
|
git tag -m "future" future &&
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git for-each-ref refs/heads/master >../expect &&
|
|
|
|
|
git push ../dst master
|
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd dst &&
|
|
|
|
|
git for-each-ref >../actual
|
|
|
|
|
) &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'push --follow-tag only pushes relevant tags' '
|
2013-04-02 09:40:31 +02:00
|
|
|
mk_test testrepo heads/master &&
|
2013-03-04 21:09:50 +01:00
|
|
|
rm -fr src dst &&
|
|
|
|
|
git init src &&
|
|
|
|
|
git init --bare dst &&
|
|
|
|
|
(
|
|
|
|
|
cd src &&
|
|
|
|
|
git pull ../testrepo master &&
|
|
|
|
|
git tag -m "annotated" tag &&
|
|
|
|
|
git checkout -b another &&
|
|
|
|
|
git commit --allow-empty -m "future commit" &&
|
|
|
|
|
git tag -m "future" future &&
|
|
|
|
|
git checkout master &&
|
|
|
|
|
git for-each-ref refs/heads/master refs/tags/tag >../expect
|
|
|
|
|
git push --follow-tag ../dst master
|
|
|
|
|
) &&
|
|
|
|
|
(
|
|
|
|
|
cd dst &&
|
|
|
|
|
git for-each-ref >../actual
|
|
|
|
|
) &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
2013-08-12 15:55:55 +02:00
|
|
|
test_expect_success 'push --no-thin must produce non-thin pack' '
|
|
|
|
|
cat >>path1 <<\EOF &&
|
|
|
|
|
keep base version of path1 big enough, compared to the new changes
|
|
|
|
|
later, in order to pass size heuristics in
|
|
|
|
|
builtin/pack-objects.c:try_delta()
|
|
|
|
|
EOF
|
|
|
|
|
git commit -am initial &&
|
|
|
|
|
git init no-thin &&
|
|
|
|
|
git --git-dir=no-thin/.git config receive.unpacklimit 0 &&
|
|
|
|
|
git push no-thin/.git refs/heads/master:refs/heads/foo &&
|
|
|
|
|
echo modified >> path1 &&
|
|
|
|
|
git commit -am modified &&
|
|
|
|
|
git repack -adf &&
|
|
|
|
|
rcvpck="git receive-pack --reject-thin-pack-for-testing" &&
|
|
|
|
|
git push --no-thin --receive-pack="$rcvpck" no-thin/.git refs/heads/master:refs/heads/foo
|
|
|
|
|
'
|
|
|
|
|
|
2014-10-17 02:03:41 +02:00
|
|
|
test_expect_success 'pushing a tag pushes the tagged object' '
|
|
|
|
|
rm -rf dst.git &&
|
|
|
|
|
blob=$(echo unreferenced | git hash-object -w --stdin) &&
|
|
|
|
|
git tag -m foo tag-of-blob $blob &&
|
|
|
|
|
git init --bare dst.git &&
|
|
|
|
|
git push dst.git tag-of-blob &&
|
|
|
|
|
# the receiving index-pack should have noticed
|
|
|
|
|
# any problems, but we double check
|
|
|
|
|
echo unreferenced >expect &&
|
|
|
|
|
git --git-dir=dst.git cat-file blob tag-of-blob >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
fetch: load all default config at startup
When we start the git-fetch program, we call git_config to
load all config, but our callback only processes the
fetch.prune option; we do not chain to git_default_config at
all.
This means that we may not load some core configuration
which will have an effect. For instance, we do not load
core.logAllRefUpdates, which impacts whether or not we
create reflogs in a bare repository.
Note that I said "may" above. It gets even more exciting. If
we have to transfer actual objects as part of the fetch,
then we call fetch_pack as part of the same process. That
function loads its own config, which does chain to
git_default_config, impacting global variables which are
used by the rest of fetch. But if the fetch is a pure ref
update (e.g., a new ref which is a copy of an old one), we
skip fetch_pack entirely. So we get inconsistent results
depending on whether or not we have actual objects to
transfer or not!
Let's just load the core config at the start of fetch, so we
know we have it (we may also load it again as part of
fetch_pack, but that's OK; it's designed to be idempotent).
Our tests check both cases (with and without a pack). We
also check similar behavior for push for good measure, but
it already works as expected.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2014-11-04 14:11:19 +01:00
|
|
|
test_expect_success 'push into bare respects core.logallrefupdates' '
|
|
|
|
|
rm -rf dst.git &&
|
|
|
|
|
git init --bare dst.git &&
|
|
|
|
|
git -C dst.git config core.logallrefupdates true &&
|
|
|
|
|
|
|
|
|
|
# double push to test both with and without
|
|
|
|
|
# the actual pack transfer
|
|
|
|
|
git push dst.git master:one &&
|
|
|
|
|
echo "one@{0} push" >expect &&
|
|
|
|
|
git -C dst.git log -g --format="%gd %gs" one >actual &&
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
|
|
git push dst.git master:two &&
|
|
|
|
|
echo "two@{0} push" >expect &&
|
|
|
|
|
git -C dst.git log -g --format="%gd %gs" two >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
'
|
|
|
|
|
|
|
|
|
|
test_expect_success 'fetch into bare respects core.logallrefupdates' '
|
|
|
|
|
rm -rf dst.git &&
|
|
|
|
|
git init --bare dst.git &&
|
|
|
|
|
(
|
|
|
|
|
cd dst.git &&
|
|
|
|
|
git config core.logallrefupdates true &&
|
|
|
|
|
|
|
|
|
|
# as above, we double-fetch to test both
|
|
|
|
|
# with and without pack transfer
|
|
|
|
|
git fetch .. master:one &&
|
|
|
|
|
echo "one@{0} fetch .. master:one: storing head" >expect &&
|
|
|
|
|
git log -g --format="%gd %gs" one >actual &&
|
|
|
|
|
test_cmp expect actual &&
|
|
|
|
|
|
|
|
|
|
git fetch .. master:two &&
|
|
|
|
|
echo "two@{0} fetch .. master:two: storing head" >expect &&
|
|
|
|
|
git log -g --format="%gd %gs" two >actual &&
|
|
|
|
|
test_cmp expect actual
|
|
|
|
|
)
|
|
|
|
|
'
|
|
|
|
|
|
2007-06-08 09:43:22 +02:00
|
|
|
test_done
|