do_one_ref(): null_sha1 check is not about broken ref
f8948e2 (remote prune: warn dangling symrefs, 2009-02-08) introduced a more dangerous variant of for_each_ref() family that skips the check for dangling refs, but it also made another unrelated check optional by mistake. The check to see if a ref points at 0{40} is not about brokenness, but is about a possible future plan to represent a deleted ref by writing 40 "0" in a loose ref when there is a stale version of the same ref already in .git/packed-refs, so that we can implement deletion of a ref without having to rewrite the packed refs file excluding the ref being deleted. This check has to live outside of the conditional. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Jul 22, 2009 at 23:07 UTC
eafb45265bb9fcbee3cc03b451da7e17db9e6be7
1 file changed
+3
-2
refs.c
+3
-2
@@ -531,9 +531,10 @@ static int do_one_ref(const char *base, each_ref_fn fn, int trim,
531
{
532
if (strncmp(base, entry->name, trim))
533
return 0;
534
+ /* Is this a "negative ref" that represents a deleted ref? */
535
+ if (is_null_sha1(entry->sha1))
536
+ return 0;
537
if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) {
535
- if (is_null_sha1(entry->sha1))
536
- return 0;
538
if (!has_sha1_file(entry->sha1)) {
539
error("%s does not point to a valid object!", entry->name);
540
return 0;