[PATCH] status merge: guarentee space between msg and path

From: Sandy Carter <sandy.carter@savoirfairelinux.com>
Date: Mar 11, 2014, 16:30 UTC
Message-ID: <1394555447-1805-1-git-send-email-sandy.carter@savoirfairelinux.com>

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