From 9ef6eaa287b12ff9469c7775507f107b86f9a8c8 Mon Sep 17 00:00:00 2001 From: Michael Haggerty Date: Mon, 11 May 2015 17:25:05 +0200 Subject: [PATCH] is_refname_available(): avoid shadowing "dir" variable The function had a "dir" parameter that was shadowed by a local "dir" variable within a code block. Use the former in place of the latter. (This is consistent with "dir"'s use elsewhere in the function.) Signed-off-by: Michael Haggerty --- refs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/refs.c b/refs.c index 776bbcebd6..9d87e84f42 100644 --- a/refs.c +++ b/refs.c @@ -967,10 +967,10 @@ static int is_refname_available(const char *refname, * "refs/foo/bar/"). It is a problem iff it contains * any ref that is not in "skip". */ - struct ref_entry *entry = dir->entries[pos]; - struct ref_dir *dir = get_ref_dir(entry); struct nonmatching_ref_data data; + struct ref_entry *entry = dir->entries[pos]; + dir = get_ref_dir(entry); data.skip = skip; sort_ref_dir(dir); if (!do_for_each_entry_in_dir(dir, 0, nonmatching_ref_fn, &data)) -- 2.11.4.GIT