From: Jeff King <email@example.com> To: Elijah Newren <firstname.lastname@example.org> Cc: Emily Shaffer <email@example.com>, Junio C Hamano <firstname.lastname@example.org>, Git Mailing List <email@example.com> Subject: Re: [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case Date: Thu, 8 Aug 2019 07:00:24 -0400 Message-ID: <20190808110023.GB14189@sigill.intra.peff.net> (raw) In-Reply-To: <CABPp-BFZig73jXKkKNaz=YpT4enB3_ARQ1KTz_ttPYobkY6Bhg@mail.gmail.com> On Tue, Aug 06, 2019 at 02:16:25PM -0700, Elijah Newren wrote: > > > + test_i18ngrep ! CONFLICT out && > > > + test_i18ngrep ! BUG: err && > > > > The BUG is gone. But should it not use i18ngrep? BUG() isn't localized. > > Technically, yes, you're right. However, this line's purpose isn't > correctness of the test but documentation for the person reading the > testcase about what it's real original purpose was; my real test was > the "test_must_be_empty err" check I have below it, but I added this > line just to document the intent better. I kind of like the > "CONFLICT" and "BUG" lines looking similar just so the reader of the > testcase doesn't have to try to reason through why they are different, > although I guess it does present the problem that more careful readers > like yourself might do a double take. I think it would be better to drop the grep for BUG entirely. Not BUG()-ing should be something we implicitly assume for all commands, and checking the exit code already covers that. I don't think we should be cluttering up every test, even ones that are in response to a BUG(), with redundant checks. If you really want to document it further, a comment can do that without incurring extra run-time overhead. But I think in this case that your existing comments and commit message cover it quite well. -Peff  There are cases where there's a crash in a sub-process, but in that case the failure should be surfaced in the way the test is written. It is here, and I'd argue that any case where it isn't probably ought to be rewritten (because you're missing not just BUG()s, but probably die()).
prev parent reply other threads:[~2019-08-08 11:00 UTC|newest] Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-26 22:09 BUG() during criss-cross merge with directory rename and deleted file Emily Shaffer 2019-08-05 22:33 ` [PATCH 1/1] merge-recursive: avoid directory rename detection in recursive case Elijah Newren 2019-08-06 16:57 ` Junio C Hamano 2019-08-06 17:26 ` Elijah Newren 2019-08-06 17:49 ` Junio C Hamano 2019-08-06 17:26 ` Junio C Hamano 2019-08-06 17:29 ` Elijah Newren 2019-08-06 20:28 ` Emily Shaffer 2019-08-06 21:16 ` Elijah Newren 2019-08-06 21:54 ` Emily Shaffer 2019-08-08 11:00 ` 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=20190808110023.GB14189@sigill.intra.peff.net \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ --email@example.com \ --firstname.lastname@example.org \ /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
email@example.com list mirror (unofficial, one of many) This inbox may be cloned and mirrored by anyone: git clone --mirror https://public-inbox.org/git git clone --mirror http://ou63pmih66umazou.onion/git git clone --mirror http://czquwvybam4bgbro.onion/git git clone --mirror http://hjrcffqmbrq6wope.onion/git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V1 git git/ https://public-inbox.org/git \ firstname.lastname@example.org public-inbox-index git Example config snippet for mirrors. Newsgroups are available over NNTP: nntp://news.public-inbox.org/inbox.comp.version-control.git nntp://ou63pmih66umazou.onion/inbox.comp.version-control.git nntp://czquwvybam4bgbro.onion/inbox.comp.version-control.git nntp://hjrcffqmbrq6wope.onion/inbox.comp.version-control.git nntp://news.gmane.io/gmane.comp.version-control.git note: .onion URLs require Tor: https://www.torproject.org/ code repositories for the project(s) associated with this inbox: https://80x24.org/mirrors/git.git AGPL code for this site: git clone https://public-inbox.org/public-inbox.git