Currently, git remote -v produces a misaligned output when a remote name is more than 8 characters long (i.e. longer than a tab step). Here's how it looks like: giuseppe https://github.com/giuseppe/runc (fetch) giuseppe https://github.com/giuseppe/runc (push) kir git@xxxxxxxxxx:kolyshkin/runc.git (fetch) kir git@xxxxxxxxxx:kolyshkin/runc.git (push) lifubang https://github.com/lifubang/runc (fetch) lifubang https://github.com/lifubang/runc (push) marquiz https://github.com/marquiz/runc (fetch) marquiz https://github.com/marquiz/runc (push) Let's find the maximum width and use it for alignment. While at it, let's keep the \t in case some tools depend on it for parsing (there will still be trailing spaces in the remote name). With this change, the output is like this now: giuseppe https://github.com/giuseppe/runc (fetch) giuseppe https://github.com/giuseppe/runc (push) kir git@xxxxxxxxxx:kolyshkin/runc.git (fetch) kir git@xxxxxxxxxx:kolyshkin/runc.git (push) lifubang https://github.com/lifubang/runc (fetch) lifubang https://github.com/lifubang/runc (push) marquiz https://github.com/marquiz/runc (fetch) marquiz https://github.com/marquiz/runc (push) Reported-by: Roman Dodin <dodin.roman@xxxxxxxxx> Signed-off-by: Kir Kolyshkin <kolyshkin@xxxxxxxxx> --- builtin/remote.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/builtin/remote.c b/builtin/remote.c index 729f6f3643..116417574d 100644 --- a/builtin/remote.c +++ b/builtin/remote.c @@ -1245,13 +1245,21 @@ static int show_all(void) result = for_each_remote(get_one_entry, &list); if (!result) { - int i; + int i, width = 7; + + if (verbose) { + for (i = 0; i < list.nr; i++) { + int len = strlen((list.items + i)->string); + if (len > width) + width = len; + } + } string_list_sort(&list); for (i = 0; i < list.nr; i++) { struct string_list_item *item = list.items + i; if (verbose) - printf("%s\t%s\n", item->string, + printf("%-*s\t%s\n", width, item->string, item->util ? (const char *)item->util : ""); else { if (i && !strcmp((item - 1)->string, item->string)) -- 2.39.0
