2006-09-23 12:40:17 +02:00
|
|
|
#!/bin/sh
|
|
|
|
# Copyright (c) 2006, Junio C Hamano.
|
|
|
|
|
|
|
|
test_description='Per branch config variables affects "git fetch".
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
D=`pwd`
|
|
|
|
|
2009-08-08 05:12:13 +02:00
|
|
|
test_bundle_object_count () {
|
|
|
|
git verify-pack -v "$1" >verify.out &&
|
|
|
|
test "$2" = $(grep '^[0-9a-f]\{40\} ' verify.out | wc -l)
|
|
|
|
}
|
|
|
|
|
2012-03-01 22:40:48 +01:00
|
|
|
convert_bundle_to_pack () {
|
|
|
|
while read x && test -n "$x"
|
|
|
|
do
|
|
|
|
:;
|
|
|
|
done
|
|
|
|
cat
|
|
|
|
}
|
|
|
|
|
2006-09-23 12:40:17 +02:00
|
|
|
test_expect_success setup '
|
|
|
|
echo >file original &&
|
|
|
|
git add file &&
|
|
|
|
git commit -a -m original'
|
|
|
|
|
|
|
|
test_expect_success "clone and setup child repos" '
|
|
|
|
git clone . one &&
|
2010-09-07 03:42:54 +02:00
|
|
|
(
|
|
|
|
cd one &&
|
|
|
|
echo >file updated by one &&
|
|
|
|
git commit -a -m "updated by one"
|
2010-09-06 20:39:54 +02:00
|
|
|
) &&
|
2006-09-23 12:40:17 +02:00
|
|
|
git clone . two &&
|
2010-09-07 03:42:54 +02:00
|
|
|
(
|
|
|
|
cd two &&
|
|
|
|
git config branch.master.remote one &&
|
|
|
|
git config remote.one.url ../one/.git/ &&
|
|
|
|
git config remote.one.fetch refs/heads/master:refs/heads/one
|
2010-09-06 20:39:54 +02:00
|
|
|
) &&
|
2006-09-23 22:55:35 +02:00
|
|
|
git clone . three &&
|
2010-09-07 03:42:54 +02:00
|
|
|
(
|
|
|
|
cd three &&
|
|
|
|
git config branch.master.remote two &&
|
|
|
|
git config branch.master.merge refs/heads/one &&
|
|
|
|
mkdir -p .git/remotes &&
|
|
|
|
{
|
|
|
|
echo "URL: ../two/.git/"
|
|
|
|
echo "Pull: refs/heads/master:refs/heads/two"
|
|
|
|
echo "Pull: refs/heads/one:refs/heads/one"
|
|
|
|
} >.git/remotes/two
|
2010-09-06 20:39:54 +02:00
|
|
|
) &&
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 18:15:02 +02:00
|
|
|
git clone . bundle &&
|
|
|
|
git clone . seven
|
2006-09-23 12:40:17 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success "fetch test" '
|
|
|
|
cd "$D" &&
|
|
|
|
echo >file updated by origin &&
|
|
|
|
git commit -a -m "updated by origin" &&
|
|
|
|
cd two &&
|
|
|
|
git fetch &&
|
|
|
|
test -f .git/refs/heads/one &&
|
|
|
|
mine=`git rev-parse refs/heads/one` &&
|
|
|
|
his=`cd ../one && git rev-parse refs/heads/master` &&
|
|
|
|
test "z$mine" = "z$his"
|
|
|
|
'
|
|
|
|
|
2006-09-23 22:55:35 +02:00
|
|
|
test_expect_success "fetch test for-merge" '
|
|
|
|
cd "$D" &&
|
|
|
|
cd three &&
|
|
|
|
git fetch &&
|
|
|
|
test -f .git/refs/heads/two &&
|
|
|
|
test -f .git/refs/heads/one &&
|
|
|
|
master_in_two=`cd ../two && git rev-parse master` &&
|
|
|
|
one_in_two=`cd ../two && git rev-parse one` &&
|
|
|
|
{
|
|
|
|
echo "$one_in_two "
|
2011-12-26 17:16:56 +01:00
|
|
|
echo "$master_in_two not-for-merge"
|
2006-09-23 22:55:35 +02:00
|
|
|
} >expected &&
|
|
|
|
cut -f -2 .git/FETCH_HEAD >actual &&
|
2010-05-14 11:31:37 +02:00
|
|
|
test_cmp expected actual'
|
2006-09-23 22:55:35 +02:00
|
|
|
|
2011-10-08 00:51:07 +02:00
|
|
|
test_expect_success 'fetch --prune on its own works as expected' '
|
|
|
|
cd "$D" &&
|
|
|
|
git clone . prune &&
|
|
|
|
cd prune &&
|
|
|
|
git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
|
|
|
|
|
|
|
|
git fetch --prune origin &&
|
|
|
|
test_must_fail git rev-parse origin/extrabranch
|
|
|
|
'
|
|
|
|
|
2011-10-15 07:04:25 +02:00
|
|
|
test_expect_success 'fetch --prune with a branch name keeps branches' '
|
2011-10-08 00:51:07 +02:00
|
|
|
cd "$D" &&
|
|
|
|
git clone . prune-branch &&
|
|
|
|
cd prune-branch &&
|
|
|
|
git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
|
|
|
|
|
|
|
|
git fetch --prune origin master &&
|
|
|
|
git rev-parse origin/extrabranch
|
|
|
|
'
|
|
|
|
|
2011-10-15 07:04:25 +02:00
|
|
|
test_expect_success 'fetch --prune with a namespace keeps other namespaces' '
|
2011-10-08 00:51:07 +02:00
|
|
|
cd "$D" &&
|
|
|
|
git clone . prune-namespace &&
|
|
|
|
cd prune-namespace &&
|
|
|
|
|
|
|
|
git fetch --prune origin refs/heads/a/*:refs/remotes/origin/a/* &&
|
|
|
|
git rev-parse origin/master
|
|
|
|
'
|
|
|
|
|
2011-10-15 07:04:26 +02:00
|
|
|
test_expect_success 'fetch --prune --tags does not delete the remote-tracking branches' '
|
2011-10-08 00:51:07 +02:00
|
|
|
cd "$D" &&
|
|
|
|
git clone . prune-tags &&
|
|
|
|
cd prune-tags &&
|
|
|
|
git fetch origin refs/heads/master:refs/tags/sometag &&
|
|
|
|
|
|
|
|
git fetch --prune --tags origin &&
|
|
|
|
git rev-parse origin/master &&
|
|
|
|
test_must_fail git rev-parse somebranch
|
|
|
|
'
|
|
|
|
|
2011-10-15 07:04:26 +02:00
|
|
|
test_expect_success 'fetch --prune --tags with branch does not delete other remote-tracking branches' '
|
2011-10-08 00:51:07 +02:00
|
|
|
cd "$D" &&
|
|
|
|
git clone . prune-tags-branch &&
|
|
|
|
cd prune-tags-branch &&
|
|
|
|
git fetch origin refs/heads/master:refs/remotes/origin/extrabranch &&
|
|
|
|
|
|
|
|
git fetch --prune --tags origin master &&
|
|
|
|
git rev-parse origin/extrabranch
|
|
|
|
'
|
|
|
|
|
2007-10-09 10:51:07 +02:00
|
|
|
test_expect_success 'fetch tags when there is no tags' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
|
|
|
|
mkdir notags &&
|
|
|
|
cd notags &&
|
|
|
|
git init &&
|
|
|
|
|
|
|
|
git fetch -t ..
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2006-11-19 06:39:17 +01:00
|
|
|
test_expect_success 'fetch following tags' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git tag -a -m 'annotated' anno HEAD &&
|
|
|
|
git tag light HEAD &&
|
|
|
|
|
|
|
|
mkdir four &&
|
|
|
|
cd four &&
|
2007-01-12 22:01:46 +01:00
|
|
|
git init &&
|
2006-11-19 06:39:17 +01:00
|
|
|
|
|
|
|
git fetch .. :track &&
|
|
|
|
git show-ref --verify refs/tags/anno &&
|
|
|
|
git show-ref --verify refs/tags/light
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2012-04-17 00:08:50 +02:00
|
|
|
test_expect_success 'fetch uses remote ref names to describe new refs' '
|
|
|
|
cd "$D" &&
|
|
|
|
git init descriptive &&
|
|
|
|
(
|
|
|
|
cd descriptive &&
|
|
|
|
git config remote.o.url .. &&
|
|
|
|
git config remote.o.fetch "refs/heads/*:refs/crazyheads/*" &&
|
|
|
|
git config --add remote.o.fetch "refs/others/*:refs/heads/*" &&
|
|
|
|
git fetch o
|
|
|
|
) &&
|
|
|
|
git tag -a -m "Descriptive tag" descriptive-tag &&
|
|
|
|
git branch descriptive-branch &&
|
|
|
|
git checkout descriptive-branch &&
|
|
|
|
echo "Nuts" >crazy &&
|
|
|
|
git add crazy &&
|
|
|
|
git commit -a -m "descriptive commit" &&
|
|
|
|
git update-ref refs/others/crazy HEAD &&
|
|
|
|
(
|
|
|
|
cd descriptive &&
|
|
|
|
git fetch o 2>actual &&
|
|
|
|
grep " -> refs/crazyheads/descriptive-branch$" actual |
|
|
|
|
test_i18ngrep "new branch" &&
|
|
|
|
grep " -> descriptive-tag$" actual |
|
|
|
|
test_i18ngrep "new tag" &&
|
|
|
|
grep " -> crazy$" actual |
|
|
|
|
test_i18ngrep "new ref"
|
|
|
|
) &&
|
|
|
|
git checkout master
|
|
|
|
'
|
|
|
|
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success 'fetch must not resolve short tag name' '
|
2007-11-11 15:01:48 +01:00
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
|
|
|
|
mkdir five &&
|
|
|
|
cd five &&
|
|
|
|
git init &&
|
|
|
|
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git fetch .. anno:five
|
2007-11-11 15:01:48 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2011-11-04 22:14:05 +01:00
|
|
|
test_expect_success 'fetch can now resolve short remote name' '
|
2007-11-11 15:01:48 +01:00
|
|
|
|
|
|
|
cd "$D" &&
|
2010-10-31 02:46:54 +01:00
|
|
|
git update-ref refs/remotes/six/HEAD HEAD &&
|
2007-11-11 15:01:48 +01:00
|
|
|
|
|
|
|
mkdir six &&
|
|
|
|
cd six &&
|
|
|
|
git init &&
|
|
|
|
|
2011-11-04 22:14:05 +01:00
|
|
|
git fetch .. six:six
|
2007-11-11 15:01:48 +01:00
|
|
|
'
|
|
|
|
|
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be
connected, preventing use of git-fetch / git-push to transport objects and
references between the repositories.
git-bundle provides an alternate transport mechanism, effectively allowing
git-fetch and git-pull to operate using sneakernet transport. `git-bundle
create` allows the user to create a bundle containing one or more branches
or tags, but with specified basis assumed to exist on the target
repository. At the receiving end, git-bundle acts like git-fetch-pack,
allowing the user to invoke git-fetch or git-pull using the bundle file as
the URL. git-fetch and git-ls-remote determine they have a bundle URL by
checking that the URL points to a file, but are otherwise unchanged in
operation with bundles.
The original patch was done by Mark Levedahl <mdl123@verizon.net>.
It was updated to make git-bundle a builtin, and get rid of the tar
format: now, the first line is supposed to say "# v2 git bundle", the next
lines either contain a prerequisite ("-" followed by the hash of the
needed commit), or a ref (the hash of a commit, followed by the name of
the ref), and finally the pack. As a result, the bundle argument can be
"-" now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-22 01:59:14 +01:00
|
|
|
test_expect_success 'create bundle 1' '
|
|
|
|
cd "$D" &&
|
|
|
|
echo >file updated again by origin &&
|
|
|
|
git commit -a -m "tip" &&
|
|
|
|
git bundle create bundle1 master^..master
|
|
|
|
'
|
|
|
|
|
2007-03-06 22:57:07 +01:00
|
|
|
test_expect_success 'header of bundle looks right' '
|
|
|
|
head -n 1 "$D"/bundle1 | grep "^#" &&
|
|
|
|
head -n 2 "$D"/bundle1 | grep "^-[0-9a-f]\{40\} " &&
|
|
|
|
head -n 3 "$D"/bundle1 | grep "^[0-9a-f]\{40\} " &&
|
|
|
|
head -n 4 "$D"/bundle1 | grep "^$"
|
|
|
|
'
|
|
|
|
|
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be
connected, preventing use of git-fetch / git-push to transport objects and
references between the repositories.
git-bundle provides an alternate transport mechanism, effectively allowing
git-fetch and git-pull to operate using sneakernet transport. `git-bundle
create` allows the user to create a bundle containing one or more branches
or tags, but with specified basis assumed to exist on the target
repository. At the receiving end, git-bundle acts like git-fetch-pack,
allowing the user to invoke git-fetch or git-pull using the bundle file as
the URL. git-fetch and git-ls-remote determine they have a bundle URL by
checking that the URL points to a file, but are otherwise unchanged in
operation with bundles.
The original patch was done by Mark Levedahl <mdl123@verizon.net>.
It was updated to make git-bundle a builtin, and get rid of the tar
format: now, the first line is supposed to say "# v2 git bundle", the next
lines either contain a prerequisite ("-" followed by the hash of the
needed commit), or a ref (the hash of a commit, followed by the name of
the ref), and finally the pack. As a result, the bundle argument can be
"-" now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-22 01:59:14 +01:00
|
|
|
test_expect_success 'create bundle 2' '
|
|
|
|
cd "$D" &&
|
|
|
|
git bundle create bundle2 master~2..master
|
|
|
|
'
|
|
|
|
|
2008-02-01 10:50:53 +01:00
|
|
|
test_expect_success 'unbundle 1' '
|
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be
connected, preventing use of git-fetch / git-push to transport objects and
references between the repositories.
git-bundle provides an alternate transport mechanism, effectively allowing
git-fetch and git-pull to operate using sneakernet transport. `git-bundle
create` allows the user to create a bundle containing one or more branches
or tags, but with specified basis assumed to exist on the target
repository. At the receiving end, git-bundle acts like git-fetch-pack,
allowing the user to invoke git-fetch or git-pull using the bundle file as
the URL. git-fetch and git-ls-remote determine they have a bundle URL by
checking that the URL points to a file, but are otherwise unchanged in
operation with bundles.
The original patch was done by Mark Levedahl <mdl123@verizon.net>.
It was updated to make git-bundle a builtin, and get rid of the tar
format: now, the first line is supposed to say "# v2 git bundle", the next
lines either contain a prerequisite ("-" followed by the hash of the
needed commit), or a ref (the hash of a commit, followed by the name of
the ref), and finally the pack. As a result, the bundle argument can be
"-" now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-22 01:59:14 +01:00
|
|
|
cd "$D/bundle" &&
|
|
|
|
git checkout -b some-branch &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git fetch "$D/bundle1" master:master
|
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be
connected, preventing use of git-fetch / git-push to transport objects and
references between the repositories.
git-bundle provides an alternate transport mechanism, effectively allowing
git-fetch and git-pull to operate using sneakernet transport. `git-bundle
create` allows the user to create a bundle containing one or more branches
or tags, but with specified basis assumed to exist on the target
repository. At the receiving end, git-bundle acts like git-fetch-pack,
allowing the user to invoke git-fetch or git-pull using the bundle file as
the URL. git-fetch and git-ls-remote determine they have a bundle URL by
checking that the URL points to a file, but are otherwise unchanged in
operation with bundles.
The original patch was done by Mark Levedahl <mdl123@verizon.net>.
It was updated to make git-bundle a builtin, and get rid of the tar
format: now, the first line is supposed to say "# v2 git bundle", the next
lines either contain a prerequisite ("-" followed by the hash of the
needed commit), or a ref (the hash of a commit, followed by the name of
the ref), and finally the pack. As a result, the bundle argument can be
"-" now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-22 01:59:14 +01:00
|
|
|
'
|
|
|
|
|
2009-08-08 05:12:13 +02:00
|
|
|
|
2007-03-06 22:57:07 +01:00
|
|
|
test_expect_success 'bundle 1 has only 3 files ' '
|
|
|
|
cd "$D" &&
|
2012-03-01 22:40:48 +01:00
|
|
|
convert_bundle_to_pack <bundle1 >bundle.pack &&
|
2007-03-06 22:57:07 +01:00
|
|
|
git index-pack bundle.pack &&
|
2009-08-08 05:12:13 +02:00
|
|
|
test_bundle_object_count bundle.pack 3
|
2007-03-06 22:57:07 +01:00
|
|
|
'
|
|
|
|
|
Add git-bundle: move objects and references by archive
Some workflows require use of repositories on machines that cannot be
connected, preventing use of git-fetch / git-push to transport objects and
references between the repositories.
git-bundle provides an alternate transport mechanism, effectively allowing
git-fetch and git-pull to operate using sneakernet transport. `git-bundle
create` allows the user to create a bundle containing one or more branches
or tags, but with specified basis assumed to exist on the target
repository. At the receiving end, git-bundle acts like git-fetch-pack,
allowing the user to invoke git-fetch or git-pull using the bundle file as
the URL. git-fetch and git-ls-remote determine they have a bundle URL by
checking that the URL points to a file, but are otherwise unchanged in
operation with bundles.
The original patch was done by Mark Levedahl <mdl123@verizon.net>.
It was updated to make git-bundle a builtin, and get rid of the tar
format: now, the first line is supposed to say "# v2 git bundle", the next
lines either contain a prerequisite ("-" followed by the hash of the
needed commit), or a ref (the hash of a commit, followed by the name of
the ref), and finally the pack. As a result, the bundle argument can be
"-" now.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-02-22 01:59:14 +01:00
|
|
|
test_expect_success 'unbundle 2' '
|
|
|
|
cd "$D/bundle" &&
|
|
|
|
git fetch ../bundle2 master:master &&
|
|
|
|
test "tip" = "$(git log -1 --pretty=oneline master | cut -b42-)"
|
|
|
|
'
|
|
|
|
|
2007-03-08 00:43:05 +01:00
|
|
|
test_expect_success 'bundle does not prerequisite objects' '
|
|
|
|
cd "$D" &&
|
|
|
|
touch file2 &&
|
|
|
|
git add file2 &&
|
|
|
|
git commit -m add.file2 file2 &&
|
|
|
|
git bundle create bundle3 -1 HEAD &&
|
2012-03-01 22:40:48 +01:00
|
|
|
convert_bundle_to_pack <bundle3 >bundle.pack &&
|
2007-03-08 00:43:05 +01:00
|
|
|
git index-pack bundle.pack &&
|
2009-08-08 05:12:13 +02:00
|
|
|
test_bundle_object_count bundle.pack 3
|
2007-03-08 00:43:05 +01:00
|
|
|
'
|
|
|
|
|
2007-08-09 02:01:49 +02:00
|
|
|
test_expect_success 'bundle should be able to create a full history' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git tag -a -m '1.0' v1.0 master &&
|
|
|
|
git bundle create bundle4 v1.0
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2009-03-09 19:44:55 +01:00
|
|
|
! rsync --help > /dev/null 2> /dev/null &&
|
|
|
|
say 'Skipping rsync tests because rsync was not found' || {
|
2007-10-01 01:59:39 +02:00
|
|
|
test_expect_success 'fetch via rsync' '
|
|
|
|
git pack-refs &&
|
|
|
|
mkdir rsynced &&
|
2009-03-09 19:44:55 +01:00
|
|
|
(cd rsynced &&
|
|
|
|
git init --bare &&
|
|
|
|
git fetch "rsync:$(pwd)/../.git" master:refs/heads/master &&
|
|
|
|
git gc --prune &&
|
|
|
|
test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
|
|
|
|
git fsck --full)
|
2007-10-01 01:59:39 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push via rsync' '
|
2009-03-09 19:44:55 +01:00
|
|
|
mkdir rsynced2 &&
|
|
|
|
(cd rsynced2 &&
|
2007-10-01 01:59:39 +02:00
|
|
|
git init) &&
|
2009-03-09 19:44:55 +01:00
|
|
|
(cd rsynced &&
|
|
|
|
git push "rsync:$(pwd)/../rsynced2/.git" master) &&
|
|
|
|
(cd rsynced2 &&
|
|
|
|
git gc --prune &&
|
|
|
|
test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
|
|
|
|
git fsck --full)
|
2007-10-01 01:59:39 +02:00
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push via rsync' '
|
|
|
|
mkdir rsynced3 &&
|
|
|
|
(cd rsynced3 &&
|
|
|
|
git init) &&
|
2009-03-09 19:44:55 +01:00
|
|
|
git push --all "rsync:$(pwd)/rsynced3/.git" &&
|
|
|
|
(cd rsynced3 &&
|
|
|
|
test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
|
|
|
|
git fsck --full)
|
2007-10-01 01:59:39 +02:00
|
|
|
'
|
|
|
|
}
|
|
|
|
|
2007-10-11 02:47:55 +02:00
|
|
|
test_expect_success 'fetch with a non-applying branch.<name>.merge' '
|
|
|
|
git config branch.master.remote yeti &&
|
|
|
|
git config branch.master.merge refs/heads/bigfoot &&
|
|
|
|
git config remote.blub.url one &&
|
|
|
|
git config remote.blub.fetch "refs/heads/*:refs/remotes/one/*" &&
|
|
|
|
git fetch blub
|
|
|
|
'
|
|
|
|
|
2010-09-09 20:56:37 +02:00
|
|
|
# URL supplied to fetch does not match the url of the configured branch's remote
|
|
|
|
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [1]' '
|
|
|
|
one_head=$(cd one && git rev-parse HEAD) &&
|
|
|
|
this_head=$(git rev-parse HEAD) &&
|
2010-08-25 19:52:55 +02:00
|
|
|
git update-ref -d FETCH_HEAD &&
|
|
|
|
git fetch one &&
|
2010-09-09 20:56:37 +02:00
|
|
|
test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
|
|
|
|
test $this_head = "$(git rev-parse --verify HEAD)"
|
|
|
|
'
|
|
|
|
|
|
|
|
# URL supplied to fetch matches the url of the configured branch's remote and
|
|
|
|
# the merge spec matches the branch the remote HEAD points to
|
|
|
|
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [2]' '
|
|
|
|
one_ref=$(cd one && git symbolic-ref HEAD) &&
|
|
|
|
git config branch.master.remote blub &&
|
|
|
|
git config branch.master.merge "$one_ref" &&
|
|
|
|
git update-ref -d FETCH_HEAD &&
|
|
|
|
git fetch one &&
|
|
|
|
test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
|
|
|
|
test $this_head = "$(git rev-parse --verify HEAD)"
|
|
|
|
'
|
|
|
|
|
|
|
|
# URL supplied to fetch matches the url of the configured branch's remote, but
|
|
|
|
# the merge spec does not match the branch the remote HEAD points to
|
|
|
|
test_expect_success 'fetch from GIT URL with a non-applying branch.<name>.merge [3]' '
|
|
|
|
git config branch.master.merge "${one_ref}_not" &&
|
|
|
|
git update-ref -d FETCH_HEAD &&
|
|
|
|
git fetch one &&
|
|
|
|
test $one_head = "$(git rev-parse --verify FETCH_HEAD)" &&
|
|
|
|
test $this_head = "$(git rev-parse --verify HEAD)"
|
2010-08-25 19:52:55 +02:00
|
|
|
'
|
|
|
|
|
2007-11-04 21:26:22 +01:00
|
|
|
# the strange name is: a\!'b
|
|
|
|
test_expect_success 'quoting of a strangely named repo' '
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git fetch "a\\!'\''b" > result 2>&1 &&
|
2007-11-04 21:26:22 +01:00
|
|
|
cat result &&
|
|
|
|
grep "fatal: '\''a\\\\!'\''b'\''" result
|
|
|
|
'
|
|
|
|
|
2007-11-22 13:24:59 +01:00
|
|
|
test_expect_success 'bundle should record HEAD correctly' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git bundle create bundle5 HEAD master &&
|
|
|
|
git bundle list-heads bundle5 >actual &&
|
|
|
|
for h in HEAD refs/heads/master
|
|
|
|
do
|
|
|
|
echo "$(git rev-parse --verify $h) $h"
|
|
|
|
done >expect &&
|
2008-03-12 22:36:36 +01:00
|
|
|
test_cmp expect actual
|
2007-11-22 13:24:59 +01:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2013-05-11 18:14:03 +02:00
|
|
|
test_expect_success 'mark initial state of origin/master' '
|
|
|
|
(
|
|
|
|
cd three &&
|
|
|
|
git tag base-origin-master refs/remotes/origin/master
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-05-11 18:16:52 +02:00
|
|
|
test_expect_success 'explicit fetch should update tracking' '
|
2007-12-05 06:58:42 +01:00
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git branch -f side &&
|
|
|
|
(
|
|
|
|
cd three &&
|
2013-05-11 18:14:03 +02:00
|
|
|
git update-ref refs/remotes/origin/master base-origin-master &&
|
2007-12-05 06:58:42 +01:00
|
|
|
o=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
git fetch origin master &&
|
|
|
|
n=$(git rev-parse --verify refs/remotes/origin/master) &&
|
2013-05-11 18:16:52 +02:00
|
|
|
test "$o" != "$n" &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git rev-parse --verify refs/remotes/origin/side
|
2007-12-05 06:58:42 +01:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-05-11 18:16:52 +02:00
|
|
|
test_expect_success 'explicit pull should update tracking' '
|
2007-12-05 06:58:42 +01:00
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git branch -f side &&
|
|
|
|
(
|
|
|
|
cd three &&
|
2013-05-11 18:14:03 +02:00
|
|
|
git update-ref refs/remotes/origin/master base-origin-master &&
|
2007-12-05 06:58:42 +01:00
|
|
|
o=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
git pull origin master &&
|
|
|
|
n=$(git rev-parse --verify refs/remotes/origin/master) &&
|
2013-05-11 18:16:52 +02:00
|
|
|
test "$o" != "$n" &&
|
2008-07-12 17:47:52 +02:00
|
|
|
test_must_fail git rev-parse --verify refs/remotes/origin/side
|
2007-12-05 06:58:42 +01:00
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'configured fetch updates tracking' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git branch -f side &&
|
|
|
|
(
|
|
|
|
cd three &&
|
2013-05-11 18:14:03 +02:00
|
|
|
git update-ref refs/remotes/origin/master base-origin-master &&
|
2007-12-05 06:58:42 +01:00
|
|
|
o=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
git fetch origin &&
|
|
|
|
n=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
test "$o" != "$n" &&
|
|
|
|
git rev-parse --verify refs/remotes/origin/side
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2013-05-27 18:33:09 +02:00
|
|
|
test_expect_success 'non-matching refspecs do not confuse tracking update' '
|
|
|
|
cd "$D" &&
|
|
|
|
git update-ref refs/odd/location HEAD &&
|
|
|
|
(
|
|
|
|
cd three &&
|
|
|
|
git update-ref refs/remotes/origin/master base-origin-master &&
|
|
|
|
git config --add remote.origin.fetch \
|
|
|
|
refs/odd/location:refs/remotes/origin/odd &&
|
|
|
|
o=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
git fetch origin master &&
|
|
|
|
n=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
test "$o" != "$n" &&
|
|
|
|
test_must_fail git rev-parse --verify refs/remotes/origin/odd
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
clean up error conventions of remote.c:match_explicit
match_explicit is called for each push refspec to try to
fully resolve the source and destination sides of the
refspec. Currently, we look at each refspec and report
errors on both the source and the dest side before aborting.
It makes sense to report errors for each refspec, since an
error in one is independent of an error in the other.
However, reporting errors on the 'dst' side of a refspec if
there has been an error on the 'src' side does not
necessarily make sense, since the interpretation of the
'dst' side depends on the 'src' side (for example, when
creating a new unqualified remote ref, we use the same type
as the src ref).
This patch lets match_explicit return early when the src
side of the refspec is bogus. We still look at all of the
refspecs before aborting the push, though.
At the same time, we clean up the call signature, which
previously took an extra "errs" flag. This was pointless, as
we didn't act on that flag, but rather just passed it back
to the caller. Instead, we now use the more traditional
"return -1" to signal an error, and the caller aggregates
the error count.
This change fixes two bugs, as well:
- the early return avoids a segfault when passing a NULL
matched_src to guess_ref()
- the check for multiple sources pointing to a single dest
aborted if the "err" flag was set. Presumably the intent
was not to bother with the check if we had no
matched_src. However, since the err flag was passed in
from the caller, we might abort the check just because a
previous refspec had a problem, which doesn't make
sense.
In practice, this didn't matter, since due to the error
flag we end up aborting the push anyway.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2008-06-16 18:15:02 +02:00
|
|
|
test_expect_success 'pushing nonexistent branch by mistake should not segv' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
test_must_fail git push seven no:no
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-09-22 08:50:01 +02:00
|
|
|
test_expect_success 'auto tag following fetches minimum' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git clone .git follow &&
|
|
|
|
git checkout HEAD^0 &&
|
|
|
|
(
|
|
|
|
for i in 1 2 3 4 5 6 7
|
|
|
|
do
|
|
|
|
echo $i >>file &&
|
|
|
|
git commit -m $i -a &&
|
|
|
|
git tag -a -m $i excess-$i || exit 1
|
|
|
|
done
|
|
|
|
) &&
|
|
|
|
git checkout master &&
|
|
|
|
(
|
|
|
|
cd follow &&
|
|
|
|
git fetch
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2008-10-13 11:36:52 +02:00
|
|
|
test_expect_success 'refuse to fetch into the current branch' '
|
|
|
|
|
|
|
|
test_must_fail git fetch . side:master
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'fetch into the current branch with --update-head-ok' '
|
|
|
|
|
|
|
|
git fetch --update-head-ok . side:master
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2010-02-25 21:03:44 +01:00
|
|
|
test_expect_success 'fetch --dry-run' '
|
|
|
|
|
|
|
|
rm -f .git/FETCH_HEAD &&
|
|
|
|
git fetch --dry-run . &&
|
|
|
|
! test -f .git/FETCH_HEAD
|
|
|
|
'
|
|
|
|
|
2009-11-13 22:25:56 +01:00
|
|
|
test_expect_success "should be able to fetch with duplicate refspecs" '
|
2012-03-01 22:40:49 +01:00
|
|
|
mkdir dups &&
|
|
|
|
(
|
|
|
|
cd dups &&
|
|
|
|
git init &&
|
|
|
|
git config branch.master.remote three &&
|
|
|
|
git config remote.three.url ../three/.git &&
|
|
|
|
git config remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
|
|
|
|
git config --add remote.three.fetch +refs/heads/*:refs/remotes/origin/* &&
|
|
|
|
git fetch three
|
|
|
|
)
|
2009-11-13 22:25:56 +01:00
|
|
|
'
|
|
|
|
|
2012-03-01 22:40:51 +01:00
|
|
|
test_expect_success 'all boundary commits are excluded' '
|
|
|
|
test_commit base &&
|
|
|
|
test_commit oneside &&
|
|
|
|
git checkout HEAD^ &&
|
|
|
|
test_commit otherside &&
|
|
|
|
git checkout master &&
|
|
|
|
test_tick &&
|
|
|
|
git merge otherside &&
|
|
|
|
ad=$(git log --no-walk --format=%ad HEAD) &&
|
|
|
|
git bundle create twoside-boundary.bdl master --since="$ad" &&
|
|
|
|
convert_bundle_to_pack <twoside-boundary.bdl >twoside-boundary.pack &&
|
|
|
|
pack=$(git index-pack --fix-thin --stdin <twoside-boundary.pack) &&
|
|
|
|
test_bundle_object_count .git/objects/pack/pack-${pack##pack }.pack 3
|
2009-11-13 22:25:56 +01:00
|
|
|
'
|
|
|
|
|
2006-09-23 12:40:17 +02:00
|
|
|
test_done
|