2006-09-23 14:40:17 +04:00
|
|
|
#!/bin/sh
|
|
|
|
# Copyright (c) 2006, Junio C Hamano.
|
|
|
|
|
|
|
|
test_description='Per branch config variables affects "git fetch".
|
|
|
|
|
|
|
|
'
|
|
|
|
|
|
|
|
. ./test-lib.sh
|
|
|
|
|
|
|
|
D=`pwd`
|
|
|
|
|
|
|
|
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 &&
|
|
|
|
cd one &&
|
|
|
|
echo >file updated by one &&
|
|
|
|
git commit -a -m "updated by one" &&
|
|
|
|
cd .. &&
|
|
|
|
git clone . two &&
|
|
|
|
cd two &&
|
2007-01-29 03:16:53 +03:00
|
|
|
git config branch.master.remote one &&
|
|
|
|
git config remote.one.url ../one/.git/ &&
|
|
|
|
git config remote.one.fetch refs/heads/master:refs/heads/one &&
|
2006-09-24 00:55:35 +04:00
|
|
|
cd .. &&
|
|
|
|
git clone . three &&
|
|
|
|
cd three &&
|
2007-01-29 03:16:53 +03:00
|
|
|
git config branch.master.remote two &&
|
|
|
|
git config branch.master.merge refs/heads/one &&
|
2006-12-19 12:50:37 +03:00
|
|
|
mkdir -p .git/remotes &&
|
2006-09-24 00:55:35 +04:00
|
|
|
{
|
|
|
|
echo "URL: ../two/.git/"
|
|
|
|
echo "Pull: refs/heads/master:refs/heads/two"
|
|
|
|
echo "Pull: refs/heads/one:refs/heads/one"
|
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 03:59:14 +03:00
|
|
|
} >.git/remotes/two &&
|
|
|
|
cd .. &&
|
|
|
|
git clone . bundle
|
2006-09-23 14:40:17 +04: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-24 00:55:35 +04: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 "$master_in_two not-for-merge"
|
|
|
|
echo "$one_in_two "
|
|
|
|
} >expected &&
|
|
|
|
cut -f -2 .git/FETCH_HEAD >actual &&
|
|
|
|
diff expected actual'
|
|
|
|
|
2007-10-09 12:51:07 +04: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 08:39:17 +03: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-13 00:01:46 +03:00
|
|
|
git init &&
|
2006-11-19 08:39:17 +03:00
|
|
|
|
|
|
|
git fetch .. :track &&
|
|
|
|
git show-ref --verify refs/tags/anno &&
|
|
|
|
git show-ref --verify refs/tags/light
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
test_expect_success 'fetch must not resolve short tag name' '
|
2007-11-11 17:01:48 +03:00
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
|
|
|
|
mkdir five &&
|
|
|
|
cd five &&
|
|
|
|
git init &&
|
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
! git fetch .. anno:five
|
2007-11-11 17:01:48 +03:00
|
|
|
|
|
|
|
'
|
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
test_expect_success 'fetch must not resolve short remote name' '
|
2007-11-11 17:01:48 +03:00
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git-update-ref refs/remotes/six/HEAD HEAD
|
|
|
|
|
|
|
|
mkdir six &&
|
|
|
|
cd six &&
|
|
|
|
git init &&
|
|
|
|
|
2008-02-01 12:50:53 +03:00
|
|
|
! git fetch .. six:six
|
2007-11-11 17:01:48 +03: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 03:59:14 +03: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-07 00:57:07 +03: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 03:59:14 +03:00
|
|
|
test_expect_success 'create bundle 2' '
|
|
|
|
cd "$D" &&
|
|
|
|
git bundle create bundle2 master~2..master
|
|
|
|
'
|
|
|
|
|
2008-02-01 12:50:53 +03: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 03:59:14 +03:00
|
|
|
cd "$D/bundle" &&
|
|
|
|
git checkout -b some-branch &&
|
2008-02-01 12:50:53 +03:00
|
|
|
! 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 03:59:14 +03:00
|
|
|
'
|
|
|
|
|
2007-03-07 00:57:07 +03:00
|
|
|
test_expect_success 'bundle 1 has only 3 files ' '
|
|
|
|
cd "$D" &&
|
|
|
|
(
|
|
|
|
while read x && test -n "$x"
|
|
|
|
do
|
|
|
|
:;
|
|
|
|
done
|
|
|
|
cat
|
|
|
|
) <bundle1 >bundle.pack &&
|
|
|
|
git index-pack bundle.pack &&
|
|
|
|
verify=$(git verify-pack -v bundle.pack) &&
|
|
|
|
test 4 = $(echo "$verify" | wc -l)
|
|
|
|
'
|
|
|
|
|
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 03:59:14 +03: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 02:43:05 +03: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 &&
|
2007-03-13 01:59:16 +03:00
|
|
|
(
|
|
|
|
while read x && test -n "$x"
|
|
|
|
do
|
|
|
|
:;
|
|
|
|
done
|
|
|
|
cat
|
|
|
|
) <bundle3 >bundle.pack &&
|
2007-03-08 02:43:05 +03:00
|
|
|
git index-pack bundle.pack &&
|
|
|
|
test 4 = $(git verify-pack -v bundle.pack | wc -l)
|
|
|
|
'
|
|
|
|
|
2007-08-09 04:01:49 +04: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
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-10-01 03:59:39 +04:00
|
|
|
test "$TEST_RSYNC" && {
|
|
|
|
test_expect_success 'fetch via rsync' '
|
|
|
|
git pack-refs &&
|
|
|
|
mkdir rsynced &&
|
|
|
|
cd rsynced &&
|
|
|
|
git init &&
|
|
|
|
git fetch rsync://127.0.0.1$(pwd)/../.git master:refs/heads/master &&
|
|
|
|
git gc --prune &&
|
|
|
|
test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
|
|
|
|
git fsck --full
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push via rsync' '
|
|
|
|
mkdir ../rsynced2 &&
|
|
|
|
(cd ../rsynced2 &&
|
|
|
|
git init) &&
|
|
|
|
git push rsync://127.0.0.1$(pwd)/../rsynced2/.git master &&
|
|
|
|
cd ../rsynced2 &&
|
|
|
|
git gc --prune &&
|
|
|
|
test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
|
|
|
|
git fsck --full
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'push via rsync' '
|
|
|
|
cd .. &&
|
|
|
|
mkdir rsynced3 &&
|
|
|
|
(cd rsynced3 &&
|
|
|
|
git init) &&
|
|
|
|
git push --all rsync://127.0.0.1$(pwd)/rsynced3/.git &&
|
|
|
|
cd rsynced3 &&
|
|
|
|
test $(git rev-parse master) = $(cd .. && git rev-parse master) &&
|
|
|
|
git fsck --full
|
|
|
|
'
|
|
|
|
}
|
|
|
|
|
2007-10-11 04:47:55 +04: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
|
|
|
|
'
|
|
|
|
|
2007-11-04 23:26:22 +03:00
|
|
|
# the strange name is: a\!'b
|
|
|
|
test_expect_success 'quoting of a strangely named repo' '
|
|
|
|
! git fetch "a\\!'\''b" > result 2>&1 &&
|
|
|
|
cat result &&
|
|
|
|
grep "fatal: '\''a\\\\!'\''b'\''" result
|
|
|
|
'
|
|
|
|
|
2007-11-22 15:24:59 +03: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 &&
|
|
|
|
diff -u expect actual
|
|
|
|
|
|
|
|
'
|
|
|
|
|
2007-12-05 08:58:42 +03:00
|
|
|
test_expect_success 'explicit fetch should not update tracking' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git branch -f side &&
|
|
|
|
(
|
|
|
|
cd three &&
|
|
|
|
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" &&
|
|
|
|
! git rev-parse --verify refs/remotes/origin/side
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'explicit pull should not update tracking' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git branch -f side &&
|
|
|
|
(
|
|
|
|
cd three &&
|
|
|
|
o=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
git pull origin master &&
|
|
|
|
n=$(git rev-parse --verify refs/remotes/origin/master) &&
|
|
|
|
test "$o" = "$n" &&
|
|
|
|
! git rev-parse --verify refs/remotes/origin/side
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
|
|
|
test_expect_success 'configured fetch updates tracking' '
|
|
|
|
|
|
|
|
cd "$D" &&
|
|
|
|
git branch -f side &&
|
|
|
|
(
|
|
|
|
cd three &&
|
|
|
|
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
|
|
|
|
)
|
|
|
|
'
|
|
|
|
|
2006-09-23 14:40:17 +04:00
|
|
|
test_done
|