git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Sandy Carter <sandy.carter@savoirfairelinux.com>
To: git@vger.kernel.org
Cc: jrnieder@gmail.com, Sandy Carter <sandy.carter@savoirfairelinux.com>
Subject: [PATCH] status merge: guarentee space between msg and path
Date: Tue, 11 Mar 2014 12:30:47 -0400	[thread overview]
Message-ID: <1394555447-1805-1-git-send-email-sandy.carter@savoirfairelinux.com> (raw)

Add space between how and one when printing status of unmerged data.
This fixes an appending of the how message when it is longer than 20.
This is the case in some translations such as the french one where
the colon gets appended to the file:

    supprimé par nous :wt-status.c
    modifié des deux côtés :wt-status.h

Additionally, having a space makes the file in question easier to select
in console to quickly address the problem. Without the space, the colon
(and, sometimes the last word) of the message is selected along with the
file.

The previous french example should now print as the following, which is
more proper:

    supprimé par nous : wt-status.c
    modifié des deux côtés : wt-status.h

Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
---
 wt-status.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/wt-status.c b/wt-status.c
index a452407..69e0dfc 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -264,7 +264,7 @@ static void wt_status_print_unmerged_data(struct wt_status *s,
 	case 6: how = _("both added:"); break;
 	case 7: how = _("both modified:"); break;
 	}
-	status_printf_more(s, c, "%-20s%s\n", how, one);
+	status_printf_more(s, c, "%-19s %s\n", how, one);
 	strbuf_release(&onebuf);
 }
 
-- 
1.9.0

             reply	other threads:[~2014-03-11 16:29 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-11 16:30 Sandy Carter [this message]
2014-03-11 19:59 ` [PATCH] status merge: guarentee space between msg and path Junio C Hamano
2014-03-11 20:22   ` Sandy Carter
2014-03-11 20:26     ` Junio C Hamano
2014-03-11 23:33       ` Duy Nguyen
2014-03-12 18:39         ` Junio C Hamano
2014-03-11 23:23 ` [PATCH v2] " Sandy Carter
2014-03-12 19:28   ` Junio C Hamano
2014-03-12 20:08     ` Sandy Carter
2014-03-12 20:43       ` Junio C Hamano

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1394555447-1805-1-git-send-email-sandy.carter@savoirfairelinux.com \
    --to=sandy.carter@savoirfairelinux.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).