diff options
| author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-06-24 23:09:24 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-06-28 11:39:02 -0700 |
| commit | 41c9560ee5f9fc4bd3c6580272bd292083a9fe18 (patch) | |
| tree | 5dd07bbd754dd1ff28abc083ec509cb3ad1ce0d9 /diffcore-break.c | |
| parent | a0d12c4433e25e87b67df78b45635df8a098fb23 (diff) | |
| download | git-41c9560ee5f9fc4bd3c6580272bd292083a9fe18.tar.gz git-41c9560ee5f9fc4bd3c6580272bd292083a9fe18.tar.xz | |
diff: rename struct diff_filespec's sha1_valid member
Now that this struct's sha1 member is called "oid", update the comment
and the sha1_valid member to be called "oid_valid" instead. The
following Coccinelle semantic patch was used to implement this, followed
by the transformations in object_id.cocci:
@@
struct diff_filespec o;
@@
- o.sha1_valid
+ o.oid_valid
@@
struct diff_filespec *p;
@@
- p->sha1_valid
+ p->oid_valid
Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diffcore-break.c')
| -rw-r--r-- | diffcore-break.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/diffcore-break.c b/diffcore-break.c index a3e796089..881a74f29 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -57,7 +57,7 @@ static int should_break(struct diff_filespec *src, return 1; /* even their types are different */ } - if (src->sha1_valid && dst->sha1_valid && + if (src->oid_valid && dst->oid_valid && !oidcmp(&src->oid, &dst->oid)) return 0; /* they are the same */ |