From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 29 Aug 2011 04:20:28 +0000 (-0700)
Subject: Merge branch 'nd/maint-clone-gitdir'
X-Git-Tag: v1.7.7-rc1~35
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2730f55527143d3476c159cebbdb63d5e6a5c2a8;p=git.git

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()
---

2730f55527143d3476c159cebbdb63d5e6a5c2a8
diff --cc cache.h
index 83b1ec139,1abf71505..607c2ea61
--- a/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"