Merge branch 'ah/fix-http-push' into maint

diff --git a/builtin/replace.c b/builtin/replace.c
index 2336325ce330f5268800a7bc949c066ce028852c..b62420a01af820225f23d08b4d0e885505640c77 100644 (file)
--- a/builtin/replace.c
+++ b/builtin/replace.c
@@ -36,7 +36,7 @@ static int show_reference(const char *refname, const unsigned char *sha1,
 {
        struct show_data *data = cb_data;
 
-       if (!fnmatch(data->pattern, refname, 0)) {
+       if (!wildmatch(data->pattern, refname, 0, NULL)) {
                if (data->format == REPLACE_FORMAT_SHORT)
                        printf("%s\n", refname);
                else if (data->format == REPLACE_FORMAT_MEDIUM)
@@ -178,7 +178,7 @@ int cmd_replace(int argc, const char **argv, const char *prefix)
                OPT_END()
        };
 
-       read_replace_refs = 0;
+       check_replace_refs = 0;
 
        argc = parse_options(argc, argv, prefix, options, git_replace_usage, 0);