Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
receive-pack: do not insist on fast-forward outside refs/heads/
author
Junio C Hamano
<junkio@cox.net>
Mon, 4 Dec 2006 22:24:12 +0000
(14:24 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Mon, 4 Dec 2006 22:24:12 +0000
(14:24 -0800)
Especially refs/tags/ hierarchy should match what git-fetch
checks.
Signed-off-by: Junio C Hamano <junkio@cox.net>
receive-pack.c
patch
|
blob
|
history
raw
|
patch
| inline |
side by side
(parent:
aca085e
)
diff --git
a/receive-pack.c
b/receive-pack.c
index d56898c9b29d3e5ea01fd5a211790141d0beac21..f18915117e994a9b228f07edc0d45442acd6902c 100644
(file)
--- a/
receive-pack.c
+++ b/
receive-pack.c
@@
-118,7
+118,8
@@
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(old_sha1) &&
+ !strncmp(name, "refs/heads/", 11)) {
struct commit *old_commit, *new_commit;
struct commit_list *bases, *ent;