aboutsummaryrefslogtreecommitdiff
path: root/notes.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-12-22 12:26:50 -0800
committerJunio C Hamano <gitster@pobox.com>2014-12-22 12:26:50 -0800
commita7ddaa8eacb45fdd5241e52d72e6f75d8b67b953 (patch)
tree40b4313c9f7eb267405cef8d7f7c925e43e10509 /notes.c
parent8e606f97f8dee35f839b50900db8ab98fe189b3c (diff)
parent3383e199847485fedf83d0fa38bbd5363074093a (diff)
downloadgit-a7ddaa8eacb45fdd5241e52d72e6f75d8b67b953.tar.gz
git-a7ddaa8eacb45fdd5241e52d72e6f75d8b67b953.tar.xz
Merge branch 'mh/simplify-repack-without-refs'
"git remote update --prune" to drop many refs has been optimized. * mh/simplify-repack-without-refs: sort_string_list(): rename to string_list_sort() prune_remote(): iterate using for_each_string_list_item() prune_remote(): rename local variable repack_without_refs(): make the refnames argument a string_list prune_remote(): sort delete_refs_list references en masse prune_remote(): initialize both delete_refs lists in a single loop prune_remote(): exit early if there are no stale references
Diffstat (limited to 'notes.c')
-rw-r--r--notes.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/notes.c b/notes.c
index 62bc6e181..c763a21ee 100644
--- a/notes.c
+++ b/notes.c
@@ -902,7 +902,7 @@ int combine_notes_cat_sort_uniq(unsigned char *cur_sha1,
if (string_list_add_note_lines(&sort_uniq_list, new_sha1))
goto out;
string_list_remove_empty_items(&sort_uniq_list, 0);
- sort_string_list(&sort_uniq_list);
+ string_list_sort(&sort_uniq_list);
string_list_remove_duplicates(&sort_uniq_list, 0);
/* create a new blob object from sort_uniq_list */