Use is_null_oid() instead of is_null_sha1()
---
This is just a fixup to patch 23/29 in my v8 series for detecting directory
renames;
should squash cleanly.
merge-recursive.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/merge-recursive.c b/merge-recursive.c
index ffe1d0d117..6e6ec90e9e 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -667,9 +667,9 @@ static int update_stages_for_stage_data(struct
merge_options *opt,
oidcpy(&b.oid, &stage_data->stages[3].oid);
return update_stages(opt, path,
- is_null_sha1(o.oid.hash) ? NULL : &o,
- is_null_sha1(a.oid.hash) ? NULL : &a,
- is_null_sha1(b.oid.hash) ? NULL : &b);
+ is_null_oid(&o.oid) ? NULL : &o,
+ is_null_oid(&a.oid) ? NULL : &a,
+ is_null_oid(&b.oid) ? NULL : &b);
}
static void update_entry(struct stage_data *entry,
--
2.16.1.232.gbf538760f8
