From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jun 2018 17:18:40 +0000 (-0700)
Subject: Merge branch 'rd/comment-typofix-in-sha1-file'
X-Git-Tag: v2.18.0~23
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1bd0e6779a3d6802826d2dc7b85b0ed009790bb6?hp=2e157d134c5aa88185b3c9af80ff96453ac38e5e

Merge branch 'rd/comment-typofix-in-sha1-file'

In code comment typofix

* rd/comment-typofix-in-sha1-file:
sha1-file.c: correct $GITDIR to $GIT_DIR in a comment
---

diff --git a/sha1-file.c b/sha1-file.c
index 555e780f4b..695e5c6276 100644
--- a/sha1-file.c
+++ b/sha1-file.c
@@ -610,7 +610,7 @@ void add_to_alternates_memory(const char *reference)
 /*
  * Compute the exact path an alternate is at and returns it. In case of
  * error NULL is returned and the human readable error is added to `err`
- * `path` may be relative and should point to $GITDIR.
+ * `path` may be relative and should point to $GIT_DIR.
  * `err` must not be null.
  */
 char *compute_alternate_path(const char *path, struct strbuf *err)