Merge branch 'gfi-maint' into maint

[git.git] / builtin-config.c

diff --git a/builtin-config.c b/builtin-config.c
index f1433a4ab6ffaa6fe29fe6be9d97f02a4c4d6e87..b2515f7e65ed05a5352639686b5163f4c74bc1c2 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -2,7 +2,7 @@
 #include "cache.h"
 
 static const char git_config_set_usage[] =
-"git-config [ --global ] [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --list";
+"git-config [ --global | --system ] [ --bool | --int ] [--get | --get-all | --get-regexp | --replace-all | --add | --unset | --unset-all] name [value [value_regex]] | --rename-section old_name new_name | --remove-section name | --list";
 
 static char *key;
 static regex_t *key_regexp;
@@ -168,6 +168,19 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                        }
                        return 0;
                }
+               else if (!strcmp(argv[1], "--remove-section")) {
+                       int ret;
+                       if (argc != 3)
+                               usage(git_config_set_usage);
+                       ret = git_config_rename_section(argv[2], NULL);
+                       if (ret < 0)
+                               return ret;
+                       if (ret == 0) {
+                               fprintf(stderr, "No such section!\n");
+                               return 1;
+                       }
+                       return 0;
+               }
                else
                        break;
                argc--;