Merge branch 'maint'

* maint:
  receive-pack: do not insist on fast-forward outside refs/heads/
  git-mv: search more precisely for source directory in index

Conflicts:

	receive-pack.c

diff --cc receive-pack.c
index 1a141dc1e55aef221312b4cde590fac865546c43,f18915117e994a9b228f07edc0d45442acd6902c..a20bc924d6b261138002f2e95b127e0ffd226411
--- 1/receive-pack.c
--- 2/receive-pack.c
+++ b/receive-pack.c
@@@ -119,8 -118,8 +119,9 @@@ static int update(struct command *cmd
                return error("unpack should have generated %s, "
                             "but I can't find it!", new_hex);
        }
 -      if (deny_non_fast_forwards && !is_null_sha1(old_sha1) &&
 +      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;