push: flag updates that require force

diff --git a/ident.c b/ident.c
index 443c0751bd1f63c059649f9f7f9174349cc1d270..a4bf206e2f88da3a7ee31a04c5c0dda2b1547baa 100644 (file)
--- a/ident.c
+++ b/ident.c
@@ -93,7 +93,7 @@ static void copy_email(const struct passwd *pw, struct strbuf *email)
        add_domainname(email);
 }
 
-const char *ident_default_name(void)
+static const char *ident_default_name(void)
 {
        if (!git_default_name.len) {
                copy_gecos(xgetpwuid_self(), &git_default_name);
@@ -117,7 +117,7 @@ const char *ident_default_email(void)
        return git_default_email.buf;
 }
 
-const char *ident_default_date(void)
+static const char *ident_default_date(void)
 {
        if (!git_default_date[0])
                datestamp(git_default_date, sizeof(git_default_date));
@@ -210,8 +210,10 @@ int split_ident_line(struct ident_split *split, const char *line, int len)
                        split->name_end = cp + 1;
                        break;
                }
-       if (!split->name_end)
-               return status;
+       if (!split->name_end) {
+               /* no human readable name */
+               split->name_end = split->name_begin;
+       }
 
        for (cp = split->mail_begin; cp < line + len; cp++)
                if (*cp == '>') {