diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-03-28 00:42:22 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-03-28 00:42:22 -0700 |
| commit | 48bcfbd1342f69a523c4214804682458e1121bd9 (patch) | |
| tree | c1b02b9432bb44e22e3e74121e580ca34d5e6553 /builtin-remote.c | |
| parent | 869e13e2466bd047e6e624f69c01c8561b989b7c (diff) | |
| parent | 48ef563641d1904f8da2c6fffe700fe6276af8dd (diff) | |
| download | git-48bcfbd1342f69a523c4214804682458e1121bd9.tar.gz git-48bcfbd1342f69a523c4214804682458e1121bd9.tar.xz | |
Merge branch 'js/remote-improvements'
* js/remote-improvements:
remote: improve sorting of "configure for git push" list
Diffstat (limited to 'builtin-remote.c')
| -rw-r--r-- | builtin-remote.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/builtin-remote.c b/builtin-remote.c index 993acd6a0..9ef846f6a 100644 --- a/builtin-remote.c +++ b/builtin-remote.c @@ -922,6 +922,20 @@ int add_push_to_show_info(struct string_list_item *push_item, void *cb_data) return 0; } +/* + * Sorting comparison for a string list that has push_info + * structs in its util field + */ +static int cmp_string_with_push(const void *va, const void *vb) +{ + const struct string_list_item *a = va; + const struct string_list_item *b = vb; + const struct push_info *a_push = a->util; + const struct push_info *b_push = b->util; + int cmp = strcmp(a->string, b->string); + return cmp ? cmp : strcmp(a_push->dest, b_push->dest); +} + int show_push_info_item(struct string_list_item *item, void *cb_data) { struct show_info *show_info = cb_data; @@ -1032,7 +1046,8 @@ static int show(int argc, const char **argv) info.width = info.width2 = 0; for_each_string_list(add_push_to_show_info, &states.push, &info); - sort_string_list(info.list); + qsort(info.list->items, info.list->nr, + sizeof(*info.list->items), cmp_string_with_push); if (info.list->nr) printf(" Local ref%s configured for 'git push'%s:\n", info.list->nr > 1 ? "s" : "", |