From: Jeff King <peff@peff.net>
To: Jacob Keller <jacob.keller@gmail.com>
Cc: "Derrick Stolee" <stolee@gmail.com>,
"brian m. carlson" <sandals@crustytoothpaste.net>,
"Jonathan Nieder" <jrnieder@gmail.com>,
paul@mad-scientist.net, "Git mailing list" <git@vger.kernel.org>,
"Duy Nguyen" <pclouds@gmail.com>,
"Ævar Arnfjörð Bjarmason" <avarab@gmail.com>
Subject: Re: [ANNOUNCE] Git v2.19.0-rc0
Date: Thu, 23 Aug 2018 20:06:37 -0400 [thread overview]
Message-ID: <20180824000637.GA10847@sigill.intra.peff.net> (raw)
In-Reply-To: <20180823234049.GA3855@sigill.intra.peff.net>
On Thu, Aug 23, 2018 at 07:40:49PM -0400, Jeff King wrote:
> > You can look for explicitly "if (oidcmp(...))" though. I don't know if
> > you can catch *any* use which degrades to boolean outside of an if
> > statement, but I wouldn't expect there to be too many of those?
>
> Yeah, that was my thought, too. And I've been trying this all afternoon
> without success. Why doesn't this work:
>
> @@
> expression a, b;
> @@
> - if (oidcmp(a, b))
> + if (!oideq(a, b))
>
> I get:
>
> Fatal error: exception Failure("minus: parse error: \n = File
> \"contrib/coccinelle/oideq.cocci\", line 21, column 0, charpos =
> 221\n around = '', whole content = \n")
>
> If I do:
>
> - if (oidcmp(a, b)) { ... }
>
> that seems to please the parser for the minus line. But I cannot include
> the "..." on the plus line. Clearly the "..." part should be context,
> but I can't seem to find the right syntax.
This almost works:
@@
expression a, b;
statement s;
@@
- if (oidcmp(a, b)) s
+ if (!oideq(a, b)) s
It generates this, for example:
diff -u -p a/bisect.c b/bisect.c
--- a/bisect.c
+++ b/bisect.c
@@ -595,7 +595,7 @@ static struct commit_list *skip_away(str
for (i = 0; cur; cur = cur->next, i++) {
if (i == index) {
- if (oidcmp(&cur->item->object.oid, current_bad_oid))
+ if (!oideq(&cur->item->object.oid, current_bad_oid))
return cur;
if (previous)
return previous;
which is what we want. But it also generates this:
diff -u -p a/bundle.c b/bundle.c
--- a/bundle.c
+++ b/bundle.c
@@ -369,25 +369,11 @@ static int write_bundle_refs(int bundle_
* commit that is referenced by the tag, and not the tag
* itself.
*/
- if (oidcmp(&oid, &e->item->oid)) {
- /*
- * Is this the positive end of a range expressed
- * in terms of a tag (e.g. v2.0 from the range
- * "v1.0..v2.0")?
- */
- struct commit *one = lookup_commit_reference(the_repository,
- &oid);
+ if (!oideq(&oid, &e->item->oid)) {
+ struct commit *one=lookup_commit_reference(the_repository,
+ &oid);
struct object *obj;
-
if (e->item == &(one->object)) {
- /*
- * Need to include e->name as an
- * independent ref to the pack-objects
- * input, so that the tag is included
- * in the output; otherwise we would
- * end up triggering "empty bundle"
- * error.
- */
obj = parse_object_or_die(&oid, e->name);
obj->flags |= SHOWN;
add_pending_object(revs, obj, e->name);
So I really do want some way of saying "all of the block, no matter what
it is". Or of leaving it out as context.
-Peff
next prev parent reply other threads:[~2018-08-24 0:06 UTC|newest]
Thread overview: 58+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-20 22:13 [ANNOUNCE] Git v2.19.0-rc0 Junio C Hamano
2018-08-20 22:41 ` Stefan Beller
2018-08-20 23:39 ` Jonathan Nieder
2018-08-21 0:27 ` Jonathan Nieder
2018-08-21 0:46 ` Stefan Beller
2018-08-21 20:41 ` Derrick Stolee
2018-08-21 21:29 ` Jeff King
2018-08-22 0:48 ` brian m. carlson
2018-08-22 3:03 ` Jeff King
2018-08-22 3:36 ` Jeff King
2018-08-22 11:11 ` Derrick Stolee
2018-08-22 5:36 ` brian m. carlson
2018-08-22 6:07 ` Jeff King
2018-08-22 7:39 ` Ævar Arnfjörð Bjarmason
2018-08-22 11:14 ` Derrick Stolee
2018-08-22 15:17 ` Jeff King
2018-08-22 16:08 ` Duy Nguyen
2018-08-22 16:14 ` Duy Nguyen
2018-08-22 16:26 ` Jeff King
2018-08-22 16:49 ` Derrick Stolee
2018-08-22 16:58 ` Duy Nguyen
2018-08-22 17:04 ` Derrick Stolee
2018-08-22 16:59 ` Jeff King
2018-08-22 17:02 ` Junio C Hamano
2018-08-22 15:14 ` Jeff King
2018-08-22 14:28 ` Derrick Stolee
2018-08-22 15:24 ` Jeff King
2018-08-22 12:42 ` Paul Smith
2018-08-22 15:23 ` Jeff King
2018-08-23 1:23 ` Jonathan Nieder
2018-08-23 2:16 ` Jeff King
2018-08-23 2:27 ` Jonathan Nieder
2018-08-23 5:02 ` Jeff King
2018-08-23 5:09 ` brian m. carlson
2018-08-23 5:10 ` Jonathan Nieder
2018-08-23 13:20 ` Junio C Hamano
2018-08-23 16:31 ` wide t/perf output, was " Jeff King
2018-08-23 3:47 ` brian m. carlson
2018-08-23 5:04 ` Jeff King
2018-08-23 10:26 ` Derrick Stolee
2018-08-23 13:16 ` Junio C Hamano
2018-08-23 16:14 ` Jeff King
2018-08-23 23:30 ` Jacob Keller
2018-08-23 23:40 ` Jeff King
2018-08-24 0:06 ` Jeff King [this message]
2018-08-24 0:16 ` Jeff King
2018-08-24 2:48 ` Jacob Keller
2018-08-24 2:59 ` Jeff King
2018-08-24 6:45 ` Jeff King
2018-08-24 11:04 ` Derrick Stolee
2018-08-27 19:36 ` Junio C Hamano
2018-08-23 18:53 ` Jeff King
2018-08-23 20:59 ` Derrick Stolee
2018-08-24 6:56 ` Jeff King
2018-08-24 7:57 ` Ævar Arnfjörð Bjarmason
2018-08-24 16:45 ` Derrick Stolee
2018-08-25 8:26 ` Jeff King
2018-09-02 18:53 ` Kaartic Sivaraam
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=20180824000637.GA10847@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=avarab@gmail.com \
--cc=git@vger.kernel.org \
--cc=jacob.keller@gmail.com \
--cc=jrnieder@gmail.com \
--cc=paul@mad-scientist.net \
--cc=pclouds@gmail.com \
--cc=sandals@crustytoothpaste.net \
--cc=stolee@gmail.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.
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 NNTP newsgroup(s).