Move better_branch_name above get_ref in merge-recursive.

diff --git a/receive-pack.c b/receive-pack.c
index e76d9aea31886ec9b0d287f02a12af9793fb44db..59b682c03af53fbfe600d063fa832f874440493c 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -6,7 +6,6 @@
 #include "exec_cmd.h"
 #include "commit.h"
 #include "object.h"
-#include <sys/wait.h>
 
 static const char receive_pack_usage[] = "git-receive-pack <git-dir>";
 
@@ -420,6 +419,8 @@ int main(int argc, char **argv)
                die("'%s': unable to chdir or not a git archive", dir);
 
        setup_ident();
+       /* don't die if gecos is empty */
+       ignore_missing_committer_name();
        git_config(receive_pack_config);
 
        write_head_info();