Merge branch 'jc/maint-refs-dangling' into maint

gitster · gitster · commit 970957dbad93 · 2010-03-31T15:09:32.000-07:00
* jc/maint-refs-dangling:
  refs: ref entry with NULL sha1 is can be a dangling symref
diff --git a/refs.c b/refs.c
@@ -6,6 +6,7 @@
 
 /* ISSYMREF=01 and ISPACKED=02 are public interfaces */
 #define REF_KNOWS_PEELED 04
+#define REF_BROKEN 010
 
 struct ref_list {
 	struct ref_list *next;
@@ -275,8 +276,10 @@ static struct ref_list *get_ref_dir(const char *base, struct ref_list *list)
 				list = get_ref_dir(ref, list);
 				continue;
 			}
-			if (!resolve_ref(ref, sha1, 1, &flag))
+			if (!resolve_ref(ref, sha1, 1, &flag)) {
 				hashclr(sha1);
+				flag |= REF_BROKEN;
+			}
 			list = add_ref(ref, sha1, flag, list, NULL);
 		}
 		free(ref);
@@ -539,10 +542,10 @@ static int do_one_ref(const char *base, each_ref_fn fn, int trim,
 {
 	if (strncmp(base, entry->name, trim))
 		return 0;
-	/* Is this a "negative ref" that represents a deleted ref? */
-	if (is_null_sha1(entry->sha1))
-		return 0;
+
 	if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) {
+		if (entry->flag & REF_BROKEN)
+			return 0; /* ignore dangling symref */
 		if (!has_sha1_file(entry->sha1)) {
 			error("%s does not point to a valid object!", entry->name);
 			return 0;
diff --git a/t/t5505-remote.sh b/t/t5505-remote.sh
@@ -507,15 +507,15 @@ test_expect_success 'remote prune to cause a dangling symref' '
 	(
 		cd seven &&
 		git remote prune origin
-	) 2>err &&
+	) >err 2>&1 &&
 	grep "has become dangling" err &&
 
-	: And the dangling symref will not cause other annoying errors
+	: And the dangling symref will not cause other annoying errors &&
 	(
 		cd seven &&
 		git branch -a
 	) 2>err &&
-	! grep "points nowhere" err
+	! grep "points nowhere" err &&
 	(
 		cd seven &&
 		test_must_fail git branch nomore origin

Original file line number	Diff line number	Diff line change
`@@ -507,15 +507,15 @@ test_expect_success 'remote prune to cause a dangling symref' '`
`507`	`507`	`(`
`508`	`508`	`cd seven &&`
`509`	`509`	`git remote prune origin`
`510`		`- ) 2>err &&`
	`510`	`+ ) >err 2>&1 &&`
`511`	`511`	`grep "has become dangling" err &&`
`512`	`512`
`513`		`- : And the dangling symref will not cause other annoying errors`
	`513`	`+ : And the dangling symref will not cause other annoying errors &&`
`514`	`514`	`(`
`515`	`515`	`cd seven &&`
`516`	`516`	`git branch -a`
`517`	`517`	`) 2>err &&`
`518`		`- ! grep "points nowhere" err`
	`518`	`+ ! grep "points nowhere" err &&`
`519`	`519`	`(`
`520`	`520`	`cd seven &&`
`521`	`521`	`test_must_fail git branch nomore origin`