diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-05 01:30:00 +0100 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-05 01:30:00 +0100 |
| commit | ba988a83f0cfdafdcfdc7ed44253840ea83578fb (patch) | |
| tree | cee119a3eccf55b60a44fe29974fb108cd527739 /receive-pack.c | |
| parent | git-fetch: ignore dereferenced tags in expand_refs_wildcard (diff) | |
| parent | receive-pack: do not insist on fast-forward outside refs/heads/ (diff) | |
| download | git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.tar.xz git-ba988a83f0cfdafdcfdc7ed44253840ea83578fb.zip | |
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.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/receive-pack.c b/receive-pack.c index 1a141dc1e5..a20bc924d6 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; |