Move better_branch_name above get_ref in merge-recursive.

diff --git a/receive-pack.c b/receive-pack.c
index 1a141dc1e55aef221312b4cde590fac865546c43..59b682c03af53fbfe600d063fa832f874440493c 100644 (file)
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -6,12 +6,11 @@
 #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>";
 
 static int deny_non_fast_forwards = 0;
-static int unpack_limit = 5000;
+static int unpack_limit = 100;
 static int report_status;
 
 static char capabilities[] = " report-status delete-refs ";
@@ -120,7 +119,8 @@ static int update(struct command *cmd)
                             "but I can't find it!", new_hex);
        }
        if (deny_non_fast_forwards && !is_null_sha1(new_sha1) &&
-           !is_null_sha1(old_sha1)) {
+           !is_null_sha1(old_sha1) &&
+           !strncmp(name, "refs/heads/", 11)) {
                struct commit *old_commit, *new_commit;
                struct commit_list *bases, *ent;
 
@@ -419,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();