From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 23 Jan 2017 23:59:19 +0000 (-0800)
Subject: Merge branch 'bw/read-blob-data-does-not-modify-index-state'
X-Git-Tag: v2.12.0-rc0~55
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a06b4c337cbfdf70709d2092ecdcd84f4e20ecb3?hp=-c

Merge branch 'bw/read-blob-data-does-not-modify-index-state'

Code clean-up.

* bw/read-blob-data-does-not-modify-index-state:
index: improve constness for reading blob data
---

a06b4c337cbfdf70709d2092ecdcd84f4e20ecb3
diff --combined cache.h
index 40f7ddd247,ef89eb4a0f..00a029af36
--- a/cache.h
+++ b/cache.h
@@@ -514,6 -514,7 +514,6 @@@ extern void set_git_work_tree(const cha
  
  #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"
  
 -extern const char **get_pathspec(const char *prefix, const char **pathspec);
  extern void setup_work_tree(void);
  extern const char *setup_git_directory_gently(int *);
  extern const char *setup_git_directory(void);
@@@ -598,7 -599,7 +598,7 @@@ extern int chmod_index_entry(struct ind
  extern int ce_same_name(const struct cache_entry *a, const struct cache_entry *b);
  extern void set_object_name_for_intent_to_add_entry(struct cache_entry *ce);
  extern int index_name_is_other(const struct index_state *, const char *, int);
- extern void *read_blob_data_from_index(struct index_state *, const char *, unsigned long *);
+ extern void *read_blob_data_from_index(const struct index_state *, const char *, unsigned long *);
  
  /* do stat comparison even if CE_VALID is true */
  #define CE_MATCH_IGNORE_VALID		01
@@@ -1063,11 -1064,8 +1063,11 @@@ static inline int is_absolute_path(cons
  	return is_dir_sep(path[0]) || has_dos_drive_prefix(path);
  }
  int is_directory(const char *);
 +char *strbuf_realpath(struct strbuf *resolved, const char *path,
 +		      int die_on_error);
  const char *real_path(const char *path);
  const char *real_path_if_valid(const char *path);
 +char *real_pathdup(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);
@@@ -1693,8 -1691,6 +1693,8 @@@ extern int git_default_config(const cha
  extern int git_config_from_file(config_fn_t fn, const char *, void *);
  extern int git_config_from_mem(config_fn_t fn, const enum config_origin_type,
  					const char *name, const char *buf, size_t len, void *data);
 +extern int git_config_from_blob_sha1(config_fn_t fn, const char *name,
 +				     const unsigned char *sha1, void *data);
  extern void git_config_push_parameter(const char *text);
  extern int git_config_from_parameters(config_fn_t fn, void *data);
  extern void git_config(config_fn_t fn, void *);