diff options
| author | Michael Haggerty <mhagger@alum.mit.edu> | 2014-11-25 09:02:35 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-11-25 10:11:34 -0800 |
| commit | 3383e199847485fedf83d0fa38bbd5363074093a (patch) | |
| tree | 1d64f0f698700acaf614127451ece7ce0afb4cc0 /builtin | |
| parent | 8552943f41373583b5185a9686102251c544c07e (diff) | |
| download | git-3383e199847485fedf83d0fa38bbd5363074093a.tar.gz | |
sort_string_list(): rename to string_list_sort()mh/simplify-repack-without-refs
The new name is more consistent with the names of other
string_list-related functions.
Suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Michael Haggerty <mhagger@alum.mit.edu>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/apply.c | 2 | ||||
| -rw-r--r-- | builtin/receive-pack.c | 2 | ||||
| -rw-r--r-- | builtin/remote.c | 12 | ||||
| -rw-r--r-- | builtin/repack.c | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/builtin/apply.c b/builtin/apply.c index 6696ea4c3f..22218f90a6 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); diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c index 32fc540ef3..d7ce6437f4 100644 --- a/builtin/receive-pack.c +++ b/builtin/receive-pack.c @@ -964,7 +964,7 @@ static void check_aliased_updates(struct command *commands) string_list_append(&ref_list, cmd->ref_name); item->util = (void *)cmd; } - sort_string_list(&ref_list); + string_list_sort(&ref_list); for (cmd = commands; cmd; cmd = cmd->next) { if (!cmd->error_string) diff --git a/builtin/remote.c b/builtin/remote.c index 7fec170298..46ecfd9f7b 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -352,9 +352,9 @@ static int get_ref_states(const struct ref *remote_refs, struct ref_states *stat free_refs(stale_refs); free_refs(fetch_map); - sort_string_list(&states->new); - sort_string_list(&states->tracked); - sort_string_list(&states->stale); + string_list_sort(&states->new); + string_list_sort(&states->tracked); + string_list_sort(&states->stale); return 0; } @@ -909,7 +909,7 @@ static int get_remote_ref_states(const char *name, get_push_ref_states(remote_refs, states); } else { for_each_ref(append_ref_to_tracked_list, states); - sort_string_list(&states->tracked); + string_list_sort(&states->tracked); get_push_ref_states_noquery(states); } @@ -1128,7 +1128,7 @@ static int show_all(void) if (!result) { int i; - sort_string_list(&list); + string_list_sort(&list); for (i = 0; i < list.nr; i++) { struct string_list_item *item = list.items + i; if (verbose) @@ -1333,7 +1333,7 @@ static int prune_remote(const char *remote, int dry_run) for_each_string_list_item(item, &states.stale) string_list_append(&refs_to_prune, item->util); - sort_string_list(&refs_to_prune); + string_list_sort(&refs_to_prune); if (!dry_run) { struct strbuf err = STRBUF_INIT; diff --git a/builtin/repack.c b/builtin/repack.c index 28456206c5..0705d6802f 100644 --- a/builtin/repack.c +++ b/builtin/repack.c @@ -379,7 +379,7 @@ int cmd_repack(int argc, const char **argv, const char *prefix) if (delete_redundant) { int opts = 0; - sort_string_list(&names); + string_list_sort(&names); for_each_string_list_item(item, &existing_packs) { char *sha1; size_t len = strlen(item->string); |