Merge branch 'nd/maint-clone-gitdir'

* nd/maint-clone-gitdir:
  clone: allow to clone from .git file
  read_gitfile_gently(): rename misnamed function to read_gitfile()

diff --cc builtin/clone.c
Simple merge

diff --cc cache.h
index 83b1ec13963f9222b9988eacffcac98b95becd82,1abf71505007a9ca8476e24cf1a097c0d9f8b302..607c2ea612889c46e81ae375b6985db18e529a8e
--- 1/cache.h
--- 2/cache.h
+++ b/cache.h
@@@ -435,10 -419,8 +435,10 @@@ extern char *get_object_directory(void)
  extern char *get_index_file(void);
  extern char *get_graft_file(void);
  extern int set_git_dir(const char *path);
 +extern const char *get_git_namespace(void);
 +extern const char *strip_namespace(const char *namespaced_ref);
  extern const char *get_git_work_tree(void);
- extern const char *read_gitfile_gently(const char *path);
+ extern const char *read_gitfile(const char *path);
  extern void set_git_work_tree(const char *tree);
  
  #define ALTERNATE_DB_ENVIRONMENT "GIT_ALTERNATE_OBJECT_DIRECTORIES"

diff --cc environment.c
Simple merge

diff --cc refs.c
Simple merge

diff --cc setup.c
Simple merge

diff --cc submodule.c
Simple merge

diff --cc t/t5601-clone.sh
Simple merge