From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 30 Oct 2013 19:10:56 +0000 (-0700)
Subject: Merge branch 'nd/lift-path-max'
X-Git-Tag: v1.8.5-rc0~4
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/c02e1e4a079dd8c3cd7ec21e82403867ebf22c19?ds=inline;hp=-c

Merge branch 'nd/lift-path-max'

* nd/lift-path-max:
checkout_entry(): clarify the use of topath[] parameter
entry.c: convert checkout_entry to use strbuf
---

c02e1e4a079dd8c3cd7ec21e82403867ebf22c19
diff --combined builtin/checkout-index.c
index 69e167b16c,4ed6b23954..61e75eb60c
--- a/builtin/checkout-index.c
+++ b/builtin/checkout-index.c
@@@ -14,7 -14,7 +14,7 @@@
  static int line_termination = '\n';
  static int checkout_stage; /* default to checkout stage0 */
  static int to_tempfile;
- static char topath[4][PATH_MAX + 1];
+ static char topath[4][TEMPORARY_FILENAME_LENGTH + 1];
  
  static struct checkout state;
  
@@@ -183,12 -183,12 +183,12 @@@ int cmd_checkout_index(int argc, const 
  	int prefix_length;
  	int force = 0, quiet = 0, not_new = 0;
  	struct option builtin_checkout_index_options[] = {
 -		OPT_BOOLEAN('a', "all", &all,
 +		OPT_BOOL('a', "all", &all,
  			N_("check out all files in the index")),
  		OPT__FORCE(&force, N_("force overwrite of existing files")),
  		OPT__QUIET(&quiet,
  			N_("no warning for existing files and files not in index")),
 -		OPT_BOOLEAN('n', "no-create", &not_new,
 +		OPT_BOOL('n', "no-create", &not_new,
  			N_("don't checkout new files")),
  		{ OPTION_CALLBACK, 'u', "index", &newfd, NULL,
  			N_("update stat information in the index file"),
@@@ -196,9 -196,9 +196,9 @@@
  		{ OPTION_CALLBACK, 'z', NULL, NULL, NULL,
  			N_("paths are separated with NUL character"),
  			PARSE_OPT_NOARG, option_parse_z },
 -		OPT_BOOLEAN(0, "stdin", &read_from_stdin,
 +		OPT_BOOL(0, "stdin", &read_from_stdin,
  			N_("read list of paths from the standard input")),
 -		OPT_BOOLEAN(0, "temp", &to_tempfile,
 +		OPT_BOOL(0, "temp", &to_tempfile,
  			N_("write the content to temporary files")),
  		OPT_CALLBACK(0, "prefix", NULL, N_("string"),
  			N_("when creating files, prepend <string>"),
diff --combined cache.h
index 70ad174dd9,3118b7fc99..9aa46e70c3
--- a/cache.h
+++ b/cache.h
@@@ -101,9 -101,9 +101,9 @@@ unsigned long git_deflate_bound(git_zst
  
  #define CACHE_SIGNATURE 0x44495243	/* "DIRC" */
  struct cache_header {
 -	unsigned int hdr_signature;
 -	unsigned int hdr_version;
 -	unsigned int hdr_entries;
 +	uint32_t hdr_signature;
 +	uint32_t hdr_version;
 +	uint32_t hdr_entries;
  };
  
  #define INDEX_FORMAT_LB 2
@@@ -115,8 -115,8 +115,8 @@@
   * check it for equality in the 32 bits we save.
   */
  struct cache_time {
 -	unsigned int sec;
 -	unsigned int nsec;
 +	uint32_t sec;
 +	uint32_t nsec;
  };
  
  struct stat_data {
@@@ -189,8 -189,6 +189,8 @@@ struct cache_entry 
  #error "CE_EXTENDED_FLAGS out of range"
  #endif
  
 +struct pathspec;
 +
  /*
   * Copy the sha1 and stat state of a cache entry from one to
   * another. But we never change the name, or the hash state!
@@@ -314,8 -312,6 +314,8 @@@ extern void free_name_hash(struct index
  #define refresh_cache(flags) refresh_index(&the_index, (flags), NULL, NULL, NULL)
  #define ce_match_stat(ce, st, options) ie_match_stat(&the_index, (ce), (st), (options))
  #define ce_modified(ce, st, options) ie_modified(&the_index, (ce), (st), (options))
 +#define cache_dir_exists(name, namelen) index_dir_exists(&the_index, (name), (namelen))
 +#define cache_file_exists(name, namelen, igncase) index_file_exists(&the_index, (name), (namelen), (igncase))
  #define cache_name_exists(name, namelen, igncase) index_name_exists(&the_index, (name), (namelen), (igncase))
  #define cache_name_is_other(name, namelen) index_name_is_other(&the_index, (name), (namelen))
  #define resolve_undo_clear() resolve_undo_clear_index(&the_index)
@@@ -369,9 -365,6 +369,9 @@@ static inline enum object_type object_t
  #define GIT_NOTES_REWRITE_REF_ENVIRONMENT "GIT_NOTES_REWRITE_REF"
  #define GIT_NOTES_REWRITE_MODE_ENVIRONMENT "GIT_NOTES_REWRITE_MODE"
  #define GIT_LITERAL_PATHSPECS_ENVIRONMENT "GIT_LITERAL_PATHSPECS"
 +#define GIT_GLOB_PATHSPECS_ENVIRONMENT "GIT_GLOB_PATHSPECS"
 +#define GIT_NOGLOB_PATHSPECS_ENVIRONMENT "GIT_NOGLOB_PATHSPECS"
 +#define GIT_ICASE_PATHSPECS_ENVIRONMENT "GIT_ICASE_PATHSPECS"
  
  /*
   * This environment variable is expected to contain a boolean indicating
@@@ -419,7 -412,6 +419,7 @@@ extern void setup_work_tree(void)
  extern const char *setup_git_directory_gently(int *);
  extern const char *setup_git_directory(void);
  extern char *prefix_path(const char *prefix, int len, const char *path);
 +extern char *prefix_path_gently(const char *prefix, int len, int *remaining, const char *path);
  extern const char *prefix_filename(const char *prefix, int len, const char *path);
  extern int check_filename(const char *prefix, const char *name);
  extern void verify_filename(const char *prefix,
@@@ -457,7 -449,7 +457,7 @@@ extern void sanitize_stdfds(void)
  
  /* Initialize and use the cache information */
  extern int read_index(struct index_state *);
 -extern int read_index_preload(struct index_state *, const char **pathspec);
 +extern int read_index_preload(struct index_state *, const struct pathspec *pathspec);
  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 *);
@@@ -465,8 -457,6 +465,8 @@@ extern int write_index(struct index_sta
  extern int discard_index(struct index_state *);
  extern int unmerged_index(const struct index_state *);
  extern int verify_path(const char *path);
 +extern struct cache_entry *index_dir_exists(struct index_state *istate, const char *name, int namelen);
 +extern struct cache_entry *index_file_exists(struct index_state *istate, const char *name, int namelen, int igncase);
  extern struct cache_entry *index_name_exists(struct index_state *istate, const char *name, int namelen, int igncase);
  extern int index_name_pos(const struct index_state *, const char *name, int namelen);
  #define ADD_CACHE_OK_TO_ADD 1		/* Ok to add */
@@@ -501,8 -491,28 +501,8 @@@ extern void *read_blob_data_from_index(
  extern int ie_match_stat(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
  extern int ie_modified(const struct index_state *, const struct cache_entry *, struct stat *, unsigned int);
  
 -#define PATHSPEC_ONESTAR 1	/* the pathspec pattern satisfies GFNM_ONESTAR */
 -
 -struct pathspec {
 -	const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
 -	int nr;
 -	unsigned int has_wildcard:1;
 -	unsigned int recursive:1;
 -	int max_depth;
 -	struct pathspec_item {
 -		const char *match;
 -		int len;
 -		int nowildcard_len;
 -		int flags;
 -	} *items;
 -};
 -
 -extern int init_pathspec(struct pathspec *, const char **);
 -extern void free_pathspec(struct pathspec *);
  extern int ce_path_match(const struct cache_entry *ce, const struct pathspec *pathspec);
  
 -extern int limit_pathspec_to_literal(void);
 -
  #define HASH_WRITE_OBJECT 1
  #define HASH_FORMAT_CHECK 2
  extern int index_fd(unsigned char *sha1, int fd, struct stat *st, enum object_type type, const char *path, unsigned flags);
@@@ -530,7 -540,7 +530,7 @@@ extern void fill_stat_cache_info(struc
  #define REFRESH_IGNORE_MISSING	0x0008	/* ignore non-existent */
  #define REFRESH_IGNORE_SUBMODULES	0x0010	/* ignore submodules */
  #define REFRESH_IN_PORCELAIN	0x0020	/* user friendly output, not "needs update" */
 -extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen, const char *header_msg);
 +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;
@@@ -751,9 -761,7 +751,9 @@@ int is_directory(const char *)
  const char *real_path(const char *path);
  const char *real_path_if_valid(const char *path);
  const char *absolute_path(const char *path);
 +const char *remove_leading_path(const char *in, const char *prefix);
  const char *relative_path(const char *in, const char *prefix, struct strbuf *sb);
 +int normalize_path_copy_len(char *dst, const char *src, int *prefix_len);
  int normalize_path_copy(char *dst, const char *src);
  int longest_ancestor_length(const char *path, struct string_list *prefixes);
  char *strip_path_suffix(const char *path, const char *suffix);
@@@ -885,7 -893,7 +885,7 @@@ extern char *resolve_refdup(const char 
  
  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);
 -extern int interpret_branch_name(const char *str, struct strbuf *);
 +extern int interpret_branch_name(const char *str, int len, struct strbuf *);
  extern int get_sha1_mb(const char *str, unsigned char *sha1);
  
  extern int refname_match(const char *abbrev_name, const char *full_name, const char **rules);
@@@ -958,15 -966,6 +958,15 @@@ struct ident_split 
   */
  extern int split_ident_line(struct ident_split *, const char *, int);
  
 +/*
 + * Compare split idents for equality or strict ordering. Note that we
 + * compare only the ident part of the line, ignoring any timestamp.
 + *
 + * Because there are two fields, we must choose one as the primary key; we
 + * currently arbitrarily pick the email.
 + */
 +extern int ident_cmp(const struct ident_split *, const struct ident_split *);
 +
  struct checkout {
  	const char *base_dir;
  	int base_dir_len;
@@@ -976,6 -975,7 +976,7 @@@
  		 refresh_cache:1;
  };
  
+ #define TEMPORARY_FILENAME_LENGTH 25
  extern int checkout_entry(struct cache_entry *ce, const struct checkout *state, char *topath);
  
  struct cache_def {
@@@ -1039,6 -1039,68 +1040,6 @@@ struct pack_entry 
  	struct packed_git *p;
  };
  
 -struct ref {
 -	struct ref *next;
 -	unsigned char old_sha1[20];
 -	unsigned char new_sha1[20];
 -	char *symref;
 -	unsigned int
 -		force:1,
 -		forced_update:1,
 -		deletion:1,
 -		matched:1;
 -
 -	/*
 -	 * Order is important here, as we write to FETCH_HEAD
 -	 * in numeric order. And the default NOT_FOR_MERGE
 -	 * should be 0, so that xcalloc'd structures get it
 -	 * by default.
 -	 */
 -	enum {
 -		FETCH_HEAD_MERGE = -1,
 -		FETCH_HEAD_NOT_FOR_MERGE = 0,
 -		FETCH_HEAD_IGNORE = 1
 -	} fetch_head_status;
 -
 -	enum {
 -		REF_STATUS_NONE = 0,
 -		REF_STATUS_OK,
 -		REF_STATUS_REJECT_NONFASTFORWARD,
 -		REF_STATUS_REJECT_ALREADY_EXISTS,
 -		REF_STATUS_REJECT_NODELETE,
 -		REF_STATUS_REJECT_FETCH_FIRST,
 -		REF_STATUS_REJECT_NEEDS_FORCE,
 -		REF_STATUS_UPTODATE,
 -		REF_STATUS_REMOTE_REJECT,
 -		REF_STATUS_EXPECTING_REPORT
 -	} status;
 -	char *remote_status;
 -	struct ref *peer_ref; /* when renaming */
 -	char name[FLEX_ARRAY]; /* more */
 -};
 -
 -#define REF_NORMAL	(1u << 0)
 -#define REF_HEADS	(1u << 1)
 -#define REF_TAGS	(1u << 2)
 -
 -extern struct ref *find_ref_by_name(const struct ref *list, const char *name);
 -
 -#define CONNECT_VERBOSE       (1u << 0)
 -extern struct child_process *git_connect(int fd[2], const char *url, const char *prog, int flags);
 -extern int finish_connect(struct child_process *conn);
 -extern int git_connection_is_socket(struct child_process *conn);
 -struct extra_have_objects {
 -	int nr, alloc;
 -	unsigned char (*array)[20];
 -};
 -extern struct ref **get_remote_heads(int in, char *src_buf, size_t src_len,
 -				     struct ref **list, unsigned int flags,
 -				     struct extra_have_objects *);
 -extern int server_supports(const char *feature);
 -extern int parse_feature_request(const char *features, const char *feature);
 -extern const char *server_feature_value(const char *feature, int *len_ret);
 -extern const char *parse_feature_value(const char *feature_list, const char *feature, int *len_ret);
 -
  extern struct packed_git *parse_pack_index(unsigned char *sha1, const char *idx_path);
  
  /* A hook for count-objects to report invalid files in pack directory */
@@@ -1129,7 -1191,6 +1130,7 @@@ extern int git_config_with_options(conf
  extern int git_config_early(config_fn_t fn, void *, const char *repo_config);
  extern int git_parse_ulong(const char *, unsigned long *);
  extern int git_config_int(const char *, const char *);
 +extern int64_t git_config_int64(const char *, const char *);
  extern unsigned long git_config_ulong(const char *, const char *);
  extern int git_config_bool_or_int(const char *, const char *, int *);
  extern int git_config_bool(const char *, const char *);
@@@ -1245,7 -1306,7 +1246,7 @@@ void packet_trace_identity(const char *
   * return 0 if success, 1 - if addition of a file failed and
   * ADD_FILES_IGNORE_ERRORS was specified in flags
   */
 -int add_files_to_cache(const char *prefix, const char **pathspec, int flags);
 +int add_files_to_cache(const char *prefix, const struct pathspec *pathspec, int flags);
  
  /* diff.c */
  extern int diff_auto_refresh_index;
@@@ -1279,7 -1340,7 +1280,7 @@@ 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 char **pathspec, const char *prefix);
 +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);