Merge branch 'ob/typofixes'

* ob/typofixes:
many small typofixes

diff --combined cache.h
index 3a69638bd919278468e579ca15efbd592eff1399,561b728676f8d63cbd78a15eaa4b2634704215d9..85b544f38d934fe68d1e155c86337f1400eea14d
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -491,7 -491,7 +491,7 @@@ 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 sastisfies GFNM_ONESTAR */
+ #define PATHSPEC_ONESTAR 1    /* the pathspec pattern satisfies GFNM_ONESTAR */
  
  struct pathspec {
        const char **raw; /* get_pathspec() result, not freed by free_pathspec() */
@@@ -577,7 -577,6 +577,7 @@@ extern int assume_unchanged
  extern int prefer_symlink_refs;
  extern int log_all_ref_updates;
  extern int warn_ambiguous_refs;
 +extern int warn_on_object_refname_ambiguity;
  extern int shared_repository;
  extern const char *apply_default_whitespace;
  extern const char *apply_default_ignorewhitespace;
@@@ -1132,7 -1131,6 +1132,7 @@@ extern int unpack_object_header(struct 
  
  struct object_info {
        /* Request */
 +      enum object_type *typep;
        unsigned long *sizep;
        unsigned long *disk_sizep;