Merge branch 'km/bsd-shells'

diff --git a/builtin/commit.c b/builtin/commit.c
index 8afb0ff5e044719b1d2266231d1d2881e4d93f21..961e467242747dac07aa6f5e619e2d1a50570b06 100644 (file)
--- a/builtin/commit.c
+++ b/builtin/commit.c
@@ -1050,7 +1050,7 @@ static const char *find_author_by_nickname(const char *name)
                clear_mailmap(&mailmap);
                return strbuf_detach(&buf, NULL);
        }
-       die(_("No existing author found with '%s'"), name);
+       die(_("--author '%s' is not 'Name <email>' and matches no existing author"), name);
 }
 
 
@@ -1766,7 +1766,7 @@ int cmd_commit(int argc, const char **argv, const char *prefix)
        if (!transaction ||
            ref_transaction_update(transaction, "HEAD", sha1,
                                   current_head
-                                  ? current_head->object.sha1 : NULL,
+                                  ? current_head->object.sha1 : null_sha1,
                                   0, sb.buf, &err) ||
            ref_transaction_commit(transaction, &err)) {
                rollback_index_files();