Skip to content

Commit

Permalink
Merge branch 'mh/ref-api-lazy-loose'
Browse files Browse the repository at this point in the history
The code to lazily read loose refs unnecessarily read the refs in a
subhierarchy by mistake when we free the data for the subhierarchy.

By Michael Haggerty
* mh/ref-api-lazy-loose:
  free_ref_entry(): do not trigger reading of loose refs
  • Loading branch information
Junio C Hamano committed May 29, 2012
2 parents 32bd3a5 + 27b5587 commit 38f2b87
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions refs.c
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,13 @@ static void clear_ref_dir(struct ref_dir *dir);

static void free_ref_entry(struct ref_entry *entry)
{
if (entry->flag & REF_DIR)
clear_ref_dir(get_ref_dir(entry));
if (entry->flag & REF_DIR) {
/*
* Do not use get_ref_dir() here, as that might
* trigger the reading of loose refs.
*/
clear_ref_dir(&entry->u.subdir);
}
free(entry);
}

Expand Down

0 comments on commit 38f2b87

Please sign in to comment.