projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
merge-recursive: conflicting rename case.
[git.git]
/
refs.c
diff --git
a/refs.c
b/refs.c
index
69858e4
..
c33729c
100644
(file)
--- a/
refs.c
+++ b/
refs.c
@@
-313,7
+313,9
@@
int write_ref_sha1(const char *ref, int fd, const unsigned char *sha1)
static inline int bad_ref_char(int ch)
{
return (((unsigned) ch) <= ' ' ||
static inline int bad_ref_char(int ch)
{
return (((unsigned) ch) <= ' ' ||
- ch == '~' || ch == '^' || ch == ':');
+ ch == '~' || ch == '^' || ch == ':' ||
+ /* 2.13 Pattern Matching Notation */
+ ch == '?' || ch == '*' || ch == '[');
}
int check_ref_format(const char *ref)
}
int check_ref_format(const char *ref)
@@
-345,14
+347,6
@@
int check_ref_format(const char *ref)
if (!ch) {
if (level < 2)
return -1; /* at least of form "heads/blah" */
if (!ch) {
if (level < 2)
return -1; /* at least of form "heads/blah" */
-
- /* Do not allow ref name to end in "HEAD"
- * Note that cp is poiting at one past NUL at the end.
- * i.e. cp[-1] = NUL.
- */
- if (5 <= cp - ref && !strcmp(cp - 5, "HEAD"))
- return -1;
-
return 0;
}
}
return 0;
}
}