Re: [PATCH 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Mathieu Liénard--Mayor
Please ignore this, manipulation error while in the git send-email command line. Le 2013-06-10 14:51, Mathieu Lienard--Mayor a écrit : When 'git rm' fails, it now displays a single message with the list of files involved, instead of displaying a list of messages with one file each. As an examp

[PATCH 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Mathieu Lienard--Mayor
When 'git rm' fails, it now displays a single message with the list of files involved, instead of displaying a list of messages with one file each. As an example, the old message: error: 'foo.txt' has changes staged in the index (use --cached to keep the file, or -f to force remova

Re: [PATCH 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Célestin Matte
Le 08/06/2013 10:33, Mathieu Lienard--Mayor a écrit : > + if (files_staged.len) > + errs = error(_("the following files have staged content " > +"different from both the\nfileand the HEAD:%s\n" > +"(use -f to force removal)"),

Re: [PATCH 1/2] rm: better error message on failure for multiple files

2013-06-10 Thread Mathieu Liénard--Mayor
Once again, thanks a lot your feedback, we appreciate it a lot! Le 2013-06-08 15:51, Ramkumar Ramachandra a écrit : Mathieu Lienard--Mayor wrote: @@ -170,30 +175,47 @@ static int check_local_mod(unsigned char *head, int index_only) * "intent to add" entry. */

Re: [PATCH 1/2] rm: better error message on failure for multiple files

2013-06-08 Thread Ramkumar Ramachandra
Mathieu Lienard--Mayor wrote: > @@ -170,30 +175,47 @@ static int check_local_mod(unsigned char *head, int > index_only) > * "intent to add" entry. > */ > if (local_changes && staged_changes) { > - if (!index_only || !(ce->ce_f

[PATCH 1/2] rm: better error message on failure for multiple files

2013-06-08 Thread Mathieu Lienard--Mayor
From: Mathieu Liénard--Mayor When 'git rm' fails, it now displays a single message with the list of files involved, instead of displaying a list of messages with one file each. As an example, the old message: error: 'foo.txt' has changes staged in the index (use --cached to keep