merge-recursive: Improve the error message printed when merge(1) isn't found.

[git.git] / refs.c

diff --git a/refs.c b/refs.c
index b8fcb98..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) <= ' ' ||
-               ch == '~' || ch == '^' || ch == ':');
+               ch == '~' || ch == '^' || ch == ':' ||
+               /* 2.13 Pattern Matching Notation */
+               ch == '?' || ch == '*' || ch == '[');
 }
 
 int check_ref_format(const char *ref)
@@ -345,11 +347,6 @@ int check_ref_format(const char *ref)
                if (!ch) {
                        if (level < 2)
                                return -1; /* at least of form "heads/blah" */
-
-                       /* do not allow ref name to end in "HEAD" */
-                       if (cp - ref > 4 && !strcmp(cp - 4, "HEAD"))
-                               return -1;
-
                        return 0;
                }
        }