git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Re: [PATCH v2 03/18] is_refname_available(): avoid shadowing "dir" variable

From
Junio C Hamano <gitster@pobox.com>
Date
May 12, 2015, 21:06 UTC
Message-ID
<xmqq4mnhfque.fsf@gitster.dls.corp.google.com>
In-Reply-To
<1431357920-25090-4-git-send-email-mhagger@alum.mit.edu>
Michael Haggerty <mhagger@alum.mit.edu> writes:
Show 20 quoted lines
> 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 <mhagger@alum.mit.edu>
> ---
>  refs.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/refs.c b/refs.c
> index 776bbce..9d87e84 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;

Wow, the original is a tricky code, but that helps us be confident that this change is not breaking anything by "unmasking" the value of incoming "dir" ;-)

Show 6 quoted lines
> +		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))
Previous: Michael HaggertyNext: Michael Haggerty
Message 15 of 33 in “Improve handling of D/F conflicts”
  1. 00/18 Improve handling of D/F conflictsMichael Haggerty, May 11, 2015
  2. 01/18 t1404: new tests of ref D/F conflicts within transactionsMichael Haggerty, May 11, 2015
  3. Junio C HamanoMay 11, 2015
  4. Michael HaggertyMay 12, 2015
  5. Junio C HamanoMay 11, 2015
  6. Michael HaggertyMay 12, 2015
  7. Junio C HamanoMay 12, 2015
  8. Michael HaggertyMay 13, 2015
  9. Junio C HamanoMay 14, 2015
  10. Michael HaggertyMay 22, 2015
  11. Junio C HamanoMay 23, 2015
  12. 02/18 is_refname_available(): revamp the commentsMichael Haggerty, May 11, 2015
  13. Junio C HamanoMay 12, 2015
  14. 03/18 is_refname_available(): avoid shadowing "dir" variableMichael Haggerty, May 11, 2015
  15. Junio C HamanoMay 12, 2015
  16. 04/18 is_refname_available(): convert local variable "dirname" to strbufMichael Haggerty, May 11, 2015
  17. 05/18 entry_matches(): inline functionMichael Haggerty, May 11, 2015
  18. 06/18 report_refname_conflict(): inline functionMichael Haggerty, May 11, 2015
  19. Junio C HamanoMay 12, 2015
  20. 07/18 struct nonmatching_ref_data: store a refname instead of a ref_entryMichael Haggerty, May 11, 2015
  21. 08/18 is_refname_available(): use dirname in first loopMichael Haggerty, May 11, 2015
  22. 09/18 ref_transaction_commit(): use a string_list for detecting duplicatesMichael Haggerty, May 11, 2015
  23. 10/18 refs: check for D/F conflicts among refs created in a transactionMichael Haggerty, May 11, 2015
  24. 11/18 verify_refname_available(): rename functionMichael Haggerty, May 11, 2015
  25. 12/18 verify_refname_available(): report errors via a "struct strbuf *err"Michael Haggerty, May 11, 2015
  26. 13/18 lock_ref_sha1_basic(): report errors via a "struct strbuf *err"Michael Haggerty, May 11, 2015
  27. 14/18 lock_ref_sha1_basic(): improve diagnostics for ref D/F conflictsMichael Haggerty, May 11, 2015
  28. 15/18 rename_ref(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty, May 11, 2015
  29. 16/18 ref_transaction_commit(): provide better error messagesMichael Haggerty, May 11, 2015
  30. 17/18 ref_transaction_commit(): delete extra "the" from error messageMichael Haggerty, May 11, 2015
  31. 18/18 reflog_expire(): integrate lock_ref_sha1_basic() errors into oursMichael Haggerty, May 11, 2015
  32. Junio C HamanoMay 11, 2015
  33. Stefan BellerMay 11, 2015

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.