From 28391a80a94d2b59d1d21f8264fe5dab91d77249 Mon Sep 17 00:00:00 2001 From: Johannes Schindelin Date: Thu, 29 Nov 2007 01:02:53 +0000 Subject: receive-pack: allow deletion of corrupt refs Occasionally, in some setups (*cough* forks on repo.or.cz *cough*) some refs go stale, e.g. when the forkee rebased and lost some objects needed by the fork. The quick & dirty way to deal with those refs is to delete them and push them again. However, git-push first would first fetch the current commit name for the ref, would receive a null sha1 since the ref does not point to a valid object, then tell receive-pack that it should delete the ref with this commit name. delete_ref() would be subsequently be called, and check that resolve_ref() (which does _not_ check for validity of the object) returns the same commit name. Which would fail. The proper fix is to avoid corrupting repositories, but in the meantime this is a good fix in any case. Incidentally, some instances of "cd .." in the test cases were fixed, so that subsequent test cases run in t/trash/ irrespective of the outcome of the previous test cases. Signed-off-by: Johannes Schindelin Signed-off-by: Junio C Hamano --- receive-pack.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'receive-pack.c') diff --git a/receive-pack.c b/receive-pack.c index ed44b897f..fba4cf823 100644 --- a/receive-pack.c +++ b/receive-pack.c @@ -200,6 +200,10 @@ static const char *update(struct command *cmd) } if (is_null_sha1(new_sha1)) { + if (!parse_object(old_sha1)) { + warning ("Allowing deletion of corrupt ref."); + old_sha1 = NULL; + } if (delete_ref(name, old_sha1)) { error("failed to delete %s", name); return "failed to delete"; -- cgit v1.2.1