From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Apr 2015 19:12:23 +0000 (-0700)
Subject: Merge branch 'pt/enter-repo-comment-fix' into maint
X-Git-Tag: v2.3.6~3
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/42b2f894a0237e3b393770330dba995e731ec7ad?hp=1c30f8efa4ce4e9f5a3a41bf0236fe5baf2b6063

Merge branch 'pt/enter-repo-comment-fix' into maint

Documentation update.

* pt/enter-repo-comment-fix:
enter_repo(): fix docs to match code
---

diff --git a/path.c b/path.c
index e608993801..595da81ca6 100644
--- a/path.c
+++ b/path.c
@@ -303,14 +303,9 @@ char *expand_user_path(const char *path)
  * (3) "relative/path" to mean cwd relative directory; or
  * (4) "/absolute/path" to mean absolute directory.
  *
- * Unless "strict" is given, we try access() for existence of "%s.git/.git",
- * "%s/.git", "%s.git", "%s" in this order.  The first one that exists is
- * what we try.
- *
- * Second, we try chdir() to that.  Upon failure, we return NULL.
- *
- * Then, we try if the current directory is a valid git repository.
- * Upon failure, we return NULL.
+ * Unless "strict" is given, we check "%s/.git", "%s", "%s.git/.git", "%s.git"
+ * in this order. We select the first one that is a valid git repository, and
+ * chdir() to it. If none match, or we fail to chdir, we return NULL.
  *
  * If all goes well, we return the directory we used to chdir() (but
  * before ~user is expanded), avoiding getcwd() resolving symbolic