diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-06-02 14:09:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-02 14:09:22 -0700 |
| commit | ed6e8038f98e7f15e571a9a291ee4acf438b4dc5 (patch) | |
| tree | 82560db1d8fef5db3c449213f992bd26a5473ac5 /notes-merge.c | |
| parent | 60bd4b1c513bb652cdffad44382046ca872140eb (diff) | |
| download | git-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 'notes-merge.c')
| -rw-r--r-- | notes-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c index 34bfac0c68..b7814c9b64 100644 --- a/notes-merge.c +++ b/notes-merge.c @@ -170,7 +170,7 @@ static struct notes_merge_pair *diff_tree_remote(struct notes_merge_options *o, sha1_to_hex(mp->remote)); } diff_flush(&opt); - free_pathspec(&opt.pathspec); + clear_pathspec(&opt.pathspec); *num_changes = len; return changes; @@ -256,7 +256,7 @@ static void diff_tree_local(struct notes_merge_options *o, sha1_to_hex(mp->local)); } diff_flush(&opt); - free_pathspec(&opt.pathspec); + clear_pathspec(&opt.pathspec); } static void check_notes_merge_worktree(struct notes_merge_options *o) |