The message length depends on the length of the branch name. In my case, the branch name "origin/add-chickens2" put the first line of the "your branch has diverged" message over 80 characters, which triggered "less -FS" to not exit automatically as expected. This patch puts the newlines in slightly different places to reduce the probability of this happening. Now you'd need a significantly longer branch name to trigger the problem. Signed-off-by: Avery Pennarun <apenwarr@xxxxxxxxx> --- remote.c | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) I suppose a full-on automatic wordwrapper would be nicer :) diff --git a/remote.c b/remote.c index df8bd72..4f32032 100644 --- a/remote.c +++ b/remote.c @@ -1321,19 +1321,19 @@ int format_tracking_info(struct branch *branch, struct strbuf *sb) remote_msg = ""; } if (!num_theirs) - strbuf_addf(sb, "Your branch is ahead of the tracked%s branch '%s' " + strbuf_addf(sb, "Your branch is ahead of the tracked%s branch '%s'\n" "by %d commit%s.\n", remote_msg, base, num_ours, (num_ours == 1) ? "" : "s"); else if (!num_ours) - strbuf_addf(sb, "Your branch is behind the tracked%s branch '%s' " - "by %d commit%s,\n" + strbuf_addf(sb, "Your branch is behind the tracked%s branch '%s'\n" + "by %d commit%s, " "and can be fast-forwarded.\n", remote_msg, base, num_theirs, (num_theirs == 1) ? "" : "s"); else - strbuf_addf(sb, "Your branch and the tracked%s branch '%s' " - "have diverged,\nand respectively " + strbuf_addf(sb, "Your branch and the tracked%s branch '%s'\n" + "have diverged, and respectively " "have %d and %d different commit(s) each.\n", remote_msg, base, num_ours, num_theirs); -- 1.5.6.3.385.g94745 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
