diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:02 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-20 11:01:02 -0700 |
commit | 1958a17fe41ab424d7d655de66a04a7711e7bbd3 (patch) | |
tree | 3292b775bbad12eb7741195b50b29df3e08f37d1 /builtin/reset.c | |
parent | Merge branch 'aq/upload-pack-use-parse-options' (diff) | |
parent | pathspec: rename free_pathspec() to clear_pathspec() (diff) | |
download | tgif-1958a17fe41ab424d7d655de66a04a7711e7bbd3.tar.xz |
Merge branch 'jc/clear-pathspec'
We usually call a function that clears the contents a data
structure X without freeing the structure itself clear_X(), and
call a function that does clear_X() and also frees it free_X().
free_pathspec() function has been renamed to clear_pathspec()
to avoid confusion.
* jc/clear-pathspec:
pathspec: rename free_pathspec() to clear_pathspec()
Diffstat (limited to 'builtin/reset.c')
-rw-r--r-- | builtin/reset.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/reset.c b/builtin/reset.c index 092c3a5399..acd6278868 100644 --- a/builtin/reset.c +++ b/builtin/reset.c @@ -158,7 +158,7 @@ static int read_from_tree(const struct pathspec *pathspec, return 1; diffcore_std(&opt); diff_flush(&opt); - free_pathspec(&opt.pathspec); + clear_pathspec(&opt.pathspec); return 0; } |