summaryrefslogtreecommitdiff
path: root/notes-merge.c
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-07-14 15:35:58 +0700
committerJunio C Hamano <gitster@pobox.com>2013-07-15 10:56:09 -0700
commitbd1928df1d1cc6a10a7b275694d3504d9a041fae (patch)
treeda8837867af8d30a91cee8e085fd372ee300df67 /notes-merge.c
parent827f4d6c218448d58f934c0980b6366407261b74 (diff)
downloadgit-bd1928df1d1cc6a10a7b275694d3504d9a041fae.tar.gz
remove diff_tree_{setup,release}_paths
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'notes-merge.c')
-rw-r--r--notes-merge.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/notes-merge.c b/notes-merge.c
index ab18857074..94a1a8ae46 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);
- diff_tree_release_paths(&opt);
+ free_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);
- diff_tree_release_paths(&opt);
+ free_pathspec(&opt.pathspec);
}
static void check_notes_merge_worktree(struct notes_merge_options *o)