Officially deprecate repo-config.
Signed-off-by: Junio C Hamano <gitster@pobox.com>maint
							parent
							
								
									c9ced051c3
								
							
						
					
					
						commit
						5c66d0d458
					
				|  | @ -46,6 +46,10 @@ Deprecation notices | |||
|    and works for all transports; "git peek-remote" will be removed in | ||||
|    the future. | ||||
|  | ||||
|  * "git repo-config" which was an old name for "git config" command | ||||
|    has been supported without being advertised for a long time.  The | ||||
|    next feature release will remove it. | ||||
|  | ||||
|  * From v1.6.0, the repack.usedeltabaseoffset config option will default | ||||
|    to true, which will give denser packfiles (i.e. more efficient storage). | ||||
|    The downside is that git older than version 1.4.4 will not be able | ||||
|  |  | |||
							
								
								
									
										2
									
								
								Makefile
								
								
								
								
							
							
						
						
									
										2
									
								
								Makefile
								
								
								
								
							|  | @ -1145,7 +1145,7 @@ check-docs:: | |||
| 		case "$$v" in \ | ||||
| 		git-merge-octopus | git-merge-ours | git-merge-recursive | \ | ||||
| 		git-merge-resolve | git-merge-stupid | git-merge-subtree | \ | ||||
| 		git-fsck-objects | git-init-db | git-repo-config | \ | ||||
| 		git-fsck-objects | git-init-db | \ | ||||
| 		git-?*--?* ) continue ;; \ | ||||
| 		esac ; \ | ||||
| 		test -f "Documentation/$$v.txt" || \ | ||||
|  |  | |||
|  | @ -91,6 +91,7 @@ git-reflog                              ancillarymanipulators | |||
| git-relink                              ancillarymanipulators | ||||
| git-remote                              ancillarymanipulators | ||||
| git-repack                              ancillarymanipulators | ||||
| git-repo-config                         ancillarymanipulators	deprecated | ||||
| git-request-pull                        foreignscminterface | ||||
| git-rerere                              ancillaryinterrogators | ||||
| git-reset                               mainporcelain common | ||||
|  |  | |||
|  | @ -333,7 +333,7 @@ __git_commands () | |||
| 		read-tree)        : plumbing;; | ||||
| 		receive-pack)     : plumbing;; | ||||
| 		reflog)           : plumbing;; | ||||
| 		repo-config)      : plumbing;; | ||||
| 		repo-config)      : deprecated;; | ||||
| 		rerere)           : plumbing;; | ||||
| 		rev-list)         : plumbing;; | ||||
| 		rev-parse)        : plumbing;; | ||||
|  |  | |||
|  | @ -167,7 +167,7 @@ type=$(git cat-file -t $object) || exit 1 | |||
| tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1 | ||||
|  | ||||
| test -n "$username" || | ||||
| 	username=$(git repo-config user.signingkey) || | ||||
| 	username=$(git config user.signingkey) || | ||||
| 	username=$(expr "z$tagger" : 'z\(.*>\)') | ||||
|  | ||||
| trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0 | ||||
|  |  | |||
|  | @ -19,7 +19,7 @@ remove_cr () { | |||
|  | ||||
| test_expect_success setup ' | ||||
|  | ||||
| 	git repo-config core.autocrlf false && | ||||
| 	git config core.autocrlf false && | ||||
|  | ||||
| 	for w in Hello world how are you; do echo $w; done >one && | ||||
| 	mkdir dir && | ||||
|  | @ -46,7 +46,7 @@ test_expect_success 'update with autocrlf=input' ' | |||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git read-tree --reset -u HEAD && | ||||
| 	git repo-config core.autocrlf input && | ||||
| 	git config core.autocrlf input && | ||||
|  | ||||
| 	for f in one dir/two | ||||
| 	do | ||||
|  | @ -70,7 +70,7 @@ test_expect_success 'update with autocrlf=true' ' | |||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git read-tree --reset -u HEAD && | ||||
| 	git repo-config core.autocrlf true && | ||||
| 	git config core.autocrlf true && | ||||
|  | ||||
| 	for f in one dir/two | ||||
| 	do | ||||
|  | @ -93,7 +93,7 @@ test_expect_success 'update with autocrlf=true' ' | |||
| test_expect_success 'checkout with autocrlf=true' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf true && | ||||
| 	git config core.autocrlf true && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	for f in one dir/two | ||||
|  | @ -117,7 +117,7 @@ test_expect_success 'checkout with autocrlf=true' ' | |||
| test_expect_success 'checkout with autocrlf=input' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf input && | ||||
| 	git config core.autocrlf input && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	for f in one dir/two | ||||
|  | @ -143,7 +143,7 @@ test_expect_success 'checkout with autocrlf=input' ' | |||
| test_expect_success 'apply patch (autocrlf=input)' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf input && | ||||
| 	git config core.autocrlf input && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	git apply patch.file && | ||||
|  | @ -156,7 +156,7 @@ test_expect_success 'apply patch (autocrlf=input)' ' | |||
| test_expect_success 'apply patch --cached (autocrlf=input)' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf input && | ||||
| 	git config core.autocrlf input && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	git apply --cached patch.file && | ||||
|  | @ -169,7 +169,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' ' | |||
| test_expect_success 'apply patch --index (autocrlf=input)' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf input && | ||||
| 	git config core.autocrlf input && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	git apply --index patch.file && | ||||
|  | @ -183,7 +183,7 @@ test_expect_success 'apply patch --index (autocrlf=input)' ' | |||
| test_expect_success 'apply patch (autocrlf=true)' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf true && | ||||
| 	git config core.autocrlf true && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	git apply patch.file && | ||||
|  | @ -196,7 +196,7 @@ test_expect_success 'apply patch (autocrlf=true)' ' | |||
| test_expect_success 'apply patch --cached (autocrlf=true)' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf true && | ||||
| 	git config core.autocrlf true && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	git apply --cached patch.file && | ||||
|  | @ -209,7 +209,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' ' | |||
| test_expect_success 'apply patch --index (autocrlf=true)' ' | ||||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	git repo-config core.autocrlf true && | ||||
| 	git config core.autocrlf true && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	git apply --index patch.file && | ||||
|  | @ -224,7 +224,7 @@ test_expect_success '.gitattributes says two is binary' ' | |||
|  | ||||
| 	rm -f tmp one dir/two three && | ||||
| 	echo "two -crlf" >.gitattributes && | ||||
| 	git repo-config core.autocrlf true && | ||||
| 	git config core.autocrlf true && | ||||
| 	git read-tree --reset -u HEAD && | ||||
|  | ||||
| 	if remove_cr dir/two >/dev/null | ||||
|  |  | |||
|  | @ -22,7 +22,7 @@ echo 3 > a1 | |||
| git commit --quiet -m "$(echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" | sed "s/i/1234/g" | tr 1234 '\360\235\204\236')" a1 | ||||
|  | ||||
| # now fsck up the utf8 | ||||
| git repo-config i18n.commitencoding non-utf-8 | ||||
| git config i18n.commitencoding non-utf-8 | ||||
| echo 4 > a1 | ||||
| git commit --quiet -m "$(echo "This is a very, very long first line for the commit message to see if it is wrapped correctly" | sed "s/i/1234/g" | tr 1234 '\370\235\204\236')" a1 | ||||
|  | ||||
|  |  | |||
|  | @ -225,7 +225,7 @@ test_expect_success \ | |||
|       ! git-cvsexportcommit -c $id | ||||
|       )' | ||||
|  | ||||
| case "$(git repo-config --bool core.filemode)" in | ||||
| case "$(git config --bool core.filemode)" in | ||||
| false) | ||||
| 	;; | ||||
| *) | ||||
|  |  | |||
|  | @ -37,9 +37,9 @@ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then | |||
| fi | ||||
|  | ||||
| # --- Config | ||||
| allowunannotated=$(git-repo-config --bool hooks.allowunannotated) | ||||
| allowdeletebranch=$(git-repo-config --bool hooks.allowdeletebranch) | ||||
| allowdeletetag=$(git-repo-config --bool hooks.allowdeletetag) | ||||
| allowunannotated=$(git config --bool hooks.allowunannotated) | ||||
| allowdeletebranch=$(git config --bool hooks.allowdeletebranch) | ||||
| allowdeletetag=$(git config --bool hooks.allowdeletetag) | ||||
|  | ||||
| # check for no description | ||||
| projectdesc=$(sed -e '1q' "$GIT_DIR/description") | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	 Junio C Hamano
						Junio C Hamano