From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 1 Aug 2013 18:58:32 +0000 (-0700)
Subject: Merge branch 'ob/typofixes'
X-Git-Tag: v1.8.4-rc1~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d50cb7569cfb6e04ba48900821618d28012f334e?ds=inline;hp=-c

Merge branch 'ob/typofixes'

* ob/typofixes:
many small typofixes
---

d50cb7569cfb6e04ba48900821618d28012f334e
diff --combined cache.h
index 3a69638bd9,561b728676..85b544f38d
--- a/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;