No subject
Thu Jun 12 23:09:36 BST 2008
* ok 3: fetch with wildcard
* expecting success:
mk_empty &&
git push testrepo refs/heads/master:refs/remotes/origin/master &&
(
cd testrepo &&
r=$(git show-ref -s --verify refs/remotes/origin/master) &&
test "z$r" = "z$the_commit" &&
test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
)
Initialized empty Git repository in .git/
Counting objects: 5, done.
Compressing objects: 33% (1/3)
Compressing objects: 66% (2/3)
Compressing objects: 100% (3/3)
Compressing objects: 100% (3/3), done.
Writing objects: 20% (1/5)
Writing objects: 40% (2/5)
Writing objects: 60% (3/5)
Writing objects: 80% (4/5)
Writing objects: 100% (5/5)
Writing objects: 100% (5/5), 419 bytes, done.
Total 5 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] master -> origin/master
* ok 4: push without wildcard
* expecting success:
mk_empty &&
git push testrepo "refs/heads/*:refs/remotes/origin/*" &&
(
cd testrepo &&
r=$(git show-ref -s --verify refs/remotes/origin/master) &&
test "z$r" = "z$the_commit" &&
test 1 = $(git for-each-ref refs/remotes/origin | wc -l)
)
Initialized empty Git repository in .git/
Counting objects: 5, done.
Compressing objects: 33% (1/3)
Compressing objects: 66% (2/3)
Compressing objects: 100% (3/3)
Compressing objects: 100% (3/3), done.
Writing objects: 20% (1/5)
Writing objects: 40% (2/5)
Writing objects: 60% (3/5)
Writing objects: 80% (4/5)
Writing objects: 100% (5/5)
Writing objects: 100% (5/5), 419 bytes, done.
Total 5 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] master -> origin/master
* ok 5: push with wildcard
* expecting success:
mk_test heads/master &&
git push testrepo &&
check_push_result $the_commit heads/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 master -> master
* ok 6: push with matching heads
* expecting success:
mk_test heads/master &&
git push testrepo master:master &&
check_push_result $the_commit heads/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 master -> master
* ok 7: push with no ambiguity (1)
* expecting success:
mk_test remotes/origin/master &&
git push testrepo master:origin/master &&
check_push_result $the_commit remotes/origin/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
notice: HEAD points to an unborn branch (master)
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 master -> origin/master
notice: HEAD points to an unborn branch (master)
* ok 8: push with no ambiguity (2)
* expecting success:
mk_test heads/master heads/t/master &&
git branch -f t/master master &&
git push testrepo master &&
check_push_result $the_commit heads/master &&
check_push_result $the_first_commit heads/t/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> t/master
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 master -> master
* ok 9: push with colon-less refspec, no ambiguity
* expecting success:
mk_test heads/master remotes/origin/master &&
git push testrepo master:master &&
check_push_result $the_commit heads/master &&
check_push_result $the_first_commit remotes/origin/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 master -> master
* ok 10: push with weak ambiguity (1)
* expecting success:
mk_test heads/master remotes/origin/master remotes/another/master &&
git push testrepo master:master &&
check_push_result $the_commit heads/master &&
check_push_result $the_first_commit remotes/origin/master remotes/another/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> another/master
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 master -> master
* ok 11: push with weak ambiguity (2)
* expecting success:
mk_test remotes/origin/master remotes/frotz/master &&
if git push testrepo master:master
then
echo "Oops, should have failed"
false
else
check_push_result $the_first_commit remotes/origin/master remotes/frotz/master
fi
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> origin/master
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz/master
notice: HEAD points to an unborn branch (master)
error: dst refspec master does not match any existing ref on the remote and does not start with refs/.
fatal: The remote end hung up unexpectedly
error: failed to push some refs to 'testrepo'
notice: HEAD points to an unborn branch (master)
* ok 12: push with ambiguity (1)
* expecting success:
mk_test heads/frotz tags/frotz &&
if git push testrepo master:frotz
then
echo "Oops, should have failed"
false
else
check_push_result $the_first_commit heads/frotz tags/frotz
fi
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new tag] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
notice: HEAD points to an unborn branch (master)
error: dst refspec frotz matches more than one.
fatal: The remote end hung up unexpectedly
error: failed to push some refs to 'testrepo'
notice: HEAD points to an unborn branch (master)
* ok 13: push with ambiguity (2)
* expecting success:
mk_test heads/frotz tags/frotz &&
git branch -f frotz master &&
git push testrepo frotz &&
check_push_result $the_commit heads/frotz &&
check_push_result $the_first_commit tags/frotz
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new tag] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
notice: HEAD points to an unborn branch (master)
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 frotz -> frotz
notice: HEAD points to an unborn branch (master)
notice: HEAD points to an unborn branch (master)
* ok 14: push with colon-less refspec (1)
* expecting success:
mk_test heads/frotz tags/frotz &&
if git show-ref --verify -q refs/heads/frotz
then
git branch -D frotz
fi &&
git tag -f frotz &&
git push testrepo frotz &&
check_push_result $the_commit tags/frotz &&
check_push_result $the_first_commit heads/frotz
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
Total 0 (delta 0), reused 0 (delta 0)
To testrepo
* [new tag] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> frotz
notice: HEAD points to an unborn branch (master)
Deleted branch frotz.
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 frotz -> frotz
notice: HEAD points to an unborn branch (master)
notice: HEAD points to an unborn branch (master)
* ok 15: push with colon-less refspec (2)
* expecting success:
mk_test &&
if git show-ref --verify -q refs/tags/frotz
then
git tag -d frotz
fi &&
git branch -f frotz master &&
git push testrepo frotz &&
check_push_result $the_commit heads/frotz &&
test 1 = $( cd testrepo && git show-ref | wc -l )
Initialized empty Git repository in .git/
notice: HEAD points to an unborn branch (master)
notice: No default references
Deleted tag 'frotz'
Counting objects: 5, done.
Compressing objects: 33% (1/3)
Compressing objects: 66% (2/3)
Compressing objects: 100% (3/3)
Compressing objects: 100% (3/3), done.
Writing objects: 20% (1/5)
Writing objects: 40% (2/5)
Writing objects: 60% (3/5)
Writing objects: 80% (4/5)
Writing objects: 100% (5/5)
Writing objects: 100% (5/5), 419 bytes, done.
Total 5 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] frotz -> frotz
notice: HEAD points to an unborn branch (master)
* ok 16: push with colon-less refspec (3)
* expecting success:
mk_test &&
if git show-ref --verify -q refs/heads/frotz
then
git branch -D frotz
fi &&
git tag -f frotz &&
git push testrepo frotz &&
check_push_result $the_commit tags/frotz &&
test 1 = $( cd testrepo && git show-ref | wc -l )
Initialized empty Git repository in .git/
notice: HEAD points to an unborn branch (master)
notice: No default references
Deleted branch frotz.
Counting objects: 5, done.
Compressing objects: 33% (1/3)
Compressing objects: 66% (2/3)
Compressing objects: 100% (3/3)
Compressing objects: 100% (3/3), done.
Writing objects: 20% (1/5)
Writing objects: 40% (2/5)
Writing objects: 60% (3/5)
Writing objects: 80% (4/5)
Writing objects: 100% (5/5)
Writing objects: 100% (5/5), 419 bytes, done.
Total 5 (delta 0), reused 0 (delta 0)
To testrepo
* [new tag] frotz -> frotz
notice: HEAD points to an unborn branch (master)
* ok 17: push with colon-less refspec (4)
* expecting success:
mk_test heads/master &&
git checkout master &&
git push testrepo HEAD &&
check_push_result $the_commit heads/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
Already on branch "master"
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
b9c09d6..9ad36e1 master -> master
* ok 18: push with HEAD
* expecting success:
mk_test heads/master &&
git checkout -b local master &&
git push testrepo HEAD &&
check_push_result $the_commit heads/local
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
Switched to a new branch "local"
Counting objects: 3, done.
Compressing objects: 50% (1/2)
Compressing objects: 100% (2/2)
Compressing objects: 100% (2/2), done.
Writing objects: 50% (1/2)
Writing objects: 100% (2/2)
Writing objects: 100% (2/2), 240 bytes, done.
Total 2 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] local -> local
* ok 19: push with HEAD nonexisting at remote
* expecting success:
mk_test heads/master &&
(cd testrepo &&
old_commit=$(git show-ref -s --verify refs/heads/master)) &&
git push --dry-run testrepo &&
check_push_result $old_commit heads/master
Initialized empty Git repository in .git/
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 211 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To testrepo
* [new branch] b9c09d6cc74d3857142fb7c082dca65b88254c6d -> master
To testrepo
b9c09d6..9ad36e1 master -> master
* ok 20: push with dry-run
* expecting success:
rm -rf parent child &&
mkdir parent &&
(cd parent && git init &&
echo one >foo && git add foo && git commit -m one) &&
git clone parent child &&
(cd child &&
echo two >foo && git commit -a -m two &&
git push &&
test $(git rev-parse master) = $(git rev-parse remotes/origin/master))
Initialized empty Git repository in .git/
Created initial commit c866750: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Initialized empty Git repository in /build/buildd/git-core-1.5.4.3/t/trash/child/.git/
0 blocks
Created commit 6b1cc62: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 244 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To /build/buildd/git-core-1.5.4.3/t/trash/parent/.git
c866750..6b1cc62 master -> master
* ok 21: push updates local refs
* expecting success:
rm -rf parent child &&
mkdir parent &&
(cd parent && git init &&
echo one >foo && git add foo && git commit -m one &&
echo exit 1 >.git/hooks/pre-receive &&
chmod +x .git/hooks/pre-receive) &&
git clone parent child &&
(cd child &&
echo two >foo && git commit -a -m two &&
! git push &&
test $(git rev-parse master) != \
$(git rev-parse remotes/origin/master))
Initialized empty Git repository in .git/
Created initial commit c866750: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Initialized empty Git repository in /build/buildd/git-core-1.5.4.3/t/trash/child/.git/
0 blocks
Created commit 6b1cc62: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 244 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
error: hooks/pre-receive exited with error code 1
To /build/buildd/git-core-1.5.4.3/t/trash/parent/.git
! [remote rejected] master -> master (pre-receive hook declined)
error: failed to push some refs to '/build/buildd/git-core-1.5.4.3/t/trash/parent/.git'
* ok 22: push does not update local refs on failure
* expecting success:
pwd &&
rm -f testrepo/.git/objects/??/* &&
git push testrepo :refs/heads/master &&
(cd testrepo && ! git rev-parse --verify refs/heads/master)
/build/buildd/git-core-1.5.4.3/t/trash
error: refs/heads/master does not point to a valid object!
warning: Allowing deletion of corrupt ref.
To testrepo
- [deleted] master
fatal: Needed a single revision
* ok 23: allow deleting an invalid remote ref
* passed all 23 test(s)
*** t5517-push-mirror.sh ***
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
test "$master_master" = "$mirror_master"
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* ok 1: push mirror creates new branches
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
test "$master_master" = "$mirror_master"
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
Created commit a4784d5: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 243 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
194721e..a4784d5 master -> master
* ok 2: push mirror updates existing branches
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
git push --mirror up &&
git reset --hard HEAD^
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
test "$master_master" = "$mirror_master"
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
Created commit a4784d5: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 243 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
194721e..a4784d5 master -> master
HEAD is now at 194721e... one
Total 0 (delta 0), reused 0 (delta 0)
To ../mirror
+ a4784d5...194721e master -> master (forced update)
* ok 3: push mirror force updates existing branches
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git branch remove master &&
git push --mirror up &&
git branch -D remove
git push --mirror up
) &&
(
cd mirror &&
invert git show-ref -s --verify refs/heads/remove
)
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* [new branch] remove -> remove
Deleted branch remove.
To ../mirror
- [deleted] remove
fatal: 'refs/heads/remove' - not a valid ref
* ok 4: push mirror removes branches
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git branch remove master &&
git push --mirror up &&
git branch -D remove &&
git branch add master &&
echo two >foo && git add foo && git commit -m two &&
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/heads/master) &&
master_add=$(cd master && git show-ref -s --verify refs/heads/add) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/heads/master) &&
mirror_add=$(cd mirror && git show-ref -s --verify refs/heads/add) &&
test "$master_master" = "$mirror_master" &&
test "$master_add" = "$mirror_add" &&
(
cd mirror &&
invert git show-ref -s --verify refs/heads/remove
)
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* [new branch] remove -> remove
Deleted branch remove.
Created commit a4784d5: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 243 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
194721e..a4784d5 master -> master
- [deleted] remove
* [new branch] add -> add
fatal: 'refs/heads/remove' - not a valid ref
* ok 5: push mirror adds, updates and removes branches together
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git tag -f tmaster master &&
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
test "$master_master" = "$mirror_master"
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* [new tag] tmaster -> tmaster
* ok 6: push mirror creates new tags
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git tag -f tmaster master &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
git tag -f tmaster master &&
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
test "$master_master" = "$mirror_master"
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* [new tag] tmaster -> tmaster
Created commit a4784d5: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 243 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
194721e..a4784d5 master -> master
194721e..a4784d5 tmaster -> tmaster
* ok 7: push mirror updates existing tags
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git tag -f tmaster master &&
git push --mirror up &&
echo two >foo && git add foo && git commit -m two &&
git tag -f tmaster master &&
git push --mirror up &&
git reset --hard HEAD^
git tag -f tmaster master &&
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
test "$master_master" = "$mirror_master"
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* [new tag] tmaster -> tmaster
Created commit a4784d5: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 243 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
194721e..a4784d5 master -> master
194721e..a4784d5 tmaster -> tmaster
HEAD is now at 194721e... one
Total 0 (delta 0), reused 0 (delta 0)
To ../mirror
+ a4784d5...194721e master -> master (forced update)
+ a4784d5...194721e tmaster -> tmaster (forced update)
* ok 8: push mirror force updates existing tags
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git tag -f tremove master &&
git push --mirror up &&
git tag -d tremove
git push --mirror up
) &&
(
cd mirror &&
invert git show-ref -s --verify refs/tags/tremove
)
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* [new tag] tremove -> tremove
Deleted tag 'tremove'
To ../mirror
- [deleted] tremove
fatal: 'refs/tags/tremove' - not a valid ref
* ok 9: push mirror removes tags
* expecting success:
mk_repo_pair &&
(
cd master &&
echo one >foo && git add foo && git commit -m one &&
git tag -f tmaster master &&
git tag -f tremove master &&
git push --mirror up &&
git tag -d tremove &&
git tag tadd master &&
echo two >foo && git add foo && git commit -m two &&
git tag -f tmaster master &&
git push --mirror up
) &&
master_master=$(cd master && git show-ref -s --verify refs/tags/tmaster) &&
master_add=$(cd master && git show-ref -s --verify refs/tags/tadd) &&
mirror_master=$(cd mirror && git show-ref -s --verify refs/tags/tmaster) &&
mirror_add=$(cd mirror && git show-ref -s --verify refs/tags/tadd) &&
test "$master_master" = "$mirror_master" &&
test "$master_add" = "$mirror_add" &&
(
cd mirror &&
invert git show-ref -s --verify refs/tags/tremove
)
Initialized empty Git repository in .git/
Initialized empty Git repository in .git/
Created initial commit 194721e: one
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 foo
Counting objects: 3, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 213 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
* [new branch] master -> master
* [new tag] tmaster -> tmaster
* [new tag] tremove -> tremove
Deleted tag 'tremove'
Created commit a4784d5: two
1 files changed, 1 insertions(+), 1 deletions(-)
Counting objects: 5, done.
Writing objects: 33% (1/3)
Writing objects: 66% (2/3)
Writing objects: 100% (3/3)
Writing objects: 100% (3/3), 243 bytes, done.
Total 3 (delta 0), reused 0 (delta 0)
To ../mirror
194721e..a4784d5 master -> master
194721e..a4784d5 tmaster -> tmaster
- [deleted] tremove
* [new tag] tadd -> tadd
fatal: 'refs/tags/tremove' - not a valid ref
* ok 10: push mirror adds, updates and removes tags together
* passed all 10 test(s)
*** t5520-pull.sh ***
* expecting success:
echo file >file &&
git add file &&
git commit -a -m original
Created initial commit 36ae834: original
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 file
* ok 1: setup
* expecting success:
mkdir cloned &&
cd cloned &&
git init &&
git pull ..
Initialized empty Git repository in .git/
warning: no common commits
remote: Counting objects: 3, done.[K
remote: Total 3 (delta 0), reused 0 (delta 0)[K
* ok 2: pulling into void
* expecting success:
test -f file &&
test -f cloned/file &&
diff file cloned/file
* ok 3: checking the results
* expecting success:
git branch copy master &&
git config branch.copy.remote . &&
git config branch.copy.merge refs/heads/master &&
echo updated >file &&
git commit -a -m updated &&
git checkout copy &&
test `cat file` = file &&
git pull &&
test `cat file` = updated
Created commit 71f2b45: updated
1 files changed, 1 insertions(+), 1 deletions(-)
Switched to branch "copy"
Updating 36ae834..71f2b45
Fast forward
file | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
* ok 4: test . as a remote
* expecting success:
git checkout -b second master^ &&
echo modified >file &&
git commit -a -m modified &&
git checkout copy &&
git reset --hard HEAD^ &&
test `cat file` = file &&
git pull . second &&
test `cat file` = modified
Switched to a new branch "second"
Created commit 5c9aead: modified
1 files changed, 1 insertions(+), 1 deletions(-)
Switched to branch "copy"
HEAD is now at 36ae834... original
Updating 36ae834..5c9aead
Fast forward
file | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
* ok 5: the default remote . should not break explicit pull
* expecting success:
git branch to-rebase &&
echo modified again > file &&
git commit -m file file &&
git checkout to-rebase &&
echo new > file2 &&
git add file2 &&
git commit -m "new file" &&
git tag before-rebase &&
git pull --rebase . copy &&
test $(git rev-parse HEAD^) = $(git rev-parse copy) &&
test new = $(git show HEAD:file2)
Created commit 3275fd7: file
1 files changed, 1 insertions(+), 1 deletions(-)
Switched to branch "to-rebase"
Created commit addcbc5: new file
1 files changed, 1 insertions(+), 0 deletions(-)
create mode 100644 file2
First, rewinding head to replay your work on top of it...
HEAD is now at 3275fd7... file
Applying new file
* ok 6: --rebase
* expecting success:
git reset --hard before-rebase &&
git config branch.to-rebase.rebase 1 &&
git pull . copy &&
git config branch.to-rebase.rebase 0 &&
test $(git rev-parse HEAD^) = $(git rev-parse copy) &&
test new = $(git show HEAD:file2)
HEAD is now at addcbc5... new file
First, rewinding head to replay your work on top of it...
HEAD is now at 3275fd7... file
Applying new file
* ok 7: branch.to-rebase.rebase
* expecting success:
git remote add -f me . &&
git checkout copy &&
git reset --hard HEAD^ &&
echo conflicting modification > file &&
git commit -m conflict file &&
git checkout to-rebase &&
echo file > file2 &&
git commit -m to-rebase file2 &&
git pull --rebase me copy &&
test "conflicting modification" = "$(cat file)" &&
test file = $(cat file2)
More information about the ubuntu-autotest
mailing list