diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2010-03-31 15:09:32 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-03-31 15:09:32 -0700 |
| commit | 970957dbad9361de75bf712cd2049853189b428f (patch) | |
| tree | 4756494c6424a4f91f5e3f35348261278162f4bf /refs.c | |
| parent | Documentation: show-ref <pattern>s are optional (diff) | |
| parent | refs: ref entry with NULL sha1 is can be a dangling symref (diff) | |
| download | tgif-970957dbad9361de75bf712cd2049853189b428f.tar.xz | |
Merge branch 'jc/maint-refs-dangling' into maint
* jc/maint-refs-dangling:
refs: ref entry with NULL sha1 is can be a dangling symref
Diffstat (limited to 'refs.c')
| -rw-r--r-- | refs.c | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -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; |