Skip to content

Commit 5c66d0d

Browse files
gitstergitster
committed
Officially deprecate repo-config.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c9ced05 commit 5c66d0d

File tree

9 files changed

+25
-20
lines changed

9 files changed

+25
-20
lines changed

‎Documentation/RelNotes-1.5.4.txt‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,10 @@ Deprecation notices
4646
and works for all transports; "git peek-remote" will be removed in
4747
the future.
4848

49+
* "git repo-config" which was an old name for "git config" command
50+
has been supported without being advertised for a long time. The
51+
next feature release will remove it.
52+
4953
* From v1.6.0, the repack.usedeltabaseoffset config option will default
5054
to true, which will give denser packfiles (i.e. more efficient storage).
5155
The downside is that git older than version 1.4.4 will not be able

‎Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1145,7 +1145,7 @@ check-docs::
11451145
case "$$v" in \
11461146
git-merge-octopus | git-merge-ours | git-merge-recursive | \
11471147
git-merge-resolve | git-merge-stupid | git-merge-subtree | \
1148-
git-fsck-objects | git-init-db | git-repo-config | \
1148+
git-fsck-objects | git-init-db | \
11491149
git-?*--?* ) continue ;; \
11501150
esac ; \
11511151
test -f "Documentation/$$v.txt" || \

‎command-list.txt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,7 @@ git-reflog ancillarymanipulators
9191
git-relink ancillarymanipulators
9292
git-remote ancillarymanipulators
9393
git-repack ancillarymanipulators
94+
git-repo-config ancillarymanipulators deprecated
9495
git-request-pull foreignscminterface
9596
git-rerere ancillaryinterrogators
9697
git-reset mainporcelain common

‎contrib/completion/git-completion.bash‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ __git_commands ()
333333
read-tree) : plumbing;;
334334
receive-pack) : plumbing;;
335335
reflog) : plumbing;;
336-
repo-config) : plumbing;;
336+
repo-config) : deprecated;;
337337
rerere) : plumbing;;
338338
rev-list) : plumbing;;
339339
rev-parse) : plumbing;;

‎contrib/examples/git-tag.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ type=$(git cat-file -t $object) || exit 1
167167
tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
168168

169169
test -n "$username" ||
170-
username=$(git repo-config user.signingkey) ||
170+
username=$(git config user.signingkey) ||
171171
username=$(expr "z$tagger" : 'z\(.*>\)')
172172

173173
trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0

‎t/t0020-crlf.sh‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ remove_cr () {
1919

2020
test_expect_success setup '
2121
22-
git repo-config core.autocrlf false &&
22+
git config core.autocrlf false &&
2323
2424
for w in Hello world how are you; do echo $w; done >one &&
2525
mkdir dir &&
@@ -46,7 +46,7 @@ test_expect_success 'update with autocrlf=input' '
4646
4747
rm -f tmp one dir/two three &&
4848
git read-tree --reset -u HEAD &&
49-
git repo-config core.autocrlf input &&
49+
git config core.autocrlf input &&
5050
5151
for f in one dir/two
5252
do
@@ -70,7 +70,7 @@ test_expect_success 'update with autocrlf=true' '
7070
7171
rm -f tmp one dir/two three &&
7272
git read-tree --reset -u HEAD &&
73-
git repo-config core.autocrlf true &&
73+
git config core.autocrlf true &&
7474
7575
for f in one dir/two
7676
do
@@ -93,7 +93,7 @@ test_expect_success 'update with autocrlf=true' '
9393
test_expect_success 'checkout with autocrlf=true' '
9494
9595
rm -f tmp one dir/two three &&
96-
git repo-config core.autocrlf true &&
96+
git config core.autocrlf true &&
9797
git read-tree --reset -u HEAD &&
9898
9999
for f in one dir/two
@@ -117,7 +117,7 @@ test_expect_success 'checkout with autocrlf=true' '
117117
test_expect_success 'checkout with autocrlf=input' '
118118
119119
rm -f tmp one dir/two three &&
120-
git repo-config core.autocrlf input &&
120+
git config core.autocrlf input &&
121121
git read-tree --reset -u HEAD &&
122122
123123
for f in one dir/two
@@ -143,7 +143,7 @@ test_expect_success 'checkout with autocrlf=input' '
143143
test_expect_success 'apply patch (autocrlf=input)' '
144144
145145
rm -f tmp one dir/two three &&
146-
git repo-config core.autocrlf input &&
146+
git config core.autocrlf input &&
147147
git read-tree --reset -u HEAD &&
148148
149149
git apply patch.file &&
@@ -156,7 +156,7 @@ test_expect_success 'apply patch (autocrlf=input)' '
156156
test_expect_success 'apply patch --cached (autocrlf=input)' '
157157
158158
rm -f tmp one dir/two three &&
159-
git repo-config core.autocrlf input &&
159+
git config core.autocrlf input &&
160160
git read-tree --reset -u HEAD &&
161161
162162
git apply --cached patch.file &&
@@ -169,7 +169,7 @@ test_expect_success 'apply patch --cached (autocrlf=input)' '
169169
test_expect_success 'apply patch --index (autocrlf=input)' '
170170
171171
rm -f tmp one dir/two three &&
172-
git repo-config core.autocrlf input &&
172+
git config core.autocrlf input &&
173173
git read-tree --reset -u HEAD &&
174174
175175
git apply --index patch.file &&
@@ -183,7 +183,7 @@ test_expect_success 'apply patch --index (autocrlf=input)' '
183183
test_expect_success 'apply patch (autocrlf=true)' '
184184
185185
rm -f tmp one dir/two three &&
186-
git repo-config core.autocrlf true &&
186+
git config core.autocrlf true &&
187187
git read-tree --reset -u HEAD &&
188188
189189
git apply patch.file &&
@@ -196,7 +196,7 @@ test_expect_success 'apply patch (autocrlf=true)' '
196196
test_expect_success 'apply patch --cached (autocrlf=true)' '
197197
198198
rm -f tmp one dir/two three &&
199-
git repo-config core.autocrlf true &&
199+
git config core.autocrlf true &&
200200
git read-tree --reset -u HEAD &&
201201
202202
git apply --cached patch.file &&
@@ -209,7 +209,7 @@ test_expect_success 'apply patch --cached (autocrlf=true)' '
209209
test_expect_success 'apply patch --index (autocrlf=true)' '
210210
211211
rm -f tmp one dir/two three &&
212-
git repo-config core.autocrlf true &&
212+
git config core.autocrlf true &&
213213
git read-tree --reset -u HEAD &&
214214
215215
git apply --index patch.file &&
@@ -224,7 +224,7 @@ test_expect_success '.gitattributes says two is binary' '
224224
225225
rm -f tmp one dir/two three &&
226226
echo "two -crlf" >.gitattributes &&
227-
git repo-config core.autocrlf true &&
227+
git config core.autocrlf true &&
228228
git read-tree --reset -u HEAD &&
229229
230230
if remove_cr dir/two >/dev/null

‎t/t4201-shortlog.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ echo 3 > a1
2222
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
2323

2424
# now fsck up the utf8
25-
git repo-config i18n.commitencoding non-utf-8
25+
git config i18n.commitencoding non-utf-8
2626
echo 4 > a1
2727
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
2828

‎t/t9200-git-cvsexportcommit.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ test_expect_success \
225225
! git-cvsexportcommit -c $id
226226
)'
227227

228-
case "$(git repo-config --bool core.filemode)" in
228+
case "$(git config --bool core.filemode)" in
229229
false)
230230
;;
231231
*)

‎templates/hooks--update‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
3737
fi
3838

3939
# --- Config
40-
allowunannotated=$(git-repo-config --bool hooks.allowunannotated)
41-
allowdeletebranch=$(git-repo-config --bool hooks.allowdeletebranch)
42-
allowdeletetag=$(git-repo-config --bool hooks.allowdeletetag)
40+
allowunannotated=$(git config --bool hooks.allowunannotated)
41+
allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
42+
allowdeletetag=$(git config --bool hooks.allowdeletetag)
4343

4444
# check for no description
4545
projectdesc=$(sed -e '1q' "$GIT_DIR/description")

0 commit comments

Comments
 (0)