X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=notes-merge.c;h=94a1a8ae466733b207ae5030f8a8894d66535f91;hb=HEAD;hp=ab1885707403e06fe058ece2e0455e25e194224c;hpb=e03a5010b3fc17a1d559ae0fdbcdad63af8e30c9;p=~andy%2Fgit

diff --git a/notes-merge.c b/notes-merge.c
index ab1885707..94a1a8ae4 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)