diff options
author | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:50 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2014-12-22 12:26:50 -0800 |
commit | a7ddaa8eacb45fdd5241e52d72e6f75d8b67b953 (patch) | |
tree | 40b4313c9f7eb267405cef8d7f7c925e43e10509 /builtin/apply.c | |
parent | 8e606f97f8dee35f839b50900db8ab98fe189b3c (diff) | |
parent | 3383e199847485fedf83d0fa38bbd5363074093a (diff) | |
download | git-a7ddaa8eacb45fdd5241e52d72e6f75d8b67b953.tar.gz |
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 'builtin/apply.c')
-rw-r--r-- | builtin/apply.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 28d24f8e34..0aad912839 100644 --- a/builtin/apply.c +++ b/builtin/apply.c @@ -4180,7 +4180,7 @@ static int write_out_results(struct patch *list) if (cpath.nr) { struct string_list_item *item; - sort_string_list(&cpath); + string_list_sort(&cpath); for_each_string_list_item(item, &cpath) fprintf(stderr, "U %s\n", item->string); string_list_clear(&cpath, 0); |