t4015: separate common setup and per-test expectation

diff --git a/builtin/name-rev.c b/builtin/name-rev.c
index 990390156c50f798b2153ff4e7baff92aa90b9f8..3c8f319be675d14a6ee60d303335190b7bdce9c8 100644 (file)
--- a/builtin/name-rev.c
+++ b/builtin/name-rev.c
@@ -27,17 +27,13 @@ static void name_rev(struct commit *commit,
        struct commit_list *parents;
        int parent_number = 1;
 
-       if (!commit->object.parsed)
-               parse_commit(commit);
+       parse_commit(commit);
 
        if (commit->date < cutoff)
                return;
 
        if (deref) {
-               char *new_name = xmalloc(strlen(tip_name)+3);
-               strcpy(new_name, tip_name);
-               strcat(new_name, "^0");
-               tip_name = new_name;
+               tip_name = xstrfmt("%s^0", tip_name);
 
                if (generation)
                        die("generation: %d, but deref?", generation);
@@ -88,7 +84,7 @@ static int subpath_matches(const char *path, const char *filter)
        const char *subpath = path;
 
        while (subpath) {
-               if (!fnmatch(filter, subpath, 0))
+               if (!wildmatch(filter, subpath, 0, NULL))
                        return subpath - path;
                subpath = strchr(subpath, '/');
                if (subpath)