repo-config: remove deprecated alias for "git config"

The release notes for Git 1.5.4 say that "git repo-config" will be
removed in the next feature release.  Since Git 2.0 is nearly here,
remove it.

Signed-off-by: John Keeping <john@keeping.me.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/.gitignore b/.gitignore
index 66199edd4af6ddcd1398bff13fe9065ba4309a22..3bc1b08d9f2d3492a8b9801a21141861814dce5e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -131,7 +131,6 @@
 /git-remote-testsvn
 /git-repack
 /git-replace
 /git-remote-testsvn
 /git-repack
 /git-replace

-/git-repo-config

 /git-request-pull
 /git-rerere
 /git-reset
 /git-request-pull
 /git-rerere
 /git-reset

diff --git a/Documentation/git-repo-config.txt b/Documentation/git-repo-config.txt
deleted file mode 100644 (file)
index 9ec115b..0000000
--- a/Documentation/git-repo-config.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-git-repo-config(1)
-==================
-
-NAME
-----
-git-repo-config - Get and set repository or global options
-
-
-SYNOPSIS
---------
-[verse]
-'git repo-config' ...
-
-
-DESCRIPTION
------------
-
-This is a synonym for linkgit:git-config[1].  Please refer to the
-documentation of that command.
-
-GIT
----
-Part of the linkgit:git[1] suite

diff --git a/Makefile b/Makefile
index af847f84685af41a7da02c3c12fbdc1daa780f1c..4fc2378522329767aa7495a4ed8aa9b44545cd9e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -591,7 +591,6 @@ BUILT_INS += git-get-tar-commit-id$X
 BUILT_INS += git-init$X
 BUILT_INS += git-merge-subtree$X
 BUILT_INS += git-peek-remote$X
 BUILT_INS += git-init$X
 BUILT_INS += git-merge-subtree$X
 BUILT_INS += git-peek-remote$X

-BUILT_INS += git-repo-config$X

 BUILT_INS += git-show$X
 BUILT_INS += git-stage$X
 BUILT_INS += git-status$X
 BUILT_INS += git-show$X
 BUILT_INS += git-stage$X
 BUILT_INS += git-status$X

diff --git a/builtin.h b/builtin.h
index b56cf07abc488909a2a38c0b0a7db988902aba96..d4afbfe4187ad45ac9586c9e6f05541cbe67196b 100644 (file)
--- a/builtin.h
+++ b/builtin.h
@@ -103,7 +103,6 @@ extern int cmd_remote(int argc, const char **argv, const char *prefix);
 extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
 extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
 extern int cmd_repack(int argc, const char **argv, const char *prefix);
 extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
 extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
 extern int cmd_repack(int argc, const char **argv, const char *prefix);

-extern int cmd_repo_config(int argc, const char **argv, const char *prefix);

 extern int cmd_rerere(int argc, const char **argv, const char *prefix);
 extern int cmd_reset(int argc, const char **argv, const char *prefix);
 extern int cmd_rev_list(int argc, const char **argv, const char *prefix);
 extern int cmd_rerere(int argc, const char **argv, const char *prefix);
 extern int cmd_reset(int argc, const char **argv, const char *prefix);
 extern int cmd_rev_list(int argc, const char **argv, const char *prefix);

diff --git a/builtin/config.c b/builtin/config.c
index 20e89fe4e0c7db50267e8e9358c38faea2259fab..92ebf23f0a9aa0e052ad68d60e17d0783f633a1c 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -671,9 +671,3 @@ int cmd_config(int argc, const char **argv, const char *prefix)
 
        return 0;
 }
 
        return 0;
 }

-
-int cmd_repo_config(int argc, const char **argv, const char *prefix)
-{
-       fprintf(stderr, "WARNING: git repo-config is deprecated in favor of git config.\n");
-       return cmd_config(argc, argv, prefix);
-}

diff --git a/command-list.txt b/command-list.txt
index 08b04e2c66429a05f6fc5ac1f5b2aa94160a5c37..f2bf684a45bc47ca1de2d65f17e3f5fc069f4e9c 100644 (file)
--- a/command-list.txt
+++ b/command-list.txt
@@ -102,7 +102,6 @@ git-relink                              ancillarymanipulators
 git-remote                              ancillarymanipulators
 git-repack                              ancillarymanipulators
 git-replace                             ancillarymanipulators
 git-remote                              ancillarymanipulators
 git-repack                              ancillarymanipulators
 git-replace                             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 dba3c15700fae1ae8a7a43fd7a6ad7a5b9cbd5dd..c6063c9bb75950bad7f6b01ec440021d6c9f5d66 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -694,7 +694,6 @@ __git_list_porcelain_commands ()
                read-tree)        : plumbing;;
                receive-pack)     : plumbing;;
                remote-*)         : transport;;
                read-tree)        : plumbing;;
                receive-pack)     : plumbing;;
                remote-*)         : transport;;

-               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-whatchanged.sh b/contrib/examples/git-whatchanged.sh
index 1fb9feb34849f5030d0b9dc7f91ae65e22322786..2edbdc6d998806cbffb880e6d29d5f48b5905145 100755 (executable)
--- a/contrib/examples/git-whatchanged.sh
+++ b/contrib/examples/git-whatchanged.sh
@@ -9,12 +9,12 @@ case "$0" in
 *whatchanged)
        count=
        test -z "$diff_tree_flags" &&
 *whatchanged)
        count=
        test -z "$diff_tree_flags" &&

-               diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
+               diff_tree_flags=$(git config --get whatchanged.difftree)

        diff_tree_default_flags='-c -M --abbrev' ;;
 *show)
        count=-n1
        test -z "$diff_tree_flags" &&
        diff_tree_default_flags='-c -M --abbrev' ;;
 *show)
        count=-n1
        test -z "$diff_tree_flags" &&

-               diff_tree_flags=$(git-repo-config --get show.difftree)
+               diff_tree_flags=$(git config --get show.difftree)

        diff_tree_default_flags='--cc --always' ;;
 esac
 test -z "$diff_tree_flags" &&
        diff_tree_default_flags='--cc --always' ;;
 esac
 test -z "$diff_tree_flags" &&

diff --git a/git.c b/git.c
index cb5208de6a5aab7c222a1d1655fe37089a119fe0..0c9dde27e4bb8e8971ab03aa81b92657e6762aee 100644 (file)
--- a/git.c
+++ b/git.c
@@ -421,7 +421,6 @@ static void handle_internal_command(int argc, const char **argv)
                { "remote-fd", cmd_remote_fd },
                { "repack", cmd_repack, RUN_SETUP },
                { "replace", cmd_replace, RUN_SETUP },
                { "remote-fd", cmd_remote_fd },
                { "repack", cmd_repack, RUN_SETUP },
                { "replace", cmd_replace, RUN_SETUP },

-               { "repo-config", cmd_repo_config, RUN_SETUP_GENTLY },

                { "rerere", cmd_rerere, RUN_SETUP },
                { "reset", cmd_reset, RUN_SETUP },
                { "rev-list", cmd_rev_list, RUN_SETUP },
                { "rerere", cmd_rerere, RUN_SETUP },
                { "reset", cmd_reset, RUN_SETUP },
                { "rev-list", cmd_rev_list, RUN_SETUP },