Merge branch 'maint'

* maint:
  fix usage string for git grep
  refresh-index: fix bitmask assignment

Conflicts:
	builtin-grep.c

diff --combined builtin-grep.c
index 7bf6a7156cdd8e236d451b9be4d4754c2c517e66,d8b06ce810d334654ada4b7fa3b79c19a4787565..631129ddfd0ffe06f919882d22cfc494d9553f50
--- 1/builtin-grep.c
--- 2/builtin-grep.c
+++ b/builtin-grep.c
@@@ -498,7 -498,7 +498,7 @@@ static int grep_object(struct grep_opt 
  }
  
  static const char builtin_grep_usage[] =
- "git grep <option>* <rev>* [-e] <pattern> [<path>...]";
 -"git-grep <option>* [-e] <pattern> <rev>* [[--] <path>...]";
++"git grep <option>* [-e] <pattern> <rev>* [[--] <path>...]";
  
  static const char emsg_invalid_context_len[] =
  "%s: invalid context length argument";

diff --combined cache.h
index a779d9207c8ea4d4e8455a89b17f312e0e71332d,9735b66e5ed47a0006c5b1036eff90847eeb3818..305e2f701bd4fe3cbfb5a7cb37e75b73b67ee222
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -254,7 -254,6 +254,7 @@@ static inline void remove_name_hash(str
  
  #define read_cache() read_index(&the_index)
  #define read_cache_from(path) read_index_from(&the_index, (path))
 +#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)
@@@ -299,8 -298,8 +299,8 @@@ static inline enum object_type object_t
  #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE"
  #define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR"
  #define CONFIG_ENVIRONMENT "GIT_CONFIG"
 -#define CONFIG_LOCAL_ENVIRONMENT "GIT_CONFIG_LOCAL"
  #define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH"
 +#define CEILING_DIRECTORIES_ENVIRONMENT "GIT_CEILING_DIRECTORIES"
  #define GITATTRIBUTES_FILE ".gitattributes"
  #define INFOATTRIBUTES_FILE "info/attributes"
  #define ATTRIBUTE_MACRO_PREFIX "[attr]"
@@@ -312,6 -311,7 +312,6 @@@ extern char *git_work_tree_cfg
  extern int is_inside_work_tree(void);
  extern const char *get_git_dir(void);
  extern char *get_object_directory(void);
 -extern char *get_refs_directory(void);
  extern char *get_index_file(void);
  extern char *get_graft_file(void);
  extern int set_git_dir(const char *path);
@@@ -357,7 -357,6 +357,7 @@@ extern int init_db(const char *template
  /* Initialize and use the cache information */
  extern int read_index(struct index_state *);
  extern int read_index_from(struct index_state *, const char *path);
 +extern int read_index_unmerged(struct index_state *);
  extern int write_index(const struct index_state *, int newfd);
  extern int discard_index(struct index_state *);
  extern int unmerged_index(const struct index_state *);
@@@ -397,7 -396,7 +397,7 @@@ extern void fill_stat_cache_info(struc
  #define REFRESH_UNMERGED      0x0002  /* allow unmerged */
  #define REFRESH_QUIET         0x0004  /* be quiet about it */
  #define REFRESH_IGNORE_MISSING        0x0008  /* ignore non-existent */
- #define REFRESH_IGNORE_SUBMODULES     0x0008  /* ignore submodules */
+ #define REFRESH_IGNORE_SUBMODULES     0x0010  /* ignore submodules */
  extern int refresh_index(struct index_state *, unsigned int flags, const char **pathspec, char *seen);
  
  struct lock_file {
@@@ -436,7 -435,6 +436,7 @@@ extern size_t packed_git_window_size
  extern size_t packed_git_limit;
  extern size_t delta_base_cache_limit;
  extern int auto_crlf;
 +extern int fsync_object_files;
  
  enum safe_crlf {
        SAFE_CRLF_FALSE = 0,
@@@ -524,13 -522,11 +524,13 @@@ int safe_create_leading_directories_con
  char *enter_repo(char *path, int strict);
  static inline int is_absolute_path(const char *path)
  {
 -      return path[0] == '/';
 +      return path[0] == '/' || has_dos_drive_prefix(path);
  }
  const char *make_absolute_path(const char *path);
  const char *make_nonrelative_path(const char *path);
  const char *make_relative_path(const char *abs, const char *base);
 +int normalize_absolute_path(char *buf, const char *path);
 +int longest_ancestor_length(const char *path, const char *prefix_list);
  
  /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
  extern int sha1_object_info(const unsigned char *, unsigned long *);
@@@ -540,9 -536,6 +540,9 @@@ extern int write_sha1_file(void *buf, u
  extern int pretend_sha1_file(void *, unsigned long, enum object_type, unsigned char *);
  extern int force_object_loose(const unsigned char *sha1, time_t mtime);
  
 +/* just like read_sha1_file(), but non fatal in presence of bad objects */
 +extern void *read_object(const unsigned char *sha1, enum object_type *type, unsigned long *size);
 +
  extern int check_sha1_signature(const unsigned char *sha1, void *buf, unsigned long size, const char *type);
  
  extern int move_temp_to_file(const char *tmpfile, const char *filename);
@@@ -650,8 -643,6 +650,8 @@@ extern struct packed_git 
        const void *index_data;
        size_t index_size;
        uint32_t num_objects;
 +      uint32_t num_bad_objects;
 +      unsigned char *bad_object_sha1;
        int index_version;
        time_t mtime;
        int pack_fd;
@@@ -720,7 -711,6 +720,7 @@@ extern void close_pack_windows(struct p
  extern void unuse_pack(struct pack_window **);
  extern struct packed_git *add_packed_git(const char *, int, int);
  extern const unsigned char *nth_packed_object_sha1(struct packed_git *, uint32_t);
 +extern off_t nth_packed_object_offset(const struct packed_git *, uint32_t);
  extern off_t find_pack_entry_one(const unsigned char *, struct packed_git *);
  extern void *unpack_entry(struct packed_git *, off_t, enum object_type *, unsigned long *);
  extern unsigned long unpack_object_header_gently(const unsigned char *buf, unsigned long len, enum object_type *type, unsigned long *sizep);
@@@ -747,10 -737,10 +747,10 @@@ extern int git_config_set_multivar(cons
  extern int git_config_rename_section(const char *, const char *);
  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 int git_config_system(void);
  extern int git_config_global(void);
  extern int config_error_nonbool(const char *);
 +extern const char *config_exclusive_filename;
  
  #define MAX_GITNAME (1000)
  extern char git_default_email[MAX_GITNAME];
@@@ -827,11 -817,11 +827,11 @@@ void shift_tree(const unsigned char *, 
  extern unsigned whitespace_rule_cfg;
  extern unsigned whitespace_rule(const char *);
  extern unsigned parse_whitespace_rule(const char *);
 -extern unsigned check_and_emit_line(const char *line, int len, unsigned ws_rule,
 -    FILE *stream, const char *set,
 -    const char *reset, const char *ws);
 +extern unsigned ws_check(const char *line, int len, unsigned ws_rule);
 +extern void ws_check_emit(const char *line, int len, unsigned ws_rule, FILE *stream, const char *set, const char *reset, const char *ws);
  extern char *whitespace_error_string(unsigned ws);
  extern int ws_fix_copy(char *, const char *, int, unsigned, int *);
 +extern int ws_blank_line(const char *line, int len, unsigned ws_rule);
  
  /* ls-files */
  int pathspec_match(const char **spec, char *matched, const char *filename, int skiplen);
@@@ -839,6 -829,5 +839,6 @@@ int report_path_error(const char *ps_ma
  void overlay_tree_on_cache(const char *tree_name, const char *prefix);
  
  char *alias_lookup(const char *alias);
 +int split_cmdline(char *cmdline, const char ***argv);
  
  #endif /* CACHE_H */