git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
Mar 12, 2014, 19:28 UTC
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:
Show 29 quoted lines
> 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?

Previous: Sandy CarterNext: Sandy Carter
Message 8 of 10 in “status merge: guarentee space between msg and path”
  1. status merge: guarentee space between msg and pathSandy Carter, Mar 11, 2014
  2. Junio C HamanoMar 11, 2014
  3. Sandy CarterMar 11, 2014
  4. Junio C HamanoMar 11, 2014
  5. Duy NguyenMar 11, 2014
  6. Junio C HamanoMar 12, 2014
  7. status merge: guarentee space between msg and pathSandy Carter, Mar 11, 2014
  8. Junio C HamanoMar 12, 2014
  9. Sandy CarterMar 12, 2014
  10. Junio C HamanoMar 12, 2014

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.