From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 26 May 2016 20:17:21 +0000 (-0700)
Subject: Merge branch 'lp/typofixes' into maint
X-Git-Tag: v2.9.0-rc1~12^2~7
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/d07211b5faefc9d94fe776cd5b50682544ad3257?ds=inline;hp=-c

Merge branch 'lp/typofixes' into maint

Typofixes.

* lp/typofixes:
typofix: assorted typofixes in comments, documentation and messages
---

d07211b5faefc9d94fe776cd5b50682544ad3257
diff --combined path.c
index bbaea5ab0b,a5e953f2da..503766784c
--- a/path.c
+++ b/path.c
@@@ -134,7 -134,7 +134,7 @@@ static struct common_dir common_list[] 
   * definite
   * definition
   *
-  * The trie would look look like:
+  * The trie would look like:
   * root: len = 0, children a and d non-NULL, value = NULL.
   *    a: len = 2, contents = bc, value = (data for "abc")
   *    d: len = 2, contents = ef, children i non-NULL, value = (data for "def")
@@@ -702,17 -702,17 +702,17 @@@ static int calc_shared_perm(int mode
  {
  	int tweak;
  
 -	if (shared_repository < 0)
 -		tweak = -shared_repository;
 +	if (get_shared_repository() < 0)
 +		tweak = -get_shared_repository();
  	else
 -		tweak = shared_repository;
 +		tweak = get_shared_repository();
  
  	if (!(mode & S_IWUSR))
  		tweak &= ~0222;
  	if (mode & S_IXUSR)
  		/* Copy read bits to execute bits */
  		tweak |= (tweak & 0444) >> 2;
 -	if (shared_repository < 0)
 +	if (get_shared_repository() < 0)
  		mode = (mode & ~0777) | tweak;
  	else
  		mode |= tweak;
@@@ -725,7 -725,7 +725,7 @@@ int adjust_shared_perm(const char *path
  {
  	int old_mode, new_mode;
  
 -	if (!shared_repository)
 +	if (!get_shared_repository())
  		return 0;
  	if (get_st_mode_bits(path, &old_mode) < 0)
  		return -1;