Merge branch 'maint'

* maint:
  setup: document prefix

1 files changed, 6 insertions, 0 deletions

diff --git a/setup.c b/setup.c
index 5a083fa77d..7e0460205d 100644
--- a/setup.c
+++ b/setup.c
@@ -546,6 +546,12 @@ int check_repository_format(void)
 	return check_repository_format_gently(NULL);
 }
 
+/*
+ * Returns the "prefix", a path to the current working directory
+ * relative to the work tree root, or NULL, if the current working
+ * directory is not a strict subdirectory of the work tree root. The
+ * prefix always ends with a '/' character.
+ */
 const char *setup_git_directory(void)
 {
 	const char *retval = setup_git_directory_gently(NULL);