git-clone --reference: saner handling of borrowed symrefs.

diff --git a/ident.c b/ident.c
index 1bfbc6ff350baf61c15debf5bba45c0669ec107d..a6fc7b5e11e3f232a7becd62223cc23c5eb68ccc 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -7,9 +7,6 @@
  */
 #include "cache.h"
 
-#include <pwd.h>
-#include <time.h>
-
 static char git_default_date[50];
 
 static void copy_gecos(struct passwd *w, char *name, int sz)
@@ -46,32 +43,56 @@ static void copy_gecos(struct passwd *w, char *name, int sz)
 
 }
 
-int setup_ident(void)
+static void copy_email(struct passwd *pw)
 {
-       int len;
-       struct passwd *pw = getpwuid(getuid());
-
-       if (!pw)
-               die("You don't exist. Go away!");
-
-       /* Get the name ("gecos") */
-       copy_gecos(pw, git_default_name, sizeof(git_default_name));
-
-       /* Make up a fake email address (name + '@' + hostname [+ '.' + domainname]) */
-       len = strlen(pw->pw_name);
+       /*
+        * Make up a fake email address
+        * (name + '@' + hostname [+ '.' + domainname])
+        */
+       int len = strlen(pw->pw_name);
        if (len > sizeof(git_default_email)/2)
                die("Your sysadmin must hate you!");
        memcpy(git_default_email, pw->pw_name, len);
        git_default_email[len++] = '@';
        gethostname(git_default_email + len, sizeof(git_default_email) - len);
        if (!strchr(git_default_email+len, '.')) {
+               struct hostent *he = gethostbyname(git_default_email + len);
+               char *domainname;
+
                len = strlen(git_default_email);
                git_default_email[len++] = '.';
-               getdomainname(git_default_email+len, sizeof(git_default_email)-len);
+               if (he && (domainname = strchr(he->h_name, '.')))
+                       strlcpy(git_default_email + len, domainname + 1,
+                               sizeof(git_default_email) - len);
+               else
+                       strlcpy(git_default_email + len, "(none)",
+                               sizeof(git_default_email) - len);
        }
+}
+
+static void setup_ident(void)
+{
+       struct passwd *pw = NULL;
+
+       /* Get the name ("gecos") */
+       if (!git_default_name[0]) {
+               pw = getpwuid(getuid());
+               if (!pw)
+                       die("You don't exist. Go away!");
+               copy_gecos(pw, git_default_name, sizeof(git_default_name));
+       }
+
+       if (!git_default_email[0]) {
+               if (!pw)
+                       pw = getpwuid(getuid());
+               if (!pw)
+                       die("You don't exist. Go away!");
+               copy_email(pw);
+       }
+
        /* And set the default date */
-       datestamp(git_default_date, sizeof(git_default_date));
-       return 0;
+       if (!git_default_date[0])
+               datestamp(git_default_date, sizeof(git_default_date));
 }
 
 static int add_raw(char *buf, int size, int offset, const char *str)
@@ -133,7 +154,7 @@ static int copy(char *buf, int size, int offset, const char *src)
 
        /*
         * Copy the rest to the buffer, but avoid the special
-        * characters '\n' '<' and '>' that act as delimeters on
+        * characters '\n' '<' and '>' that act as delimiters on
         * a identification line
         */
        for (i = 0; i < len; i++) {
@@ -149,16 +170,52 @@ static int copy(char *buf, int size, int offset, const char *src)
        return offset;
 }
 
-char *get_ident(const char *name, const char *email, const char *date_str)
+static const char au_env[] = "GIT_AUTHOR_NAME";
+static const char co_env[] = "GIT_COMMITTER_NAME";
+static const char *env_hint =
+"\n"
+"*** Your name cannot be determined from your system services (gecos).\n"
+"\n"
+"Run\n"
+"\n"
+"  git config user.email \"you@email.com\"\n"
+"  git config user.name \"Your Name\"\n"
+"\n"
+"To set the identity in this repository.\n"
+"Add --global to set your account\'s default\n"
+"\n";
+
+static const char *get_ident(const char *name, const char *email,
+                            const char *date_str, int error_on_no_name)
 {
        static char buffer[1000];
        char date[50];
        int i;
 
+       setup_ident();
        if (!name)
                name = git_default_name;
        if (!email)
                email = git_default_email;
+
+       if (!*name) {
+               struct passwd *pw;
+
+               if (0 <= error_on_no_name &&
+                   name == git_default_name && env_hint) {
+                       fprintf(stderr, env_hint, au_env, co_env);
+                       env_hint = NULL; /* warn only once, for "git-var -l" */
+               }
+               if (0 < error_on_no_name)
+                       die("empty ident %s <%s> not allowed", name, email);
+               pw = getpwuid(getuid());
+               if (!pw)
+                       die("You don't exist. Go away!");
+               strlcpy(git_default_name, pw->pw_name,
+                       sizeof(git_default_name));
+               name = git_default_name;
+       }
+
        strcpy(date, git_default_date);
        if (date_str)
                parse_date(date_str, date, sizeof(date));
@@ -174,12 +231,18 @@ char *get_ident(const char *name, const char *email, const char *date_str)
        return buffer;
 }
 
-char *git_author_info(void)
+const char *git_author_info(int error_on_no_name)
 {
-       return get_ident(getenv("GIT_AUTHOR_NAME"), getenv("GIT_AUTHOR_EMAIL"), getenv("GIT_AUTHOR_DATE"));
+       return get_ident(getenv("GIT_AUTHOR_NAME"),
+                        getenv("GIT_AUTHOR_EMAIL"),
+                        getenv("GIT_AUTHOR_DATE"),
+                        error_on_no_name);
 }
 
-char *git_committer_info(void)
+const char *git_committer_info(int error_on_no_name)
 {
-       return get_ident(getenv("GIT_COMMITTER_NAME"), getenv("GIT_COMMITTER_EMAIL"), getenv("GIT_COMMITTER_DATE"));
+       return get_ident(getenv("GIT_COMMITTER_NAME"),
+                        getenv("GIT_COMMITTER_EMAIL"),
+                        getenv("GIT_COMMITTER_DATE"),
+                        error_on_no_name);
 }