read-cache: new API write_locked_index instead of write_index/write_cache

diff --git a/builtin/config.c b/builtin/config.c
index de41ba50e9ca03d5348e407eaba44c2a93447938..5677c942b6936f3332b1b4ed12541f45c4228dfb 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -360,6 +360,9 @@ static int get_colorbool(int print)
 
 static void check_write(void)
 {
+       if (given_config_source.use_stdin)
+               die("writing to stdin is not supported");
+
        if (given_config_source.blob)
                die("writing config blobs is not supported");
 }
@@ -472,6 +475,12 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                usage_with_options(builtin_config_usage, builtin_config_options);
        }
 
+       if (given_config_source.file &&
+                       !strcmp(given_config_source.file, "-")) {
+               given_config_source.file = NULL;
+               given_config_source.use_stdin = 1;
+       }
+
        if (use_global_config) {
                char *user_config = NULL;
                char *xdg_config = NULL;
@@ -558,6 +567,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                check_argc(argc, 0, 0);
                if (!given_config_source.file && nongit)
                        die("not in a git directory");
+               if (given_config_source.use_stdin)
+                       die("editing stdin is not supported");
                if (given_config_source.blob)
                        die("editing blobs is not supported");
                git_config(git_default_config, NULL);