Skip to content

Commit eb8e7e1

Browse files
johnkeepinggitster
authored andcommitted
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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 0ecd94d commit eb8e7e1

File tree

9 files changed

+2
-37
lines changed

9 files changed

+2
-37
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,6 @@
131131
/git-remote-testsvn
132132
/git-repack
133133
/git-replace
134-
/git-repo-config
135134
/git-request-pull
136135
/git-rerere
137136
/git-reset

Documentation/git-repo-config.txt

Lines changed: 0 additions & 23 deletions
This file was deleted.

Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,6 @@ BUILT_INS += git-get-tar-commit-id$X
591591
BUILT_INS += git-init$X
592592
BUILT_INS += git-merge-subtree$X
593593
BUILT_INS += git-peek-remote$X
594-
BUILT_INS += git-repo-config$X
595594
BUILT_INS += git-show$X
596595
BUILT_INS += git-stage$X
597596
BUILT_INS += git-status$X

builtin.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,6 @@ extern int cmd_remote(int argc, const char **argv, const char *prefix);
103103
extern int cmd_remote_ext(int argc, const char **argv, const char *prefix);
104104
extern int cmd_remote_fd(int argc, const char **argv, const char *prefix);
105105
extern int cmd_repack(int argc, const char **argv, const char *prefix);
106-
extern int cmd_repo_config(int argc, const char **argv, const char *prefix);
107106
extern int cmd_rerere(int argc, const char **argv, const char *prefix);
108107
extern int cmd_reset(int argc, const char **argv, const char *prefix);
109108
extern int cmd_rev_list(int argc, const char **argv, const char *prefix);

builtin/config.c

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -671,9 +671,3 @@ int cmd_config(int argc, const char **argv, const char *prefix)
671671

672672
return 0;
673673
}
674-
675-
int cmd_repo_config(int argc, const char **argv, const char *prefix)
676-
{
677-
fprintf(stderr, "WARNING: git repo-config is deprecated in favor of git config.\n");
678-
return cmd_config(argc, argv, prefix);
679-
}

command-list.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,6 @@ git-relink ancillarymanipulators
102102
git-remote ancillarymanipulators
103103
git-repack ancillarymanipulators
104104
git-replace ancillarymanipulators
105-
git-repo-config ancillarymanipulators deprecated
106105
git-request-pull foreignscminterface
107106
git-rerere ancillaryinterrogators
108107
git-reset mainporcelain common

contrib/completion/git-completion.bash

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -694,7 +694,6 @@ __git_list_porcelain_commands ()
694694
read-tree) : plumbing;;
695695
receive-pack) : plumbing;;
696696
remote-*) : transport;;
697-
repo-config) : deprecated;;
698697
rerere) : plumbing;;
699698
rev-list) : plumbing;;
700699
rev-parse) : plumbing;;

contrib/examples/git-whatchanged.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ case "$0" in
99
*whatchanged)
1010
count=
1111
test -z "$diff_tree_flags" &&
12-
diff_tree_flags=$(git-repo-config --get whatchanged.difftree)
12+
diff_tree_flags=$(git config --get whatchanged.difftree)
1313
diff_tree_default_flags='-c -M --abbrev' ;;
1414
*show)
1515
count=-n1
1616
test -z "$diff_tree_flags" &&
17-
diff_tree_flags=$(git-repo-config --get show.difftree)
17+
diff_tree_flags=$(git config --get show.difftree)
1818
diff_tree_default_flags='--cc --always' ;;
1919
esac
2020
test -z "$diff_tree_flags" &&

git.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,6 @@ static void handle_internal_command(int argc, const char **argv)
421421
{ "remote-fd", cmd_remote_fd },
422422
{ "repack", cmd_repack, RUN_SETUP },
423423
{ "replace", cmd_replace, RUN_SETUP },
424-
{ "repo-config", cmd_repo_config, RUN_SETUP_GENTLY },
425424
{ "rerere", cmd_rerere, RUN_SETUP },
426425
{ "reset", cmd_reset, RUN_SETUP },
427426
{ "rev-list", cmd_rev_list, RUN_SETUP },

0 commit comments

Comments
 (0)