aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2009-02-10 21:31:33 -0800
committerJunio C Hamano <gitster@pobox.com>2009-02-10 21:32:10 -0800
commit954cfb5cfd17d57b9b31b19b73efe73199407e07 (patch)
treef3baaaf7f25372b96e206b2bc3c8dd3940919433 /cache.h
parentf1c8a48a2de69bfc9837c53f2c52ffbe7239dc3e (diff)
downloadgit-954cfb5cfd17d57b9b31b19b73efe73199407e07.tar.gz
git-954cfb5cfd17d57b9b31b19b73efe73199407e07.tar.xz
Revert "Merge branch 'js/notes'"
This reverts commit 7b75b331f6744fbf953fe8913703378ef86a2189, reversing changes made to 5d680a67d7909c89af96eba4a2d77abed606292b.
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/cache.h b/cache.h
index 7f1a6e8bd..a7f435dde 100644
--- a/cache.h
+++ b/cache.h
@@ -371,8 +371,6 @@ static inline enum object_type object_type(unsigned int mode)
#define GITATTRIBUTES_FILE ".gitattributes"
#define INFOATTRIBUTES_FILE "info/attributes"
#define ATTRIBUTE_MACRO_PREFIX "[attr]"
-#define GIT_NOTES_REF_ENVIRONMENT "GIT_NOTES_REF"
-#define GIT_NOTES_DEFAULT_REF "refs/notes/commits"
extern int is_bare_repository_cfg;
extern int is_bare_repository(void);
@@ -544,7 +542,6 @@ enum rebase_setup_type {
extern enum branch_track git_branch_track;
extern enum rebase_setup_type autorebase;
-extern char *notes_ref_name;
#define GIT_REPO_VERSION 0
extern int repository_format_version;