Merge branch 'lp/typofixes' into maint
authorJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:21 +0000 (13:17 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 26 May 2016 20:17:21 +0000 (13:17 -0700)
Typofixes.

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

1  2 
path.c
diff --combined path.c
index bbaea5ab0bf73056dfa74063474f62685fda1d5e,a5e953f2dae0b51e6b3410275ea95d126360d13c..503766784c4c0c1be71edacbaae6ec4bd698ee8d
--- 1/path.c
--- 2/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;