From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 12 Mar 2014 19:28:07 GMT
Subject: Re: [PATCH v2] status merge: guarentee space between msg and path
Message-ID: <xmqqmwgvkyig.fsf@gitster.dls.corp.google.com>
In-Reply-To: <1394580211-13383-1-git-send-email-sandy.carter@savoirfairelinux.com>

Sandy Carter <sandy.carter@savoirfairelinux.com> writes:

> 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,
> such  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, which is more proper:
>     supprimé par nous :      wt-status.c
>     modifié des deux côtés : wt-status.h
>
> try 2:
> Add function so wt_status_print_unmerged_data() and
> wt_status_print_change_data() make use of the same padding technique
> defined as wt_status_status_padding_string()
>
> This has the additionnal advantage of aligning unmerged paths with paths
> of regular statuses.
>
> Signed-off-by: Sandy Carter <sandy.carter@savoirfairelinux.com>
> ---
>  t/t7060-wtstatus.sh         |  16 +++----
>  t/t7506-status-submodule.sh |  18 ++++----
>  t/t7508-status.sh           |  94 +++++++++++++++++++--------------------
>  t/t7512-status-help.sh      |  30 ++++++-------

This is too noisy a patch to be reviewed.  I tried to resurrect
Jonathan's fix from Dec 2013 and posted it elsewhere---does it work
for you?