diff options
| author | Jan Krüger <jk@jk.gs> | 2008-11-01 14:42:16 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-11-02 08:54:28 (GMT) |
| commit | a240de1137bd63a969c6bd56ab5186d7216e28ca (patch) | |
| tree | 6a876638cfc09ee414599b0d4dae46eca7b10105 /builtin-receive-pack.c | |
| parent | aebd173ffa7a4e67447f0157a14abde7767c54e9 (diff) | |
| download | git-a240de1137bd63a969c6bd56ab5186d7216e28ca.zip git-a240de1137bd63a969c6bd56ab5186d7216e28ca.tar.gz git-a240de1137bd63a969c6bd56ab5186d7216e28ca.tar.bz2 | |
Introduce receive.denyDeletes
Occasionally, it may be useful to prevent branches from getting deleted from
a centralized repository, particularly when no administrative access to the
server is available to undo it via reflog. It also makes
receive.denyNonFastForwards more useful if it is used for access control
since it prevents force-updating by deleting and re-creating a ref.
Signed-off-by: Jan Krüger <jk@jk.gs>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin-receive-pack.c')
| -rw-r--r-- | builtin-receive-pack.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/builtin-receive-pack.c b/builtin-receive-pack.c index 9f60f31..2c0225c 100644 --- a/builtin-receive-pack.c +++ b/builtin-receive-pack.c @@ -11,6 +11,7 @@ static const char receive_pack_usage[] = "git-receive-pack <git-dir>"; +static int deny_deletes = 0; static int deny_non_fast_forwards = 0; static int receive_fsck_objects; static int receive_unpack_limit = -1; @@ -23,6 +24,11 @@ static int capabilities_sent; static int receive_pack_config(const char *var, const char *value, void *cb) { + if (strcmp(var, "receive.denydeletes") == 0) { + deny_deletes = git_config_bool(var, value); + return 0; + } + if (strcmp(var, "receive.denynonfastforwards") == 0) { deny_non_fast_forwards = git_config_bool(var, value); return 0; @@ -185,6 +191,12 @@ static const char *update(struct command *cmd) "but I can't find it!", sha1_to_hex(new_sha1)); return "bad pack"; } + if (deny_deletes && is_null_sha1(new_sha1) && + !is_null_sha1(old_sha1) && + !prefixcmp(name, "refs/heads/")) { + error("denying ref deletion for %s", name); + return "deletion prohibited"; + } if (deny_non_fast_forwards && !is_null_sha1(new_sha1) && !is_null_sha1(old_sha1) && !prefixcmp(name, "refs/heads/")) { |