summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-06-02 14:09:22 -0700
committerJunio C Hamano <gitster@pobox.com>2016-06-02 14:09:22 -0700
commited6e8038f98e7f15e571a9a291ee4acf438b4dc5 (patch)
tree82560db1d8fef5db3c449213f992bd26a5473ac5 /revision.c
parent60bd4b1c513bb652cdffad44382046ca872140eb (diff)
downloadgit-ed6e8038f98e7f15e571a9a291ee4acf438b4dc5.tar.gz
pathspec: rename free_pathspec() to clear_pathspec()jc/clear-pathspec
The function takes a pointer to a pathspec structure, and releases the resources held by it, but does not free() the structure itself. Such a function should be called "clear", not "free". Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'revision.c')
-rw-r--r--revision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index d30d1c4f80..2f60062876 100644
--- a/revision.c
+++ b/revision.c
@@ -1425,7 +1425,7 @@ static void prepare_show_merge(struct rev_info *revs)
ce_same_name(ce, active_cache[i+1]))
i++;
}
- free_pathspec(&revs->prune_data);
+ clear_pathspec(&revs->prune_data);
parse_pathspec(&revs->prune_data, PATHSPEC_ALL_MAGIC & ~PATHSPEC_LITERAL,
PATHSPEC_PREFER_FULL | PATHSPEC_LITERAL_PATH, "", prune);
revs->limited = 1;