Officially deprecate repo-config.

Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/Documentation/RelNotes-1.5.4.txt b/Documentation/RelNotes-1.5.4.txt
index 7d2a973c795acf3a37a12da97fe6915dcfbe7913..97a9bd9cd23934ec2d00b4160d0447bfffff97f3 100644 (file)
--- a/Documentation/RelNotes-1.5.4.txt
+++ b/Documentation/RelNotes-1.5.4.txt
@@ -46,6 +46,10 @@ Deprecation notices
    and works for all transports; "git peek-remote" will be removed in
    the future.
 
    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
  * 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

diff --git a/Makefile b/Makefile
index 82e9cd626702fe1a1ac983ebbf13969b65017ff1..a566bd9aedaa6aa7fdc26cc94a77e07e4e220973 100644 (file)
--- a/Makefile
+++ b/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 | \
                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" || \
                git-?*--?* ) continue ;; \
                esac ; \
                test -f "Documentation/$$v.txt" || \

diff --git a/command-list.txt b/command-list.txt
index 6c2b1d830de6eea6362be8c2dd5ebf94f708302c..3583a33ee90647d8e6ded02643eb75753760d94f 100644 (file)
--- a/command-list.txt
+++ b/command-list.txt
@@ -91,6 +91,7 @@ git-reflog                              ancillarymanipulators
 git-relink                              ancillarymanipulators
 git-remote                              ancillarymanipulators
 git-repack                              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
 git-request-pull                        foreignscminterface
 git-rerere                              ancillaryinterrogators
 git-reset                               mainporcelain common

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 343364de04d223c2843c651919803b97de616ba2..9b0033d17c3759daca66349d6ceb75bdee47f939 100755 (executable)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -333,7 +333,7 @@ __git_commands ()
                read-tree)        : plumbing;;
                receive-pack)     : plumbing;;
                reflog)           : plumbing;;
                read-tree)        : plumbing;;
                receive-pack)     : plumbing;;
                reflog)           : plumbing;;

-               repo-config)      : plumbing;;
+               repo-config)      : deprecated;;

                rerere)           : plumbing;;
                rev-list)         : plumbing;;
                rev-parse)        : plumbing;;
                rerere)           : plumbing;;
                rev-list)         : plumbing;;
                rev-parse)        : plumbing;;

diff --git a/contrib/examples/git-tag.sh b/contrib/examples/git-tag.sh
index ae7c5316664ce3aa14c567ddd9866499a5714eb7..e9f3a228af472c932f6cec5fa25ae49cd841b239 100755 (executable)
--- a/contrib/examples/git-tag.sh
+++ b/contrib/examples/git-tag.sh
@@ -167,7 +167,7 @@ type=$(git cat-file -t $object) || exit 1
 tagger=$(git-var GIT_COMMITTER_IDENT) || exit 1
 
 test -n "$username" ||
 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
        username=$(expr "z$tagger" : 'z\(.*>\)')
 
 trap 'rm -f "$GIT_DIR"/TAG_TMP* "$GIT_DIR"/TAG_FINALMSG "$GIT_DIR"/TAG_EDITMSG' 0

diff --git a/t/t0020-crlf.sh b/t/t0020-crlf.sh
index 89baebdfa69648c92f0a88c6f227059742b07ae9..8b27aa892b2b56056b21874cb81c1ddd7956a60a 100755 (executable)
--- a/t/t0020-crlf.sh
+++ b/t/t0020-crlf.sh
@@ -19,7 +19,7 @@ remove_cr () {
 
 test_expect_success setup '
 
 
 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 &&
 
        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 &&
 
        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
 
        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 &&
 
        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
 
        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 &&
 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
        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 &&
 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
        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 &&
 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 &&
        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 &&
 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 &&
        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 &&
 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 &&
        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 &&
 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 &&
        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 &&
 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 &&
        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 &&
 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 &&
        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 &&
 
        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
        git read-tree --reset -u HEAD &&
 
        if remove_cr dir/two >/dev/null

diff --git a/t/t4201-shortlog.sh b/t/t4201-shortlog.sh
index 10a5fa9a3a2add68e883436ba22f47cfc36bc970..6d12efb74d8bedede8e476429b2fccd648eb05a3 100755 (executable)
--- a/t/t4201-shortlog.sh
+++ b/t/t4201-shortlog.sh
@@ -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 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
 
 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
 

diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh
index 910c584f242c6b29fc6d398d2433703765abbcc5..a15222ced4d75e70f49df08159cff9dd8d4167a4 100755 (executable)
--- a/t/t9200-git-cvsexportcommit.sh
+++ b/t/t9200-git-cvsexportcommit.sh
@@ -225,7 +225,7 @@ test_expect_success \
       ! git-cvsexportcommit -c $id
       )'
 
       ! git-cvsexportcommit -c $id
       )'
 

-case "$(git repo-config --bool core.filemode)" in
+case "$(git config --bool core.filemode)" in

 false)
        ;;
 *)
 false)
        ;;
 *)

diff --git a/templates/hooks--update b/templates/hooks--update
index bd93dd1977b2a19e0dcded9c31ec37e78b331af6..4b69268fd027874cdc84e08be1a7b0adabe29bd6 100644 (file)
--- a/templates/hooks--update
+++ b/templates/hooks--update
@@ -37,9 +37,9 @@ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
 fi
 
 # --- Config
 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")
 
 # check for no description
 projectdesc=$(sed -e '1q' "$GIT_DIR/description")