From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Ulrich Windl <Ulrich.Windl@rz.uni-regensburg.de>
Subject: Re: [PATCH] rm: resolving by removal is not a warning-worthy event
Date: Thu, 18 Jul 2019 17:43:25 -0400 [thread overview]
Message-ID: <20190718214325.GA28619@sigill.intra.peff.net> (raw)
In-Reply-To: <xmqq8ssvxd9w.fsf@gitster-ct.c.googlers.com>
On Thu, Jul 18, 2019 at 02:07:23PM -0700, Junio C Hamano wrote:
> >> + git rm qfwfq >msg &&
> >> + test_i18ngrep ! "needs merge" msg &&
> >
> > Should we capture stderr from "git rm", too, to cover all bases?
>
> Do you mean
>
> git rm blob >msg 2>&1
>
> because we could later change our mind and send "needs merge"
> message to the standard error stream?
Yes, exactly.
-Peff
prev parent reply other threads:[~2019-07-18 21:43 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-07-17 7:58 Merge: "git rm bla": "bla: needs merge", but still removes file "bla" Ulrich Windl
2019-07-17 16:44 ` Junio C Hamano
2019-07-17 20:38 ` [PATCH] rm: resolving by removal is not a warning-worthy event Junio C Hamano
2019-07-18 20:26 ` Jeff King
2019-07-18 21:07 ` Junio C Hamano
2019-07-18 21:43 ` Jeff King [this message]
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=20190718214325.GA28619@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=Ulrich.Windl@rz.uni-regensburg.de \
--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).