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 --combined receive-pack.c
index 1a141dc1e55aef221312b4cde590fac865546c43,f18915117e994a9b228f07edc0d45442acd6902c..a20bc924d6b261138002f2e95b127e0ffd226411
--- 1/receive-pack.c
--- 2/receive-pack.c
+++ b/receive-pack.c
@@@ -14,7 -14,7 +14,7 @@@ static int deny_non_fast_forwards = 0
  static int unpack_limit = 5000;
  static int report_status;
  
 -static char capabilities[] = "report-status";
 +static char capabilities[] = " report-status delete-refs ";
  static int capabilities_sent;
  
  static int receive_pack_config(const char *var, const char *value)
@@@ -113,14 -113,13 +113,15 @@@ static int update(struct command *cmd
  
        strcpy(new_hex, sha1_to_hex(new_sha1));
        strcpy(old_hex, sha1_to_hex(old_sha1));
 -      if (!has_sha1_file(new_sha1)) {
 +
 +      if (!is_null_sha1(new_sha1) && !has_sha1_file(new_sha1)) {
                cmd->error_string = "bad pack";
                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;
  
@@@ -140,22 -139,14 +141,22 @@@
                return error("hook declined to update %s", name);
        }
  
 -      lock = lock_any_ref_for_update(name, old_sha1);
 -      if (!lock) {
 -              cmd->error_string = "failed to lock";
 -              return error("failed to lock %s", name);
 +      if (is_null_sha1(new_sha1)) {
 +              if (delete_ref(name, old_sha1)) {
 +                      cmd->error_string = "failed to delete";
 +                      return error("failed to delete %s", name);
 +              }
 +              fprintf(stderr, "%s: %s -> deleted\n", name, old_hex);
 +      }
 +      else {
 +              lock = lock_any_ref_for_update(name, old_sha1);
 +              if (!lock) {
 +                      cmd->error_string = "failed to lock";
 +                      return error("failed to lock %s", name);
 +              }
 +              write_ref_sha1(lock, new_sha1, "push");
 +              fprintf(stderr, "%s: %s -> %s\n", name, old_hex, new_hex);
        }
 -      write_ref_sha1(lock, new_sha1, "push");
 -
 -      fprintf(stderr, "%s: %s -> %s\n", name, old_hex, new_hex);
        return 0;
  }
  
@@@ -385,16 -376,6 +386,16 @@@ static void report(const char *unpack_s
        packet_flush(1);
  }
  
 +static int delete_only(struct command *cmd)
 +{
 +      while (cmd) {
 +              if (!is_null_sha1(cmd->new_sha1))
 +                      return 0;
 +              cmd = cmd->next;
 +      }
 +      return 1;
 +}
 +
  int main(int argc, char **argv)
  {
        int i;
@@@ -428,10 -409,7 +429,10 @@@
  
        read_head_info();
        if (commands) {
 -              const char *unpack_status = unpack();
 +              const char *unpack_status = NULL;
 +
 +              if (!delete_only(commands))
 +                      unpack_status = unpack();
                if (!unpack_status)
                        execute_commands();
                if (pack_lockfile)