Package: git
Version: 1:1.8.4-1
Severity: normal

Here's an example of the problematic output:

-----
# Modifications qui seront validées :
#
#       modifié : debian/bin/gencontrol.py
[...]
# Chemins non fusionnés :
#   (utilisez "git add <fichier>..." pour marquer résolu)
#
#       modifié des deux côtés :debian/control
-----

The first part is fine, but the second part is problematic because there's
no space after the colon and it makes it impossible to select the filename
with a simple double click. The colon will always be included when it
shouldn't.

I suggest the following patch to fix this:

diff --git a/wt-status.c b/wt-status.c
index cb24f1f..758956a 100644
--- a/wt-status.c
+++ b/wt-status.c
@@ -255,7 +255,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);
 }
 
Cheers,

-- System Information:
Debian Release: jessie/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.10-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

Versions of packages git depends on:
ii  git-man          1:1.8.4-1
ii  libc6            2.17-93
ii  libcurl3-gnutls  7.32.0-1
ii  liberror-perl    0.17-1.1
ii  libexpat1        2.1.0-4
ii  libpcre3         1:8.31-2
ii  perl-modules     5.18.1-4
ii  zlib1g           1:1.2.8.dfsg-1

Versions of packages git recommends:
ii  less                         458-2
ii  openssh-client [ssh-client]  1:6.2p2-6
ii  patch                        2.7.1-3
ii  rsync                        3.0.9-4

Versions of packages git suggests:
ii  gettext-base                          0.18.3.1-1
pn  git-arch                              <none>
pn  git-bzr                               <none>
ii  git-cvs                               1:1.8.4-1
pn  git-daemon-run | git-daemon-sysvinit  <none>
ii  git-doc                               1:1.8.4-1
pn  git-el                                <none>
ii  git-email                             1:1.8.4-1
ii  git-gui                               1:1.8.4-1
ii  git-svn                               1:1.8.4-1
ii  gitk                                  1:1.8.4-1
pn  gitweb                                <none>

-- no debconf information


-- 
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]

Reply via email to