]> git.ipfire.org Git - thirdparty/git.git/commit - notes-merge.c
diff: convert struct diff_filespec to struct object_id
authorbrian m. carlson <sandals@crustytoothpaste.net>
Fri, 24 Jun 2016 23:09:23 +0000 (23:09 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 28 Jun 2016 18:39:02 +0000 (11:39 -0700)
commita0d12c4433e25e87b67df78b45635df8a098fb23
tree4fccd5651863d2ae9aeeaeabdab57a1c7159609b
parentc368dde9245fa3d50b7e01e1ff4f9e5c12c718da
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>
13 files changed:
builtin/blame.c
builtin/fast-export.c
builtin/reset.c
combine-diff.c
diff.c
diffcore-break.c
diffcore-rename.c
diffcore.h
line-log.c
merge-recursive.c
notes-merge.c
submodule.c
wt-status.c