config --global --edit: create a template file if needed

When the user has no ~/.gitconfig file, git config --global --edit used
to launch an editor on an nonexistant file name.

Instead, create a file with a default content before launching the
editor. The template contains only commented-out entries, to save a few
keystrokes for the user. If the values are guessed properly, the user
will only have to uncomment the entries.

Advanced users teaching newbies can create a minimalistic configuration
faster for newbies. Beginners reading a tutorial advising to run "git
config --global --edit" as a first step will be slightly more guided for
their first contact with Git.

Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin/config.c b/builtin/config.c
index 5677c942b6936f3332b1b4ed12541f45c4228dfb..9346894240c77a3120530af9e83c0eb12d3edc2f 100644 (file)
--- a/builtin/config.c
+++ b/builtin/config.c
@@ -458,6 +458,20 @@ static int get_urlmatch(const char *var, const char *url)
        return 0;
 }
 
        return 0;
 }
 

+static char *default_user_config(void)
+{
+       struct strbuf buf = STRBUF_INIT;
+       strbuf_addf(&buf,
+                   _("# This is Git's per-user configuration file.\n"
+                     "[core]\n"
+                     "# Please adapt and uncomment the following lines:\n"
+                     "#        user = %s\n"
+                     "#        email = %s\n"),
+                   ident_default_name(),
+                   ident_default_email());
+       return strbuf_detach(&buf, NULL);
+}
+

 int cmd_config(int argc, const char **argv, const char *prefix)
 {
        int nongit = !startup_info->have_repository;
 int cmd_config(int argc, const char **argv, const char *prefix)
 {
        int nongit = !startup_info->have_repository;


@@ -564,6 +578,8 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                }
        }
        else if (actions == ACTION_EDIT) {
                }
        }
        else if (actions == ACTION_EDIT) {

+               const char *config_file = given_config_source.file ?
+                       given_config_source.file : git_path("config");

                check_argc(argc, 0, 0);
                if (!given_config_source.file && nongit)
                        die("not in a git directory");
                check_argc(argc, 0, 0);
                if (!given_config_source.file && nongit)
                        die("not in a git directory");


@@ -572,9 +588,18 @@ int cmd_config(int argc, const char **argv, const char *prefix)
                if (given_config_source.blob)
                        die("editing blobs is not supported");
                git_config(git_default_config, NULL);
                if (given_config_source.blob)
                        die("editing blobs is not supported");
                git_config(git_default_config, NULL);

-               launch_editor(given_config_source.file ?
-                             given_config_source.file : git_path("config"),
-                             NULL, NULL);
+               if (use_global_config) {
+                       int fd = open(config_file, O_CREAT | O_EXCL | O_WRONLY, 0666);
+                       if (fd) {
+                               char *content = default_user_config();
+                               write_str_in_full(fd, content);
+                               free(content);
+                               close(fd);
+                       }
+                       else if (errno != EEXIST)
+                               die_errno(_("cannot create configuration file %s"), config_file);
+               }
+               launch_editor(config_file, NULL, NULL);

        }
        else if (actions == ACTION_SET) {
                int ret;
        }
        else if (actions == ACTION_SET) {
                int ret;

diff --git a/cache.h b/cache.h
index cc46be4e0fb2e8cdc69e48386f8233354a348818..beb00a659c6638c6a76daa0d8d8abc7b62fda76c 100644 (file)
--- a/cache.h
+++ b/cache.h
@@ -1025,6 +1025,7 @@ extern const char *git_author_info(int);
 extern const char *git_committer_info(int);
 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
 extern const char *fmt_name(const char *name, const char *email);
 extern const char *git_committer_info(int);
 extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
 extern const char *fmt_name(const char *name, const char *email);

+extern const char *ident_default_name(void);

 extern const char *ident_default_email(void);
 extern const char *git_editor(void);
 extern const char *git_pager(int stdout_is_tty);
 extern const char *ident_default_email(void);
 extern const char *git_editor(void);
 extern const char *git_pager(int stdout_is_tty);

diff --git a/ident.c b/ident.c
index 1d9b6e770d02d12f77b417e05aca5134eccf1c40..77bc882e59c887e948a1fba4d99805f5dedfa7f7 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -102,7 +102,7 @@ static void copy_email(const struct passwd *pw, struct strbuf *email)
        add_domainname(email);
 }
 
        add_domainname(email);
 }
 

-static const char *ident_default_name(void)
+const char *ident_default_name(void)

 {
        if (!git_default_name.len) {
                copy_gecos(xgetpwuid_self(), &git_default_name);
 {
        if (!git_default_name.len) {
                copy_gecos(xgetpwuid_self(), &git_default_name);