No subject

23057f33ac06651f5fa80e7d3c5555b35638580d
*   ok 22: configured fetch updates tracking

* passed all 22 test(s)
*** t5512-ls-remote.sh ***
* expecting success: 

	>file &&
	git add file &&
	test_tick &&
	git commit -m initial &&
	git tag mark &&
	git show-ref --tags -d | sed -e "s/ /	/" >expected.tag &&
	(
		echo "$(git rev-parse HEAD)	HEAD"
		git show-ref -d	| sed -e "s/ /	/"
	) >expected.all &&

	git remote add self $(pwd)/.git


Created initial commit 1bd44cb: initial
 0 files changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 file
*   ok 1: setup

* expecting success: 

	git ls-remote --tags .git >actual &&
	diff -u expected.tag actual


*   ok 2: ls-remote --tags .git

* expecting success: 

	git ls-remote .git >actual &&
	diff -u expected.all actual


*   ok 3: ls-remote .git

* expecting success: 

	git ls-remote --tags self >actual &&
	diff -u expected.tag actual


*   ok 4: ls-remote --tags self

* expecting success: 

	git ls-remote self >actual &&
	diff -u expected.all actual


*   ok 5: ls-remote self

* passed all 5 test(s)
*** t5515-fetch-merge-logic.sh ***
* expecting success: 
	GIT_AUTHOR_DATE="2006-06-26 00:00:00 +0000" &&
	GIT_COMMITTER_DATE="2006-06-26 00:00:00 +0000" &&
	export GIT_AUTHOR_DATE GIT_COMMITTER_DATE &&

	echo >file original &&
	git add file &&
	git commit -a -m One &&
	git tag tag-one &&
	git tag tag-one-tree HEAD^{tree} &&
	git branch one &&

	echo two >> file &&
	git commit -a -m Two &&
	git tag -a -m "Tag Two" tag-two &&
	git branch two &&

	echo three >> file &&
	git commit -a -m Three &&
	git tag -a -m "Tag Three" tag-three &&
	git tag -a -m "Tag Three file" tag-three-file HEAD^{tree}:file &&
	git branch three &&

	echo master >> file &&
	git commit -a -m Master &&
	git tag -a -m "Tag Master" tag-master &&

	git checkout three &&

	git clone . cloned &&
	cd cloned &&
	git config remote.origin.url ../.git/ &&

	git config remote.config-explicit.url ../.git/ &&
	git config remote.config-explicit.fetch refs/heads/master:remotes/rem/master &&
	git config --add remote.config-explicit.fetch refs/heads/one:remotes/rem/one &&
	git config --add remote.config-explicit.fetch two:remotes/rem/two &&
	git config --add remote.config-explicit.fetch refs/heads/three:remotes/rem/three &&
	remotes="config-explicit" &&

	git config remote.config-glob.url ../.git/ &&
	git config remote.config-glob.fetch refs/heads/*:refs/remotes/rem/* &&
	remotes="$remotes config-glob" &&

	mkdir -p .git/remotes &&
	{
		echo "URL: ../.git/"
		echo "Pull: refs/heads/master:remotes/rem/master"
		echo "Pull: refs/heads/one:remotes/rem/one"
		echo "Pull: two:remotes/rem/two"
		echo "Pull: refs/heads/three:remotes/rem/three"
	} >.git/remotes/remote-explicit &&
	remotes="$remotes remote-explicit" &&

	{
		echo "URL: ../.git/"
		echo "Pull: refs/heads/*:refs/remotes/rem/*"
	} >.git/remotes/remote-glob &&
	remotes="$remotes remote-glob" &&

	mkdir -p .git/branches &&
	echo "../.git" > .git/branches/branches-default &&
	remotes="$remotes branches-default" &&

	echo "../.git#one" > .git/branches/branches-one &&
	remotes="$remotes branches-one" &&

	for remote in $remotes ; do
		git config branch.br-$remote.remote $remote &&
		git config branch.br-$remote-merge.remote $remote &&
		git config branch.br-$remote-merge.merge refs/heads/three &&
		git config branch.br-$remote-octopus.remote $remote &&
		git config branch.br-$remote-octopus.merge refs/heads/one &&
		git config --add branch.br-$remote-octopus.merge two
	done

Created initial commit 8e32a6d: One
 1 files changed, 1 insertions(+), 0 deletions(-)
 create mode 100644 file
Created commit 6134ee8: Two
 1 files changed, 1 insertions(+), 0 deletions(-)
Created commit 0567da4: Three
 1 files changed, 1 insertions(+), 0 deletions(-)
Created commit 754b754: Master
 1 files changed, 1 insertions(+), 0 deletions(-)
Switched to branch "three"
Initialized empty Git repository in /build/buildd/git-core-1.5.4.3/t/trash/cloned/.git/
0 blocks
*   ok 1: setup

* expecting success: 
		{
			echo "# $cmd"
			set x $cmd; shift
			git symbolic-ref HEAD refs/heads/$1 ; shift
			rm -f .git/FETCH_HEAD
			rm -f .git/refs/heads/*
			rm -f .git/refs/remotes/rem/*
			rm -f .git/refs/tags/*
			git fetch "$@" >/dev/null
			cat .git/FETCH_HEAD
		} >"$actual" &&
		if test -f "$expect"
		then
			git diff -u "$expect" "$actual" &&
			rm -f "$actual"
		else
			# this is to help developing new tests.
			cp "$actual" "$expect"
			false
		fi