diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-12-20 13:56:14 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-12-20 13:56:14 -0800 |
| commit | aa1cef54a2bcc5350df7efe1d1745725c46bf2e3 (patch) | |
| tree | b8cbf49ff59b92c36de05d08f2dfd32c4aeb538b /cache.h | |
| parent | 1d182bd5f4ec17f2f44ac0ee0d1bf6a25e98761e (diff) | |
| parent | 4363dfbe3d2f3fe3a4bd0fa7e9b22a14532c6cdb (diff) | |
| download | git-aa1cef54a2bcc5350df7efe1d1745725c46bf2e3.tar.gz | |
Merge branch 'jc/clone'
* jc/clone:
Move "no merge candidate" warning into git-pull
Use preprocessor constants for environment variable names.
Do not create $GIT_DIR/remotes/ directory anymore.
Introduce GIT_TEMPLATE_DIR
Revert "fix testsuite: make sure they use templates freshly built from the source"
fix testsuite: make sure they use templates freshly built from the source
git-clone: lose the traditional 'no-separate-remote' layout
git-clone: lose the artificial "first" fetch refspec
git-pull: refuse default merge without branch.*.merge
git-clone: use wildcard specification for tracking branches
Diffstat (limited to 'cache.h')
| -rw-r--r-- | cache.h | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -122,6 +122,10 @@ extern int cache_errno; #define DB_ENVIRONMENT "GIT_OBJECT_DIRECTORY" #define INDEX_ENVIRONMENT "GIT_INDEX_FILE" #define GRAFT_ENVIRONMENT "GIT_GRAFT_FILE" +#define TEMPLATE_DIR_ENVIRONMENT "GIT_TEMPLATE_DIR" +#define CONFIG_ENVIRONMENT "GIT_CONFIG" +#define CONFIG_LOCAL_ENVIRONMENT "GIT_CONFIG_LOCAL" +#define EXEC_PATH_ENVIRONMENT "GIT_EXEC_PATH" extern int is_bare_git_dir(const char *dir); extern const char *get_git_dir(void); |