@matheusbsbs / matheus-bagliano / commits / e01de1c912

Fork 0

refs: ref entry with NULL sha1 is can be a dangling symref

Brandon Casey noticed that t5505 had accidentally broken its && chain, hiding inconsistency between the code that writes the warning to the standard output and the test that expects to see the warning on the standard error, which was introduced by f8948e2 (remote prune: warn dangling symrefs, 2009-02-08). It turns out that the issue is deeper than that. After f8948e2, a symref that is dangling is marked with a NULL sha1, and the idea of using NULL sha1 to mean a deleted ref was scrapped, but somehow a follow-up eafb452 (do_one_ref(): null_sha1 check is not about broken ref, 2009-07-22) incorrectly reorganized do_one_ref(), still thinking NULL sha1 is never used in the code. Fix this by: - adopt Brandon's fix to t5505 test; - introduce REF_BROKEN flag to mark a ref that fails to resolve (dangling symref); - move the check for broken ref back inside the "if we are skipping dangling refs" code block. Signed-off-by: Junio C Hamano <gitster@pobox.com>

Junio C Hamano committed Mar 15, 2010 at 22:12 UTC e01de1c9122c3cba118da19fe0ba0ce913fa7285

2 files changed +10 -7

refs.c

+7 -4

@@ -6,6 +6,7 @@

7 /* ISSYMREF=01 and ISPACKED=02 are public interfaces */

8 #define REF_KNOWS_PEELED 04

9 +#define REF_BROKEN 010

11 struct ref_list {

12 struct ref_list *next;

@@ -275,8 +276,10 @@ static struct ref_list *get_ref_dir(const char *base, struct ref_list *list)

276 list = get_ref_dir(ref, list);

277 continue;

278 }

278 - if (!resolve_ref(ref, sha1, 1, &flag))

279 + if (!resolve_ref(ref, sha1, 1, &flag)) {

280 hashclr(sha1);

281 + flag |= REF_BROKEN;

282 + }

283 list = add_ref(ref, sha1, flag, list, NULL);

284 }

285 free(ref);

@@ -531,10 +534,10 @@ static int do_one_ref(const char *base, each_ref_fn fn, int trim,

534 {

535 if (strncmp(base, entry->name, trim))

536 return 0;

534 - /* Is this a "negative ref" that represents a deleted ref? */

535 - if (is_null_sha1(entry->sha1))

536 - return 0;

537 +

538 if (!(flags & DO_FOR_EACH_INCLUDE_BROKEN)) {

539 + if (entry->flag & REF_BROKEN)

540 + return 0; /* ignore dangling symref */

541 if (!has_sha1_file(entry->sha1)) {

542 error("%s does not point to a valid object!", entry->name);

543 return 0;

t/t5505-remote.sh

+3 -3

@@ -478,15 +478,15 @@ test_expect_success 'remote prune to cause a dangling symref' '

478 (

479 cd seven &&

480 git remote prune origin

481 - ) 2>err &&

481 + ) >err 2>&1 &&

482 grep "has become dangling" err &&

483

484 - : And the dangling symref will not cause other annoying errors

484 + : And the dangling symref will not cause other annoying errors &&

485 (

486 cd seven &&

487 git branch -a

488 ) 2>err &&

489 - ! grep "points nowhere" err

489 + ! grep "points nowhere" err &&

490 (

491 cd seven &&

492 test_must_fail git branch nomore origin