From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 12 Aug 2016 16:47:37 +0000 (-0700)
Subject: Merge branch 'vs/typofix'
X-Git-Tag: v2.10.0-rc0~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e6b8f80653063cd41903c599ec9ca83be3d3afa5?ds=inline;hp=-c

Merge branch 'vs/typofix'

* vs/typofix:
Spelling fixes
---

e6b8f80653063cd41903c599ec9ca83be3d3afa5
diff --combined commit-slab.h
index 006a50b548,be16da7728..42d16dcded
--- a/commit-slab.h
+++ b/commit-slab.h
@@@ -8,7 -8,7 +8,7 @@@
   *
   * After including this header file, using:
   *
-  * define_commit_slab(indegee, int);
+  * define_commit_slab(indegree, int);
   *
   * will let you call the following functions:
   *
@@@ -126,16 -126,16 +126,16 @@@ static MAYBE_UNUSED elemtype *slabname#
  	return slabname##_at_peek(s, c, 0);				\
  }									\
  									\
 -static int stat_ ##slabname## realloc
 +struct slabname
  
  /*
 - * Note that this seemingly redundant second declaration is required
 + * Note that this redundant forward declaration is required
   * to allow a terminating semicolon, which makes instantiations look
   * like function declarations.  I.e., the expansion of
   *
   *    define_commit_slab(indegree, int);
   *
 - * ends in 'static int stat_indegreerealloc;'.  This would otherwise
 + * ends in 'struct indegree;'.  This would otherwise
   * be a syntax error according (at least) to ISO C.  It's hard to
   * catch because GCC silently parses it by default.
   */
diff --combined sha1_file.c
index 02940f1920,7026e4ba78..3045aeabda
--- a/sha1_file.c
+++ b/sha1_file.c
@@@ -791,7 -791,7 +791,7 @@@ void close_all_packs(void
  
  	for (p = packed_git; p; p = p->next)
  		if (p->do_not_close)
 -			die("BUG! Want to close pack marked 'do-not-close'");
 +			die("BUG: want to close pack marked 'do-not-close'");
  		else
  			close_pack(p);
  }
@@@ -1692,7 -1692,7 +1692,7 @@@ static int parse_sha1_header_extended(c
  		strbuf_add(oi->typename, type_buf, type_len);
  	/*
  	 * Set type to 0 if its an unknown object and
- 	 * we're obtaining the type using '--allow-unkown-type'
+ 	 * we're obtaining the type using '--allow-unknown-type'
  	 * option.
  	 */
  	if ((flags & LOOKUP_UNKNOWN_OBJECT) && (type < 0))
@@@ -2306,7 -2306,7 +2306,7 @@@ void *unpack_entry(struct packed_git *p
  	case OBJ_OFS_DELTA:
  	case OBJ_REF_DELTA:
  		if (data)
 -			die("BUG in unpack_entry: left loop at a valid delta");
 +			die("BUG: unpack_entry: left loop at a valid delta");
  		break;
  	case OBJ_COMMIT:
  	case OBJ_TREE: