summaryrefslogtreecommitdiff
path: root/receive-pack.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-12-05 00:30:00 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-12-05 00:30:00 (GMT)
commitba988a83f0cfdafdcfdc7ed44253840ea83578fb (patch)
treecee119a3eccf55b60a44fe29974fb108cd527739 /receive-pack.c
parent4cd75359ad5d4c90ba6ae6d68ffb6d00e5092b8a (diff)
parent562cefbdbfaeb92f91c961c67960a93a7772220c (diff)
downloadgit-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.zip
git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.gz
git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.bz2
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
Diffstat (limited to 'receive-pack.c')
-rw-r--r--receive-pack.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/receive-pack.c b/receive-pack.c
index 1a141dc..a20bc92 100644
--- a/receive-pack.c
+++ b/receive-pack.c
@@ -120,7 +120,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;