From: Junio C Hamano <junkio@cox.net>
Date: Tue, 5 Dec 2006 00:30:00 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.0-rc0~166
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ba988a83f0cfdafdcfdc7ed44253840ea83578fb;p=git.git

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
---

ba988a83f0cfdafdcfdc7ed44253840ea83578fb
diff --cc receive-pack.c
index 1a141dc1e,f18915117..a20bc924d
--- a/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;