Skip to content

Commit

Permalink
free_ref_entry(): do not trigger reading of loose refs
Browse files Browse the repository at this point in the history
Do not call get_ref_dir() from within free_ref_entry(), because that
triggers the reading of loose refs, only for them to be freed
immediately.

Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
Michael Haggerty authored and Junio C Hamano committed May 20, 2012
1 parent 663c129 commit 27b5587
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 27b5587

Please sign in to comment.