From: Junio C Hamano <junkio@cox.net>
Date: Tue, 19 Dec 2006 09:38:18 +0000 (-0800)
Subject: Merge branch 'jc/test-clone' into jc/clone
X-Git-Tag: v1.5.0-rc0~56^2~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5fed4668153c9ca6e44ec84a0976089f515705aa?ds=inline;hp=-c

Merge branch 'jc/test-clone' into jc/clone

* jc/test-clone: (35 commits)
Introduce GIT_TEMPLATE_DIR
Revert "fix testsuite: make sure they use templates freshly built from the source"
fix testsuite: make sure they use templates freshly built from the source
rerere: fix breakage of resolving.
Add config example with respect to branch
Add documentation for show-branch --topics
make git a bit less cryptic on fetch errors
make patch_delta() error cases a bit more verbose
racy-git: documentation updates.
show-ref: fix --exclude-existing
parse-remote::expand_refs_wildcard()
vim syntax: follow recent changes to commit template
show-ref: fix --verify --hash=length
show-ref: fix --quiet --verify
avoid accessing _all_ loose refs in git-show-ref --verify
git-fetch: Avoid reading packed refs over and over again
Teach show-branch how to show ref-log data.
markup fix in svnimport documentation.
Documentation: new option -P for git-svnimport
Fix mis-mark-up in git-merge-file.txt documentation
...
---

5fed4668153c9ca6e44ec84a0976089f515705aa
diff --combined git-parse-remote.sh
index f27c3c231b,bc881cc5f9..11c4aba244
--- a/git-parse-remote.sh
+++ b/git-parse-remote.sh
@@@ -111,16 -111,14 +111,14 @@@ expand_refs_wildcard () 
  		local_force=
  		test "z$lref" = "z$ref" || local_force='+'
  		echo "$ls_remote_result" |
+ 		sed -e '/\^{}$/d' |
  		(
  			IFS='	'
  			while read sha1 name
  			do
+ 				# ignore the ones that do not start with $from
  				mapped=${name#"$from"}
- 				if test "z$name" != "z${name%'^{}'}" ||
- 					test "z$name" = "z$mapped"
- 				then
- 					continue
- 				fi
+ 				test "z$name" = "z$mapped" && continue
  				echo "${local_force}${name}:${to}${mapped}"
  			done
  		)
@@@ -144,8 -142,7 +142,8 @@@ canon_refs_list_for_fetch () 
  			curr_branch=$(git-symbolic-ref HEAD | \
  			    sed -e 's|^refs/heads/||')
  			merge_branches=$(git-repo-config \
 -			    --get-all "branch.${curr_branch}.merge")
 +			    --get-all "branch.${curr_branch}.merge") ||
 +			merge_branches=.this.would.never.match.any.ref.
  		fi
  		set x $(expand_refs_wildcard "$@")
  		shift