Fix "git apply" to correctly enforce "match at the beginning"

diff --git a/builtin-send-pack.c b/builtin-send-pack.c
index 25ae1fe860601e672575b545bbd2fdfa6ad7966c..98c54d9e2859300879926a9fbc3b4193e553e2cf 100644 (file)
--- a/builtin-send-pack.c
+++ b/builtin-send-pack.c
@@ -536,15 +536,17 @@ static void verify_remote_names(int nr_heads, const char **heads)
        int i;
 
        for (i = 0; i < nr_heads; i++) {
-               const char *remote = strchr(heads[i], ':');
+               const char *remote = strrchr(heads[i], ':');
 
                remote = remote ? (remote + 1) : heads[i];
                switch (check_ref_format(remote)) {
                case 0: /* ok */
-               case -2: /* ok but a single level -- that is fine for
-                         * a match pattern.
-                         */
-               case -3: /* ok but ends with a pattern-match character */
+               case CHECK_REF_FORMAT_ONELEVEL:
+                       /* ok but a single level -- that is fine for
+                        * a match pattern.
+                        */
+               case CHECK_REF_FORMAT_WILDCARD:
+                       /* ok but ends with a pattern-match character */
                        continue;
                }
                die("remote part of refspec is not a valid name in %s",