diff options
author | Junio C Hamano <gitster@pobox.com> | 2016-10-27 14:58:48 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-10-27 14:58:48 -0700 |
commit | f9db0c055c2f93021ee32a069e15b9e54f39f0da (patch) | |
tree | 5b991326d255e025c480add87ef3d0def47ba2ab /transport.h | |
parent | d7ae013a3173c621a3556be6834d459ece60e130 (diff) | |
parent | db98d9bafa7081aa95c15c278e39b5dfa5af8e48 (diff) | |
download | git-f9db0c055c2f93021ee32a069e15b9e54f39f0da.tar.gz |
Merge branch 'jc/abbrev-auto'
"git push" and "git fetch" reports from what old object to what new
object each ref was updated, using abbreviated refnames, and they
attempt to align the columns for this and other pieces of
information. The way these codepaths compute how many display
columns to allocate for the object names portion of this output has
been updated to match the recent "auto scale the default
abbreviation length" change.
* jc/abbrev-auto:
transport: compute summary-width dynamically
transport: allow summary-width to be computed dynamically
fetch: pass summary_width down the callchain
transport: pass summary_width down the callchain
Diffstat (limited to 'transport.h')
-rw-r--r-- | transport.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/transport.h b/transport.h index 5624c0218c..b8e4ee8099 100644 --- a/transport.h +++ b/transport.h @@ -147,7 +147,7 @@ struct transport { #define TRANSPORT_PUSH_ATOMIC 8192 #define TRANSPORT_PUSH_OPTIONS 16384 -#define TRANSPORT_SUMMARY_WIDTH (2 * FALLBACK_DEFAULT_ABBREV + 3) +extern int transport_summary_width(const struct ref *refs); /* Returns a transport suitable for the url */ struct transport *transport_get(struct remote *, const char *); |