Package: git Version: 1:1.7.1-1.1 Severity: minor Tags: upstream
When I've done a merge that got conflicts, I fix up the conflicts, then git add and git rm files as appropriate; git add is silent (even if there are further files in need of attention) but git rm nags me about files that still need merged and reports which files it is removing. The minor inconsistency here (add is silent, rm is chatty, by default) is a blemish, but endurable. More irritatingly, git rm even nags about the files I've told it to remove, before telling me that it's removing them. This nagging serves no purpose, other than to spam my command-line and move meaningful output further up my scroll-space and closer to the top of what I can scroll back to. I told it to remove the files: it should not be nagging me about the fact that I need to do something about them - it should know that I *am* doing something about them ! It is reasonable to report what files are being removed, it is even reasonable to nag me about files still in need of conflict resolution after the removals (albeit the hobgoblin of small minds would be happier of if rm and add behaved the same on this); but nagging me about the need to sort out a file I *am* sorting out, by the git rm command being executed, is pure wanton irritant. It would make sense for git rm's nagging to happen *after* it has done its removals: information about it doing what I told it to do is less interesting than information about what I need to do next, so it makes sense for the nagging to appear last in the output; and doing the check, for what to nag about, *after* the removals would avoid the spam. -- System Information: Debian Release: squeeze/sid APT prefers testing APT policy: (500, 'testing'), (500, 'stable') Architecture: i386 (i686) Kernel: Linux 2.6.32-trunk-686 (SMP w/2 CPU cores) Locale: LANG=en_GB.ISO-8859-15, LC_CTYPE=en_GB.ISO-8859-15 (charmap=ISO-8859-15) Shell: /bin/sh linked to /bin/bash Versions of packages git depends on: ii libc6 2.11.2-2 Embedded GNU C Library: Shared lib ii libcurl3-gnutls 7.21.0-1 Multi-protocol file transfer libra ii libdigest-sha1-perl 2.13-1 NIST SHA-1 message digest algorith ii liberror-perl 0.17-1 Perl module for error/exception ha ii libexpat1 2.0.1-7 XML parsing C library - runtime li ii perl-modules 5.10.1-14 Core Perl modules ii zlib1g 1:1.2.3.4.dfsg-3 compression library - runtime Versions of packages git recommends: ii less 436-1 pager program similar to more ii openssh-client [ssh-client] 1:5.5p1-4 secure shell (SSH) client, for sec ii patch 2.6-2 Apply a diff file to an original ii rsync 3.0.7-2 fast remote file copy program (lik Versions of packages git suggests: pn git-arch <none> (no description available) ii git-cvs 1:1.7.1-1.1 fast, scalable, distributed revisi pn git-daemon-run <none> (no description available) ii git-doc 1:1.7.1-1.1 fast, scalable, distributed revisi pn git-email <none> (no description available) ii git-gui 1:1.7.1-1.1 fast, scalable, distributed revisi ii git-svn 1:1.7.1-1.1 fast, scalable, distributed revisi ii gitk 1:1.7.1-1.1 fast, scalable, distributed revisi ii gitweb 1:1.7.1-1.1 fast, scalable, distributed revisi -- no debconf information -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org