diff options
author | brian m. carlson <sandals@crustytoothpaste.net> | 2016-06-24 23:09:23 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2016-06-28 11:39:02 -0700 |
commit | a0d12c4433e25e87b67df78b45635df8a098fb23 (patch) | |
tree | 4fccd5651863d2ae9aeeaeabdab57a1c7159609b /diffcore-break.c | |
parent | c368dde9245fa3d50b7e01e1ff4f9e5c12c718da (diff) | |
download | git-a0d12c4433e25e87b67df78b45635df8a098fb23.tar.gz |
diff: convert struct diff_filespec to struct object_id
Convert struct diff_filespec's sha1 member to use a struct object_id
called "oid" 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
+ o.oid.hash
@@
struct diff_filespec *p;
@@
- p->sha1
+ p->oid.hash
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 5473493e10..a3e796089f 100644 --- a/diffcore-break.c +++ b/diffcore-break.c @@ -58,7 +58,7 @@ static int should_break(struct diff_filespec *src, } if (src->sha1_valid && dst->sha1_valid && - !hashcmp(src->sha1, dst->sha1)) + !oidcmp(&src->oid, &dst->oid)) return 0; /* they are the same */ if (diff_populate_filespec(src, 0) || diff_populate_filespec(dst, 0)) |