From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 31 Mar 2015 21:53:08 +0000 (-0700)
Subject: Merge branch 'jc/report-path-error-to-dir' into maint
X-Git-Tag: v2.3.5~2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ab0fb57aac6c5b6f074c07c7e2729bcff58cc45d?ds=inline;hp=-c

Merge branch 'jc/report-path-error-to-dir' into maint

Code clean-up.

* jc/report-path-error-to-dir:
report_path_error(): move to dir.c
---

ab0fb57aac6c5b6f074c07c7e2729bcff58cc45d
diff --combined builtin/ls-files.c
index 99cee20fb0,47d70b2b9b..19063ebc64
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@@ -354,49 -354,6 +354,6 @@@ void overlay_tree_on_cache(const char *
  	}
  }
  
- int report_path_error(const char *ps_matched,
- 		      const struct pathspec *pathspec,
- 		      const char *prefix)
- {
- 	/*
- 	 * Make sure all pathspec matched; otherwise it is an error.
- 	 */
- 	struct strbuf sb = STRBUF_INIT;
- 	int num, errors = 0;
- 	for (num = 0; num < pathspec->nr; num++) {
- 		int other, found_dup;
- 
- 		if (ps_matched[num])
- 			continue;
- 		/*
- 		 * The caller might have fed identical pathspec
- 		 * twice.  Do not barf on such a mistake.
- 		 * FIXME: parse_pathspec should have eliminated
- 		 * duplicate pathspec.
- 		 */
- 		for (found_dup = other = 0;
- 		     !found_dup && other < pathspec->nr;
- 		     other++) {
- 			if (other == num || !ps_matched[other])
- 				continue;
- 			if (!strcmp(pathspec->items[other].original,
- 				    pathspec->items[num].original))
- 				/*
- 				 * Ok, we have a match already.
- 				 */
- 				found_dup = 1;
- 		}
- 		if (found_dup)
- 			continue;
- 
- 		error("pathspec '%s' did not match any file(s) known to git.",
- 		      pathspec->items[num].original);
- 		errors++;
- 	}
- 	strbuf_release(&sb);
- 	return errors;
- }
- 
  static const char * const ls_files_usage[] = {
  	N_("git ls-files [options] [<file>...]"),
  	NULL
@@@ -474,7 -431,7 +431,7 @@@ int cmd_ls_files(int argc, const char *
  		OPT_BOOL('k', "killed", &show_killed,
  			N_("show files on the filesystem that need to be removed")),
  		OPT_BIT(0, "directory", &dir.flags,
 -			N_("show 'other' directories' name only"),
 +			N_("show 'other' directories' names only"),
  			DIR_SHOW_OTHER_DIRECTORIES),
  		OPT_NEGBIT(0, "empty-directory", &dir.flags,
  			N_("don't show empty directories"),
diff --combined cache.h
index 23806394eb,8ec0b65ee5..28d769fcaa
--- a/cache.h
+++ b/cache.h
@@@ -7,8 -7,6 +7,8 @@@
  #include "advice.h"
  #include "gettext.h"
  #include "convert.h"
 +#include "trace.h"
 +#include "string-list.h"
  
  #include SHA1_HEADER
  #ifndef git_SHA_CTX
@@@ -65,25 -63,17 +65,25 @@@ unsigned long git_deflate_bound(git_zst
   *
   * The value 0160000 is not normally a valid mode, and
   * also just happens to be S_IFDIR + S_IFLNK
 - *
 - * NOTE! We *really* shouldn't depend on the S_IFxxx macros
 - * always having the same values everywhere. We should use
 - * our internal git values for these things, and then we can
 - * translate that to the OS-specific value. It just so
 - * happens that everybody shares the same bit representation
 - * in the UNIX world (and apparently wider too..)
   */
  #define S_IFGITLINK	0160000
  #define S_ISGITLINK(m)	(((m) & S_IFMT) == S_IFGITLINK)
  
 +/*
 + * Some mode bits are also used internally for computations.
 + *
 + * They *must* not overlap with any valid modes, and they *must* not be emitted
 + * to outside world - i.e. appear on disk or network. In other words, it's just
 + * temporary fields, which we internally use, but they have to stay in-house.
 + *
 + * ( such approach is valid, as standard S_IF* fits into 16 bits, and in Git
 + *   codebase mode is `unsigned int` which is assumed to be at least 32 bits )
 + */
 +
 +/* used internally in tree-diff */
 +#define S_DIFFTREE_IFXMIN_NEQ	0x80000000
 +
 +
  /*
   * Intensive research over the course of many years has shown that
   * port 9418 is totally unused by anything else. Or
@@@ -145,7 -135,6 +145,7 @@@ struct cache_entry 
  	unsigned int ce_mode;
  	unsigned int ce_flags;
  	unsigned int ce_namelen;
 +	unsigned int index;	/* for link extension */
  	unsigned char sha1[20];
  	char name[FLEX_ARRAY]; /* more */
  };
@@@ -156,7 -145,7 +156,7 @@@
  #define CE_STAGESHIFT 12
  
  /*
 - * Range 0xFFFF0000 in ce_flags is divided into
 + * Range 0xFFFF0FFF in ce_flags is divided into
   * two parts: in-memory flags and on-disk ones.
   * Flags in CE_EXTENDED_FLAGS will get saved on-disk
   * if you want to save a new flag, add it in
@@@ -179,9 -168,6 +179,9 @@@
  /* used to temporarily mark paths matched by pathspecs */
  #define CE_MATCHED           (1 << 26)
  
 +#define CE_UPDATE_IN_BASE    (1 << 27)
 +#define CE_STRIP_NAME        (1 << 28)
 +
  /*
   * Extended on-disk flags
   */
@@@ -282,22 -268,12 +282,22 @@@ static inline unsigned int canon_mode(u
  
  #define cache_entry_size(len) (offsetof(struct cache_entry,name) + (len) + 1)
  
 +#define SOMETHING_CHANGED	(1 << 0) /* unclassified changes go here */
 +#define CE_ENTRY_CHANGED	(1 << 1)
 +#define CE_ENTRY_REMOVED	(1 << 2)
 +#define CE_ENTRY_ADDED		(1 << 3)
 +#define RESOLVE_UNDO_CHANGED	(1 << 4)
 +#define CACHE_TREE_CHANGED	(1 << 5)
 +#define SPLIT_INDEX_ORDERED	(1 << 6)
 +
 +struct split_index;
  struct index_state {
  	struct cache_entry **cache;
  	unsigned int version;
  	unsigned int cache_nr, cache_alloc, cache_changed;
  	struct string_list *resolve_undo;
  	struct cache_tree *cache_tree;
 +	struct split_index *split_index;
  	struct cache_time timestamp;
  	unsigned name_hash_initialized : 1,
  		 initialized : 1;
@@@ -326,6 -302,7 +326,6 @@@ extern void free_name_hash(struct index
  #define read_cache_preload(pathspec) read_index_preload(&the_index, (pathspec))
  #define is_cache_unborn() is_index_unborn(&the_index)
  #define read_cache_unmerged() read_index_unmerged(&the_index)
 -#define write_cache(newfd, cache, entries) write_index(&the_index, (newfd))
  #define discard_cache() discard_index(&the_index)
  #define unmerged_cache() unmerged_index(&the_index)
  #define cache_name_pos(name, namelen) index_name_pos(&the_index,(name),(namelen))
@@@ -475,22 -452,17 +475,22 @@@ extern int daemonize(void)
  				alloc = (nr); \
  			else \
  				alloc = alloc_nr(alloc); \
 -			x = xrealloc((x), alloc * sizeof(*(x))); \
 +			REALLOC_ARRAY(x, alloc); \
  		} \
  	} while (0)
  
  /* Initialize and use the cache information */
 +struct lock_file;
  extern int read_index(struct index_state *);
  extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
 +extern int do_read_index(struct index_state *istate, const char *path,
 +			 int must_exist); /* for testting only! */
  extern int read_index_from(struct index_state *, const char *path);
  extern int is_index_unborn(struct index_state *);
  extern int read_index_unmerged(struct index_state *);
 -extern int write_index(struct index_state *, int newfd);
 +#define COMMIT_LOCK		(1 << 0)
 +#define CLOSE_LOCK		(1 << 1)
 +extern int write_locked_index(struct index_state *, struct lock_file *lock, unsigned flags);
  extern int discard_index(struct index_state *);
  extern int unmerged_index(const struct index_state *);
  extern int verify_path(const char *path);
@@@ -502,7 -474,6 +502,7 @@@ extern int index_name_pos(const struct 
  #define ADD_CACHE_SKIP_DFCHECK 4	/* Ok to skip DF conflict checks */
  #define ADD_CACHE_JUST_APPEND 8		/* Append only; tree.c::read_tree() */
  #define ADD_CACHE_NEW_ONLY 16		/* Do not replace existing ones */
 +#define ADD_CACHE_KEEP_CACHE_TREE 32	/* Do not invalidate cache-tree */
  extern int add_index_entry(struct index_state *, struct cache_entry *ce, int option);
  extern void rename_index_entry_at(struct index_state *, int pos, const char *new_name);
  extern int remove_index_entry_at(struct index_state *, int pos);
@@@ -563,11 -534,27 +563,11 @@@ extern void fill_stat_cache_info(struc
  #define REFRESH_IN_PORCELAIN	0x0020	/* user friendly output, not "needs update" */
  extern int refresh_index(struct index_state *, unsigned int flags, const struct pathspec *pathspec, char *seen, const char *header_msg);
  
 -struct lock_file {
 -	struct lock_file *next;
 -	int fd;
 -	pid_t owner;
 -	char on_list;
 -	char filename[PATH_MAX];
 -};
 -#define LOCK_DIE_ON_ERROR 1
 -#define LOCK_NODEREF 2
 -extern int unable_to_lock_error(const char *path, int err);
 -extern NORETURN void unable_to_lock_index_die(const char *path, int err);
 -extern int hold_lock_file_for_update(struct lock_file *, const char *path, int);
 -extern int hold_lock_file_for_append(struct lock_file *, const char *path, int);
 -extern int commit_lock_file(struct lock_file *);
  extern void update_index_if_able(struct index_state *, struct lock_file *);
  
  extern int hold_locked_index(struct lock_file *, int);
 -extern int commit_locked_index(struct lock_file *);
  extern void set_alternate_index_output(const char *);
 -extern int close_lock_file(struct lock_file *);
 -extern void rollback_lock_file(struct lock_file *);
 +
  extern int delete_ref(const char *, const unsigned char *sha1, int delopt);
  
  /* Environment bits from configuration mechanism */
@@@ -613,20 -600,11 +613,20 @@@ extern int precomposed_unicode
  extern int protect_hfs;
  extern int protect_ntfs;
  
 +/*
 + * Include broken refs in all ref iterations, which will
 + * generally choke dangerous operations rather than letting
 + * them silently proceed without taking the broken ref into
 + * account.
 + */
 +extern int ref_paranoia;
 +
  /*
   * The character that begins a commented line in user-editable file
   * that is subject to stripspace.
   */
  extern char comment_line_char;
 +extern int auto_comment_line_char;
  
  enum branch_track {
  	BRANCH_TRACK_UNSPECIFIED = -1,
@@@ -834,6 -812,7 +834,6 @@@ int normalize_path_copy(char *dst, cons
  int longest_ancestor_length(const char *path, struct string_list *prefixes);
  char *strip_path_suffix(const char *path, const char *suffix);
  int daemon_avoid_alias(const char *path);
 -int offset_1st_component(const char *path);
  extern int is_ntfs_dotgit(const char *name);
  
  /* object replacement */
@@@ -954,8 -933,8 +954,8 @@@ extern int for_each_abbrev(const char *
  extern int get_sha1_hex(const char *hex, unsigned char *sha1);
  
  extern char *sha1_to_hex(const unsigned char *sha1);	/* static buffer result! */
 -extern int read_ref_full(const char *refname, unsigned char *sha1,
 -			 int reading, int *flags);
 +extern int read_ref_full(const char *refname, int resolve_flags,
 +			 unsigned char *sha1, int *flags);
  extern int read_ref(const char *refname, unsigned char *sha1);
  
  /*
@@@ -967,49 -946,29 +967,49 @@@
   * or the input ref.
   *
   * If the reference cannot be resolved to an object, the behavior
 - * depends on the "reading" argument:
 + * depends on the RESOLVE_REF_READING flag:
   *
 - * - If reading is set, return NULL.
 + * - If RESOLVE_REF_READING is set, return NULL.
   *
 - * - If reading is not set, clear sha1 and return the name of the last
 - *   reference name in the chain, which will either be a non-symbolic
 + * - If RESOLVE_REF_READING is not set, clear sha1 and return the name of
 + *   the last reference name in the chain, which will either be a non-symbolic
   *   reference or an undefined reference.  If this is a prelude to
   *   "writing" to the ref, the return value is the name of the ref
   *   that will actually be created or changed.
   *
 - * If flag is non-NULL, set the value that it points to the
 + * If the RESOLVE_REF_NO_RECURSE flag is passed, only resolves one
 + * level of symbolic reference.  The value stored in sha1 for a symbolic
 + * reference will always be null_sha1 in this case, and the return
 + * value is the reference that the symref refers to directly.
 + *
 + * If flags is non-NULL, set the value that it points to the
   * combination of REF_ISPACKED (if the reference was found among the
 - * packed references) and REF_ISSYMREF (if the initial reference was a
 - * symbolic reference).
 + * packed references), REF_ISSYMREF (if the initial reference was a
 + * symbolic reference), REF_BAD_NAME (if the reference name is ill
 + * formed --- see RESOLVE_REF_ALLOW_BAD_NAME below), and REF_ISBROKEN
 + * (if the ref is malformed or has a bad name). See refs.h for more detail
 + * on each flag.
   *
   * If ref is not a properly-formatted, normalized reference, return
   * NULL.  If more than MAXDEPTH recursive symbolic lookups are needed,
   * give up and return NULL.
   *
 - * errno is sometimes set on errors, but not always.
 + * RESOLVE_REF_ALLOW_BAD_NAME allows resolving refs even when their
 + * name is invalid according to git-check-ref-format(1).  If the name
 + * is bad then the value stored in sha1 will be null_sha1 and the two
 + * flags REF_ISBROKEN and REF_BAD_NAME will be set.
 + *
 + * Even with RESOLVE_REF_ALLOW_BAD_NAME, names that escape the refs/
 + * directory and do not consist of all caps and underscores cannot be
 + * resolved. The function returns NULL for such ref names.
 + * Caps and underscores refers to the special refs, such as HEAD,
 + * FETCH_HEAD and friends, that all live outside of the refs/ directory.
   */
 -extern const char *resolve_ref_unsafe(const char *ref, unsigned char *sha1, int reading, int *flag);
 -extern char *resolve_refdup(const char *ref, unsigned char *sha1, int reading, int *flag);
 +#define RESOLVE_REF_READING 0x01
 +#define RESOLVE_REF_NO_RECURSE 0x02
 +#define RESOLVE_REF_ALLOW_BAD_NAME 0x04
 +extern const char *resolve_ref_unsafe(const char *ref, int resolve_flags, unsigned char *sha1, int *flags);
 +extern char *resolve_refdup(const char *ref, int resolve_flags, unsigned char *sha1, int *flags);
  
  extern int dwim_ref(const char *str, int len, unsigned char *sha1, char **ref);
  extern int dwim_log(const char *str, int len, unsigned char *sha1, char **ref);
@@@ -1028,7 -987,7 +1028,7 @@@ extern int validate_headref(const char 
  
  extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
  extern int df_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
 -extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);
 +extern int name_compare(const char *name1, size_t len1, const char *name2, size_t len2);
  extern int cache_name_stage_compare(const char *name1, int len1, int stage1, const char *name2, int len2, int stage2);
  
  extern void *read_object_with_reference(const unsigned char *sha1,
@@@ -1045,7 -1004,6 +1045,7 @@@ enum date_mode 
  	DATE_SHORT,
  	DATE_LOCAL,
  	DATE_ISO8601,
 +	DATE_ISO8601_STRICT,
  	DATE_RFC2822,
  	DATE_RAW
  };
@@@ -1053,10 -1011,10 +1053,10 @@@
  const char *show_date(unsigned long time, int timezone, enum date_mode mode);
  void show_date_relative(unsigned long time, int tz, const struct timeval *now,
  			struct strbuf *timebuf);
 -int parse_date(const char *date, char *buf, int bufsize);
 +int parse_date(const char *date, struct strbuf *out);
  int parse_date_basic(const char *date, unsigned long *timestamp, int *offset);
  int parse_expiry_date(const char *date, unsigned long *timestamp);
 -void datestamp(char *buf, int bufsize);
 +void datestamp(struct strbuf *out);
  #define approxidate(s) approxidate_careful((s), NULL)
  unsigned long approxidate_careful(const char *, int *);
  unsigned long approxidate_relative(const char *date, const struct timeval *now);
@@@ -1070,7 -1028,6 +1070,7 @@@ extern const char *git_author_info(int)
  extern const char *git_committer_info(int);
  extern const char *fmt_ident(const char *name, const char *email, const char *date_str, int);
  extern const char *fmt_name(const char *name, const char *email);
 +extern const char *ident_default_name(void);
  extern const char *ident_default_email(void);
  extern const char *git_editor(void);
  extern const char *git_pager(int stdout_is_tty);
@@@ -1092,13 -1049,6 +1092,13 @@@ struct ident_split 
   */
  extern int split_ident_line(struct ident_split *, const char *, int);
  
 +/*
 + * Like show_date, but pull the timestamp and tz parameters from
 + * the ident_split. It will also sanity-check the values and produce
 + * a well-known sentinel date if they appear bogus.
 + */
 +const char *show_ident_date(const struct ident_split *id, enum date_mode mode);
 +
  /*
   * Compare split idents for equality or strict ordering. Note that we
   * compare only the ident part of the line, ignoring any timestamp.
@@@ -1109,7 -1059,6 +1109,7 @@@
  extern int ident_cmp(const struct ident_split *, const struct ident_split *);
  
  struct checkout {
 +	struct index_state *istate;
  	const char *base_dir;
  	int base_dir_len;
  	unsigned force:1,
@@@ -1122,16 -1071,12 +1122,16 @@@
  extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
  
  struct cache_def {
 -	char path[PATH_MAX + 1];
 -	int len;
 +	struct strbuf path;
  	int flags;
  	int track_flags;
  	int prefix_len_stat_func;
  };
 +#define CACHE_DEF_INIT { STRBUF_INIT, 0, 0, 0 }
 +static inline void cache_def_clear(struct cache_def *cache)
 +{
 +	strbuf_release(&cache->path);
 +}
  
  extern int has_symlink_leading_path(const char *name, int len);
  extern int threaded_has_symlink_leading_path(struct cache_def *, const char *, int);
@@@ -1149,7 -1094,7 +1149,7 @@@ extern void prepare_alt_odb(void)
  extern void read_info_alternates(const char * relative_base, int depth);
  extern void add_to_alternates_file(const char *reference);
  typedef int alt_odb_fn(struct alternate_object_database *, void *);
 -extern void foreach_alt_odb(alt_odb_fn, void*);
 +extern int foreach_alt_odb(alt_odb_fn, void*);
  
  struct pack_window {
  	struct pack_window *next;
@@@ -1245,59 -1190,6 +1245,59 @@@ extern unsigned long unpack_object_head
  extern unsigned long get_size_from_delta(struct packed_git *, struct pack_window **, off_t);
  extern int unpack_object_header(struct packed_git *, struct pack_window **, off_t *, unsigned long *);
  
 +/*
 + * Iterate over the files in the loose-object parts of the object
 + * directory "path", triggering the following callbacks:
 + *
 + *  - loose_object is called for each loose object we find.
 + *
 + *  - loose_cruft is called for any files that do not appear to be
 + *    loose objects. Note that we only look in the loose object
 + *    directories "objects/[0-9a-f]{2}/", so we will not report
 + *    "objects/foobar" as cruft.
 + *
 + *  - loose_subdir is called for each top-level hashed subdirectory
 + *    of the object directory (e.g., "$OBJDIR/f0"). It is called
 + *    after the objects in the directory are processed.
 + *
 + * Any callback that is NULL will be ignored. Callbacks returning non-zero
 + * will end the iteration.
 + *
 + * In the "buf" variant, "path" is a strbuf which will also be used as a
 + * scratch buffer, but restored to its original contents before
 + * the function returns.
 + */
 +typedef int each_loose_object_fn(const unsigned char *sha1,
 +				 const char *path,
 +				 void *data);
 +typedef int each_loose_cruft_fn(const char *basename,
 +				const char *path,
 +				void *data);
 +typedef int each_loose_subdir_fn(int nr,
 +				 const char *path,
 +				 void *data);
 +int for_each_loose_file_in_objdir(const char *path,
 +				  each_loose_object_fn obj_cb,
 +				  each_loose_cruft_fn cruft_cb,
 +				  each_loose_subdir_fn subdir_cb,
 +				  void *data);
 +int for_each_loose_file_in_objdir_buf(struct strbuf *path,
 +				      each_loose_object_fn obj_cb,
 +				      each_loose_cruft_fn cruft_cb,
 +				      each_loose_subdir_fn subdir_cb,
 +				      void *data);
 +
 +/*
 + * Iterate over loose and packed objects in both the local
 + * repository and any alternates repositories.
 + */
 +typedef int each_packed_object_fn(const unsigned char *sha1,
 +				  struct packed_git *pack,
 +				  uint32_t pos,
 +				  void *data);
 +extern int for_each_loose_object(each_loose_object_fn, void *);
 +extern int for_each_packed_object(each_packed_object_fn, void *);
 +
  struct object_info {
  	/* Request */
  	enum object_type *typep;
@@@ -1344,8 -1236,6 +1344,8 @@@ extern int update_server_info(int)
  #define CONFIG_INVALID_PATTERN 6
  #define CONFIG_GENERIC_ERROR 7
  
 +#define CONFIG_REGEX_NONE ((void *)1)
 +
  struct git_config_source {
  	unsigned int use_stdin:1;
  	const char *file;
@@@ -1359,7 -1249,7 +1359,7 @@@ extern int git_config_from_buf(config_f
  			       const char *buf, size_t len, void *data);
  extern void git_config_push_parameter(const char *text);
  extern int git_config_from_parameters(config_fn_t fn, void *data);
 -extern int git_config(config_fn_t fn, void *);
 +extern void git_config(config_fn_t fn, void *);
  extern int git_config_with_options(config_fn_t fn, void *,
  				   struct git_config_source *config_source,
  				   int respect_includes);
@@@ -1383,11 -1273,10 +1383,11 @@@ extern int git_config_rename_section_in
  extern const char *git_etc_gitconfig(void);
  extern int check_repository_format_version(const char *var, const char *value, void *cb);
  extern int git_env_bool(const char *, int);
 +extern unsigned long git_env_ulong(const char *, unsigned long);
  extern int git_config_system(void);
  extern int config_error_nonbool(const char *);
 -#if defined(__GNUC__) && ! defined(__clang__)
 -#define config_error_nonbool(s) (config_error_nonbool(s), -1)
 +#if defined(__GNUC__)
 +#define config_error_nonbool(s) (config_error_nonbool(s), const_error())
  #endif
  extern const char *get_log_output_encoding(void);
  extern const char *get_commit_output_encoding(void);
@@@ -1417,69 -1306,6 +1417,69 @@@ extern int parse_config_key(const char 
  			    const char **subsection, int *subsection_len,
  			    const char **key);
  
 +struct config_set_element {
 +	struct hashmap_entry ent;
 +	char *key;
 +	struct string_list value_list;
 +};
 +
 +struct configset_list_item {
 +	struct config_set_element *e;
 +	int value_index;
 +};
 +
 +/*
 + * the contents of the list are ordered according to their
 + * position in the config files and order of parsing the files.
 + * (i.e. key-value pair at the last position of .git/config will
 + * be at the last item of the list)
 + */
 +struct configset_list {
 +	struct configset_list_item *items;
 +	unsigned int nr, alloc;
 +};
 +
 +struct config_set {
 +	struct hashmap config_hash;
 +	int hash_initialized;
 +	struct configset_list list;
 +};
 +
 +extern void git_configset_init(struct config_set *cs);
 +extern int git_configset_add_file(struct config_set *cs, const char *filename);
 +extern int git_configset_get_value(struct config_set *cs, const char *key, const char **value);
 +extern const struct string_list *git_configset_get_value_multi(struct config_set *cs, const char *key);
 +extern void git_configset_clear(struct config_set *cs);
 +extern int git_configset_get_string_const(struct config_set *cs, const char *key, const char **dest);
 +extern int git_configset_get_string(struct config_set *cs, const char *key, char **dest);
 +extern int git_configset_get_int(struct config_set *cs, const char *key, int *dest);
 +extern int git_configset_get_ulong(struct config_set *cs, const char *key, unsigned long *dest);
 +extern int git_configset_get_bool(struct config_set *cs, const char *key, int *dest);
 +extern int git_configset_get_bool_or_int(struct config_set *cs, const char *key, int *is_bool, int *dest);
 +extern int git_configset_get_maybe_bool(struct config_set *cs, const char *key, int *dest);
 +extern int git_configset_get_pathname(struct config_set *cs, const char *key, const char **dest);
 +
 +extern int git_config_get_value(const char *key, const char **value);
 +extern const struct string_list *git_config_get_value_multi(const char *key);
 +extern void git_config_clear(void);
 +extern void git_config_iter(config_fn_t fn, void *data);
 +extern int git_config_get_string_const(const char *key, const char **dest);
 +extern int git_config_get_string(const char *key, char **dest);
 +extern int git_config_get_int(const char *key, int *dest);
 +extern int git_config_get_ulong(const char *key, unsigned long *dest);
 +extern int git_config_get_bool(const char *key, int *dest);
 +extern int git_config_get_bool_or_int(const char *key, int *is_bool, int *dest);
 +extern int git_config_get_maybe_bool(const char *key, int *dest);
 +extern int git_config_get_pathname(const char *key, const char **dest);
 +
 +struct key_value_info {
 +	const char *filename;
 +	int linenr;
 +};
 +
 +extern NORETURN void git_die_config(const char *key, const char *err, ...) __attribute__((format(printf, 2, 3)));
 +extern NORETURN void git_die_config_linenr(const char *key, const char *filename, int linenr);
 +
  extern int committer_ident_sufficiently_given(void);
  extern int author_ident_sufficiently_given(void);
  
@@@ -1490,8 -1316,6 +1490,8 @@@ extern const char *git_mailmap_blob
  
  /* IO helper functions */
  extern void maybe_flush_or_die(FILE *, const char *);
 +__attribute__((format (printf, 2, 3)))
 +extern void fprintf_or_die(FILE *, const char *fmt, ...);
  extern int copy_fd(int ifd, int ofd);
  extern int copy_file(const char *dst, const char *src, int mode);
  extern int copy_file_with_time(const char *dst, const char *src, int mode);
@@@ -1515,7 -1339,7 +1515,7 @@@ extern const char *pager_program
  extern int pager_in_use(void);
  extern int pager_use_color;
  extern int term_columns(void);
 -extern int decimal_width(int);
 +extern int decimal_width(uintmax_t);
  extern int check_pager_config(const char *cmd);
  
  extern const char *editor_program;
@@@ -1535,7 -1359,17 +1535,7 @@@ extern void *alloc_object_node(void)
  extern void alloc_report(void);
  extern unsigned int alloc_commit_index(void);
  
 -/* trace.c */
 -__attribute__((format (printf, 1, 2)))
 -extern void trace_printf(const char *format, ...);
 -__attribute__((format (printf, 2, 3)))
 -extern void trace_argv_printf(const char **argv, const char *format, ...);
 -extern void trace_repo_setup(const char *prefix);
 -extern int trace_want(const char *key);
 -__attribute__((format (printf, 2, 3)))
 -extern void trace_printf_key(const char *key, const char *fmt, ...);
 -extern void trace_strbuf(const char *key, const struct strbuf *buf);
 -
 +/* pkt-line.c */
  void packet_trace_identity(const char *prog);
  
  /* add */
@@@ -1577,7 -1411,6 +1577,6 @@@ extern int ws_blank_line(const char *li
  #define ws_tab_width(rule)     ((rule) & WS_TAB_WIDTH_MASK)
  
  /* ls-files */
- int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
  void overlay_tree_on_cache(const char *tree_name, const char *prefix);
  
  char *alias_lookup(const char *alias);
diff --combined dir.c
index 3f7a0256b6,5d6e102a19..0943a81964
--- a/dir.c
+++ b/dir.c
@@@ -377,6 -377,49 +377,49 @@@ int match_pathspec(const struct pathspe
  	return negative ? 0 : positive;
  }
  
+ int report_path_error(const char *ps_matched,
+ 		      const struct pathspec *pathspec,
+ 		      const char *prefix)
+ {
+ 	/*
+ 	 * Make sure all pathspec matched; otherwise it is an error.
+ 	 */
+ 	struct strbuf sb = STRBUF_INIT;
+ 	int num, errors = 0;
+ 	for (num = 0; num < pathspec->nr; num++) {
+ 		int other, found_dup;
+ 
+ 		if (ps_matched[num])
+ 			continue;
+ 		/*
+ 		 * The caller might have fed identical pathspec
+ 		 * twice.  Do not barf on such a mistake.
+ 		 * FIXME: parse_pathspec should have eliminated
+ 		 * duplicate pathspec.
+ 		 */
+ 		for (found_dup = other = 0;
+ 		     !found_dup && other < pathspec->nr;
+ 		     other++) {
+ 			if (other == num || !ps_matched[other])
+ 				continue;
+ 			if (!strcmp(pathspec->items[other].original,
+ 				    pathspec->items[num].original))
+ 				/*
+ 				 * Ok, we have a match already.
+ 				 */
+ 				found_dup = 1;
+ 		}
+ 		if (found_dup)
+ 			continue;
+ 
+ 		error("pathspec '%s' did not match any file(s) known to git.",
+ 		      pathspec->items[num].original);
+ 		errors++;
+ 	}
+ 	strbuf_release(&sb);
+ 	return errors;
+ }
+ 
  /*
   * Return the length of the "simple" part of a path match limiter.
   */
@@@ -557,7 -600,8 +600,7 @@@ int add_excludes_from_file_to_list(cons
  			buf = xrealloc(buf, size+1);
  			buf[size++] = '\n';
  		}
 -	}
 -	else {
 +	} else {
  		size = xsize_t(st.st_size);
  		if (size == 0) {
  			close(fd);
@@@ -792,19 -836,17 +835,19 @@@ static void prep_exclude(struct dir_str
  
  	group = &dir->exclude_list_group[EXC_DIRS];
  
 -	/* Pop the exclude lists from the EXCL_DIRS exclude_list_group
 +	/*
 +	 * Pop the exclude lists from the EXCL_DIRS exclude_list_group
  	 * which originate from directories not in the prefix of the
 -	 * path being checked. */
 +	 * path being checked.
 +	 */
  	while ((stk = dir->exclude_stack) != NULL) {
  		if (stk->baselen <= baselen &&
 -		    !strncmp(dir->basebuf, base, stk->baselen))
 +		    !strncmp(dir->basebuf.buf, base, stk->baselen))
  			break;
  		el = &group->el[dir->exclude_stack->exclude_ix];
  		dir->exclude_stack = stk->prev;
  		dir->exclude = NULL;
 -		free((char *)el->src); /* see strdup() below */
 +		free((char *)el->src); /* see strbuf_detach() below */
  		clear_exclude_list(el);
  		free(stk);
  		group->nr--;
@@@ -814,25 -856,17 +857,25 @@@
  	if (dir->exclude)
  		return;
  
 +	/*
 +	 * Lazy initialization. All call sites currently just
 +	 * memset(dir, 0, sizeof(*dir)) before use. Changing all of
 +	 * them seems lots of work for little benefit.
 +	 */
 +	if (!dir->basebuf.buf)
 +		strbuf_init(&dir->basebuf, PATH_MAX);
 +
  	/* Read from the parent directories and push them down. */
  	current = stk ? stk->baselen : -1;
 +	strbuf_setlen(&dir->basebuf, current < 0 ? 0 : current);
  	while (current < baselen) {
 -		struct exclude_stack *stk = xcalloc(1, sizeof(*stk));
  		const char *cp;
  
 +		stk = xcalloc(1, sizeof(*stk));
  		if (current < 0) {
  			cp = base;
  			current = 0;
 -		}
 -		else {
 +		} else {
  			cp = strchr(base + current + 1, '/');
  			if (!cp)
  				die("oops in prep_exclude");
@@@ -842,47 -876,48 +885,47 @@@
  		stk->baselen = cp - base;
  		stk->exclude_ix = group->nr;
  		el = add_exclude_list(dir, EXC_DIRS, NULL);
 -		memcpy(dir->basebuf + current, base + current,
 -		       stk->baselen - current);
 +		strbuf_add(&dir->basebuf, base + current, stk->baselen - current);
 +		assert(stk->baselen == dir->basebuf.len);
  
  		/* Abort if the directory is excluded */
  		if (stk->baselen) {
  			int dt = DT_DIR;
 -			dir->basebuf[stk->baselen - 1] = 0;
 +			dir->basebuf.buf[stk->baselen - 1] = 0;
  			dir->exclude = last_exclude_matching_from_lists(dir,
 -				dir->basebuf, stk->baselen - 1,
 -				dir->basebuf + current, &dt);
 -			dir->basebuf[stk->baselen - 1] = '/';
 +				dir->basebuf.buf, stk->baselen - 1,
 +				dir->basebuf.buf + current, &dt);
 +			dir->basebuf.buf[stk->baselen - 1] = '/';
  			if (dir->exclude &&
  			    dir->exclude->flags & EXC_FLAG_NEGATIVE)
  				dir->exclude = NULL;
  			if (dir->exclude) {
 -				dir->basebuf[stk->baselen] = 0;
  				dir->exclude_stack = stk;
  				return;
  			}
  		}
  
 -		/* Try to read per-directory file unless path is too long */
 -		if (dir->exclude_per_dir &&
 -		    stk->baselen + strlen(dir->exclude_per_dir) < PATH_MAX) {
 -			strcpy(dir->basebuf + stk->baselen,
 -					dir->exclude_per_dir);
 +		/* Try to read per-directory file */
 +		if (dir->exclude_per_dir) {
  			/*
  			 * dir->basebuf gets reused by the traversal, but we
  			 * need fname to remain unchanged to ensure the src
  			 * member of each struct exclude correctly
  			 * back-references its source file.  Other invocations
  			 * of add_exclude_list provide stable strings, so we
 -			 * strdup() and free() here in the caller.
 +			 * strbuf_detach() and free() here in the caller.
  			 */
 -			el->src = strdup(dir->basebuf);
 -			add_excludes_from_file_to_list(dir->basebuf,
 -					dir->basebuf, stk->baselen, el, 1);
 +			struct strbuf sb = STRBUF_INIT;
 +			strbuf_addbuf(&sb, &dir->basebuf);
 +			strbuf_addstr(&sb, dir->exclude_per_dir);
 +			el->src = strbuf_detach(&sb, NULL);
 +			add_excludes_from_file_to_list(el->src, el->src,
 +						       stk->baselen, el, 1);
  		}
  		dir->exclude_stack = stk;
  		current = stk->baselen;
  	}
 -	dir->basebuf[baselen] = '\0';
 +	strbuf_setlen(&dir->basebuf, baselen);
  }
  
  /*
@@@ -1362,7 -1397,8 +1405,7 @@@ static int cmp_name(const void *p1, con
  	const struct dir_entry *e1 = *(const struct dir_entry **)p1;
  	const struct dir_entry *e2 = *(const struct dir_entry **)p2;
  
 -	return cache_name_compare(e1->name, e1->len,
 -				  e2->name, e2->len);
 +	return name_compare(e1->name, e1->len, e2->name, e2->len);
  }
  
  static struct path_simplify *create_simplify(const char **pathspec)
@@@ -1507,16 -1543,12 +1550,16 @@@ int dir_inside_of(const char *subdir, c
  
  int is_inside_dir(const char *dir)
  {
 -	char cwd[PATH_MAX];
 +	char *cwd;
 +	int rc;
 +
  	if (!dir)
  		return 0;
 -	if (!getcwd(cwd, sizeof(cwd)))
 -		die_errno("can't find the current directory");
 -	return dir_inside_of(cwd, dir) >= 0;
 +
 +	cwd = xgetcwd();
 +	rc = (dir_inside_of(cwd, dir) >= 0);
 +	free(cwd);
 +	return rc;
  }
  
  int is_empty_dir(const char *path)
@@@ -1683,5 -1715,4 +1726,5 @@@ void clear_directory(struct dir_struct 
  		free(stk);
  		stk = prev;
  	}
 +	strbuf_release(&dir->basebuf);
  }
diff --combined dir.h
index 6c45e9d4b9,ed336add79..72b73c65dc
--- a/dir.h
+++ b/dir.h
@@@ -15,27 -15,6 +15,27 @@@ struct dir_entry 
  #define EXC_FLAG_MUSTBEDIR 8
  #define EXC_FLAG_NEGATIVE 16
  
 +struct exclude {
 +	/*
 +	 * This allows callers of last_exclude_matching() etc.
 +	 * to determine the origin of the matching pattern.
 +	 */
 +	struct exclude_list *el;
 +
 +	const char *pattern;
 +	int patternlen;
 +	int nowildcardlen;
 +	const char *base;
 +	int baselen;
 +	int flags;
 +
 +	/*
 +	 * Counting starts from 1 for line numbers in ignore files,
 +	 * and from -1 decrementing for patterns from CLI args.
 +	 */
 +	int srcpos;
 +};
 +
  /*
   * Each excludes file will be parsed into a fresh exclude_list which
   * is appended to the relevant exclude_list_group (either EXC_DIRS or
@@@ -53,7 -32,26 +53,7 @@@ struct exclude_list 
  	/* origin of list, e.g. path to filename, or descriptive string */
  	const char *src;
  
 -	struct exclude {
 -		/*
 -		 * This allows callers of last_exclude_matching() etc.
 -		 * to determine the origin of the matching pattern.
 -		 */
 -		struct exclude_list *el;
 -
 -		const char *pattern;
 -		int patternlen;
 -		int nowildcardlen;
 -		const char *base;
 -		int baselen;
 -		int flags;
 -
 -		/*
 -		 * Counting starts from 1 for line numbers in ignore files,
 -		 * and from -1 decrementing for patterns from CLI args.
 -		 */
 -		int srcpos;
 -	} **excludes;
 +	struct exclude **excludes;
  };
  
  /*
@@@ -119,7 -117,7 +119,7 @@@ struct dir_struct 
  	 */
  	struct exclude_stack *exclude_stack;
  	struct exclude *exclude;
 -	char basebuf[PATH_MAX];
 +	struct strbuf basebuf;
  };
  
  /*
@@@ -137,6 -135,7 +137,7 @@@ extern char *common_prefix(const struc
  extern int match_pathspec(const struct pathspec *pathspec,
  			  const char *name, int namelen,
  			  int prefix, char *seen, int is_dir);
+ extern int report_path_error(const char *ps_matched, const struct pathspec *pathspec, const char *prefix);
  extern int within_depth(const char *name, int namelen, int depth, int max_depth);
  
  extern int fill_directory(struct dir_struct *dir, const struct pathspec *pathspec);