aboutsummaryrefslogtreecommitdiff
path: root/cache.h
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2007-01-11 16:47:34 -0800
committerJunio C Hamano <junkio@cox.net>2007-01-11 16:47:34 -0800
commitc388761c153bc3e874e75f69ff77430164c038c4 (patch)
treecaacf48f2cdb1878ec7f4fe03c957c6d482738b9 /cache.h
parent4d229653ab5eda48f7b7c83cb2a876b48a41ffd4 (diff)
parentbfbbb8f8cf8250718ffd028efe179557d29ae72d (diff)
downloadgit-c388761c153bc3e874e75f69ff77430164c038c4.tar.gz
git-c388761c153bc3e874e75f69ff77430164c038c4.tar.xz
Merge branch 'jc/detached-head'
* jc/detached-head: git-checkout: handle local changes sanely when detaching HEAD git-checkout: safety check for detached HEAD checks existing refs git-checkout: fix branch name output from the command git-checkout: safety when coming back from the detached HEAD state. git-checkout: rewording comments regarding detached HEAD. git-checkout: do not warn detaching HEAD when it is already detached. Detached HEAD (experimental) git-branch: show detached HEAD git-status: show detached HEAD
Diffstat (limited to 'cache.h')
-rw-r--r--cache.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/cache.h b/cache.h
index a9583ff18..cbe398d3b 100644
--- a/cache.h
+++ b/cache.h
@@ -299,7 +299,7 @@ extern char *sha1_to_hex(const unsigned char *sha1); /* static buffer result! */
extern int read_ref(const char *filename, unsigned char *sha1);
extern const char *resolve_ref(const char *path, unsigned char *sha1, int, int *);
extern int create_symref(const char *ref, const char *refs_heads_master);
-extern int validate_symref(const char *ref);
+extern int validate_headref(const char *ref);
extern int base_name_compare(const char *name1, int len1, int mode1, const char *name2, int len2, int mode2);
extern int cache_name_compare(const char *name1, int len1, const char *name2, int len2);