Merge branch 'jc/typo'

* jc/typo:
Typofixes outside documentation area

diff --combined diff.c
index 68def6caed876669d38f1baafc5a0cd6318ab16a,9038057a76bcda8eeab42ba133cae0bf5d1e6571..989dbc54cbb31c095cc45fb5bb74f62077f1c635
--- 1/diff.c
--- 2/diff.c
+++ b/diff.c
@@@ -2893,8 -2893,6 +2893,8 @@@ int diff_opt_parse(struct diff_options 
                ;
        else if (!prefixcmp(arg, "--output=")) {
                options->file = fopen(arg + strlen("--output="), "w");
 +              if (!options->file)
 +                      die_errno("Could not open '%s'", arg + strlen("--output="));
                options->close_file = 1;
        } else
                return 0;
@@@ -3644,7 -3642,7 +3644,7 @@@ static void diffcore_skip_stat_unmatch(
                struct diff_filepair *p = q->queue[i];
  
                /*
-                * 1. Entries that come from stat info dirtyness
+                * 1. Entries that come from stat info dirtiness
                 *    always have both sides (iow, not create/delete),
                 *    one side of the object name is unknown, with
                 *    the same mode and size.  Keep the ones that

diff --combined path.c
index 0005df3a5faad038b1d3af07585faaf1e8d59de4,e166d5380e47a7f6560f504de6550a508de1e170..d1fccbde7f5ba08ba9876b12e1dbabf87f44b4e9
--- 1/path.c
--- 2/path.c
+++ b/path.c
@@@ -336,7 -336,7 +336,7 @@@ char *enter_repo(char *path, int strict
  
        if (access("objects", X_OK) == 0 && access("refs", X_OK) == 0 &&
            validate_headref("HEAD") == 0) {
 -              setenv(GIT_DIR_ENVIRONMENT, ".", 1);
 +              set_git_dir(".");
                check_repository_format();
                return path;
        }
@@@ -610,7 -610,7 +610,7 @@@ int daemon_avoid_alias(const char *p
        /*
         * This resurrects the belts and suspenders paranoia check by HPA
         * done in <435560F7.4080006@zytor.com> thread, now enter_repo()
-        * does not do getcwd() based path canonicalizations.
+        * does not do getcwd() based path canonicalization.
         *
         * sl becomes true immediately after seeing '/' and continues to
         * be true as long as dots continue after that without intervening

diff --combined setup.c
index b38cbee145e8f3aa13d79cd80640841ec2fb350e,fac34f77a7800193e636f49c799908f629540de1..0717a98d16b8be3cb70b33b6dea7040694130a0b
--- 1/setup.c
--- 2/setup.c
+++ b/setup.c
@@@ -206,7 -206,7 +206,7 @@@ int is_inside_work_tree(void
  }
  
  /*
-  * set_work_tree() is only ever called if you set GIT_DIR explicitely.
+  * set_work_tree() is only ever called if you set GIT_DIR explicitly.
   * The old behaviour (which we retain here) is to set the work tree root
   * to the cwd, unless overridden by the config, the command line, or
   * GIT_WORK_TREE.
@@@ -404,9 -404,9 +404,9 @@@ const char *setup_git_directory_gently(
                                inside_work_tree = 0;
                        if (offset != len) {
                                cwd[offset] = '\0';
 -                              setenv(GIT_DIR_ENVIRONMENT, cwd, 1);
 +                              set_git_dir(cwd);
                        } else
 -                              setenv(GIT_DIR_ENVIRONMENT, ".", 1);
 +                              set_git_dir(".");
                        check_repository_format_gently(nongit_ok);
                        return NULL;
                }