git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: "Mathieu Liénard--Mayor" <mathieu.lienard--mayor@ensimag.fr>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Mathieu Lienard--Mayor <Mathieu.Lienard--Mayor@ensimag.imag.fr>,
	<git@vger.kernel.org>, <gitster@pobox.com>,
	Jorge Juan Garcia Garcia 
	<Jorge-Juan.garcia-Garcia@ensimag.imag.fr>,
	Matthieu Moy <Matthieu.Moy@grenoble-inp.fr>
Subject: Re: [PATCH 1/2] rm: better error message on failure for multiple  files
Date: Mon, 10 Jun 2013 09:43:44 +0200	[thread overview]
Message-ID: <f3f6cb36e56ea8fdf7ebe22230c2aff7@ensibm.imag.fr> (raw)
In-Reply-To: <CALkWK0mqVCfrPgSLi1dnDv26YAyRrJJD_S179VYfEApmGkd4Uw@mail.gmail.com>

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.
>>                  */
>>                 if (local_changes && staged_changes) {
>> -                       if (!index_only || !(ce->ce_flags & 
>> CE_INTENT_TO_ADD))
>> -                               errs = error(_("'%s' has staged 
>> content different "
>> -                                            "from both the file and 
>> the HEAD\n"
>> -                                            "(use -f to force 
>> removal)"), name);
>> +                       if (!index_only || !(ce->ce_flags & 
>> CE_INTENT_TO_ADD)) {
>> +                               strbuf_addstr(&files_staged, "\n     
>>   ");
>
> Ouch.  Wouldn't a string-list be more appropriate for this kind of 
> thing?
Matthieu Moy told me string-list would be better aswell, so we're gonna 
change it.

-- 
Mathieu Liénard--Mayor,
2nd year at Grenoble INP - ENSIMAG
(+33)6 80 56 30 02

  reply	other threads:[~2013-06-10  7:43 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-08  8:33 [PATCH 1/2] rm: better error message on failure for multiple files Mathieu Lienard--Mayor
2013-06-08  8:33 ` [PATCH 2/2] rm: introduce advice.rmHints to shorten messages Mathieu Lienard--Mayor
2013-06-08 14:01   ` Ramkumar Ramachandra
2013-06-10  7:52     ` Mathieu Liénard--Mayor
2013-06-10  7:55       ` Ramkumar Ramachandra
2013-06-10  8:24         ` Matthieu Moy
2013-06-10  8:26           ` Ramkumar Ramachandra
2013-06-08 13:51 ` [PATCH 1/2] rm: better error message on failure for multiple files Ramkumar Ramachandra
2013-06-10  7:43   ` Mathieu Liénard--Mayor [this message]
2013-06-10 11:28 ` Célestin Matte
  -- strict thread matches above, loose matches on Subject: below --
2013-06-10 12:51 Mathieu Lienard--Mayor
2013-06-10 12:53 ` Mathieu Liénard--Mayor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

  List information: http://vger.kernel.org/majordomo-info.html

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=f3f6cb36e56ea8fdf7ebe22230c2aff7@ensibm.imag.fr \
    --to=mathieu.lienard--mayor@ensimag.fr \
    --cc=Jorge-Juan.garcia-Garcia@ensimag.imag.fr \
    --cc=Mathieu.Lienard--Mayor@ensimag.imag.fr \
    --cc=Matthieu.Moy@grenoble-inp.fr \
    --cc=artagnon@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).