From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
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 14:07:23 -0700 [thread overview]
Message-ID: <xmqq8ssvxd9w.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <20190718202656.GC22038@sigill.intra.peff.net> (Jeff King's message of "Thu, 18 Jul 2019 16:26:56 -0400")
Jeff King <peff@peff.net> writes:
>> +test_expect_success 'Resolving by removal is not a warning-worthy event' '
>> + git reset -q --hard &&
>> + test_when_finished "rm -f .git/index.lock msg && git reset -q --hard" &&
>> + qfwfq=$(echo qfwfq | git hash-object -w --stdin) &&
>
> I'd have called this "$blob" for my own sanity in typing later lines,
> but OK. :)
OK, I can change that easily ;-)
>> + do
>> + echo "100644 $qfwfq $stage qfwfq"
>> + done | git update-index --index-info &&
>> + 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?
next prev parent reply other threads:[~2019-07-18 21:07 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 [this message]
2019-07-18 21:43 ` Jeff King
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqq8ssvxd9w.fsf@gitster-ct.c.googlers.com \
--to=gitster@pobox.com \
--cc=Ulrich.Windl@rz.uni-regensburg.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.