Sync with maint

diff --git a/notes.c b/notes.c
index f63fd572d6db125559e68556a8fc152a53700644..b69c0b82577e0d4958ddf3efbb4aec5a9c5fa99e 100644 (file)
--- a/notes.c
+++ b/notes.c
@@ -918,17 +918,21 @@ int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
        return ret;
 }
 
-static int string_list_add_one_ref(const char *path, const unsigned char *sha1,
+static int string_list_add_one_ref(const char *refname, const unsigned char *sha1,
                                   int flag, void *cb)
 {
        struct string_list *refs = cb;
-       if (!unsorted_string_list_has_string(refs, path))
-               string_list_append(refs, path);
+       if (!unsorted_string_list_has_string(refs, refname))
+               string_list_append(refs, refname);
        return 0;
 }
 
+/*
+ * The list argument must have strdup_strings set on it.
+ */
 void string_list_add_refs_by_glob(struct string_list *list, const char *glob)
 {
+       assert(list->strdup_strings);
        if (has_glob_specials(glob)) {
                for_each_glob_ref(string_list_add_one_ref, glob, list);
        } else {