Re: [PATCH] rm: resolving by removal is not a warning-worthy event

From: Junio C Hamano <gitster@pobox.com>
Date: Jul 18, 2019, 21:07 UTC
Message-ID: <xmqq8ssvxd9w.fsf@gitster-ct.c.googlers.com>
In-Reply-To: <20190718202656.GC22038@sigill.intra.peff.net>

Jeff King <peff@peff.net> writes:

Show 7 quoted lines

>> +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 ;-)

Show 7 quoted lines

>> +	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?