thodg/libgit2/src/attrcache.h

• Show log

  Commit

• Hash : f8346905
  Author :
  Date : 2019-07-12T09:03:33
  

  attr_file: ignore macros defined in subdirectories Right now, we are unconditionally applying all macros found in a gitatttributes file. But quoting gitattributes(5): Custom macro attributes can be defined only in top-level gitattributes files ($GIT_DIR/info/attributes, the .gitattributes file at the top level of the working tree, or the global or system-wide gitattributes files), not in .gitattributes files in working tree subdirectories. The built-in macro attribute "binary" is equivalent to: So gitattribute files in subdirectories of the working tree may explicitly _not_ contain macro definitions, but we do not currently enforce this limitation. This patch introduces a new parameter to the gitattributes parser that tells whether macros are allowed in the current file or not. If set to `false`, we will still parse macros, but silently ignore them instead of adding them to the list of defined macros. Update all callers to correctly determine whether the to-be-parsed file may contain macros or not. Most importantly, when walking up the directory hierarchy, we will only set it to `true` once it reaches the root directory of the repo itself. Add a test that verifies that we are indeed not applying macros from subdirectories. Previous to these changes, the test would've failed.

Download

• src/attrcache.h

• /*
   * Copyright (C) the libgit2 contributors. All rights reserved.
   *
   * This file is part of libgit2, distributed under the GNU GPL v2 with
   * a Linking Exception. For full terms see the included COPYING file.
   */
  #ifndef INCLUDE_attrcache_h__
  #define INCLUDE_attrcache_h__
  
  #include "common.h"
  
  #include "attr_file.h"
  #include "strmap.h"
  
  #define GIT_ATTR_CONFIG       "core.attributesfile"
  #define GIT_IGNORE_CONFIG     "core.excludesfile"
  
  typedef struct {
  	char *cfg_attr_file; /* cached value of core.attributesfile */
  	char *cfg_excl_file; /* cached value of core.excludesfile */
  	git_strmap *files;	 /* hash path to git_attr_cache_entry records */
  	git_strmap *macros;	 /* hash name to vector<git_attr_assignment> */
  	git_mutex lock;
  	git_pool  pool;
  } git_attr_cache;
  
  extern int git_attr_cache__init(git_repository *repo);
  
  /* get file - loading and reload as needed */
  extern int git_attr_cache__get(
  	git_attr_file **file,
  	git_repository *repo,
  	git_attr_session *attr_session,
  	git_attr_file_source source,
  	const char *base,
  	const char *filename,
  	git_attr_file_parser parser,
  	bool allow_macros);
  
  extern bool git_attr_cache__is_cached(
  	git_repository *repo,
  	git_attr_file_source source,
  	const char *path);
  
  extern int git_attr_cache__alloc_file_entry(
  	git_attr_file_entry **out,
  	const char *base,
  	const char *path,
  	git_pool *pool);
  
  extern int git_attr_cache__insert_macro(
  	git_repository *repo, git_attr_rule *macro);
  
  extern git_attr_rule *git_attr_cache__lookup_macro(
  	git_repository *repo, const char *name);
  
  #endif
  

Download