Merge branch 'nd/worktree-list-fixup' into maint

diff --git a/transport.h b/transport.h
index 68669f14d08f52d15f476fe97a813044a0d07dda..b8e4ee8099260a74e5207048cf2837c9fd686568 100644 (file)
--- a/transport.h
+++ b/transport.h
@@ -147,8 +147,7 @@ struct transport {
 #define TRANSPORT_PUSH_ATOMIC 8192
 #define TRANSPORT_PUSH_OPTIONS 16384
 
-#define TRANSPORT_SUMMARY_WIDTH (2 * DEFAULT_ABBREV + 3)
-#define TRANSPORT_SUMMARY(x) (int)(TRANSPORT_SUMMARY_WIDTH + strlen(x) - gettext_width(x)), (x)
+extern int transport_summary_width(const struct ref *refs);
 
 /* Returns a transport suitable for the url */
 struct transport *transport_get(struct remote *, const char *);