if (arg)
return strbuf_addf_ret(err, -1, _("%%(deltabase) does not take arguments"));
if (*atom->name == '*')
- oi_deref.info.delta_base_sha1 = oi_deref.delta_base_oid.hash;
+ oi_deref.info.delta_base_oid = &oi_deref.delta_base_oid;
else
- oi.info.delta_base_sha1 = oi.delta_base_oid.hash;
+ oi.info.delta_base_oid = &oi.delta_base_oid;
return 0;
}
remote_for_branch(branch, &explicit);
*s = xstrdup(explicit ? remote : "");
} else if (atom->u.remote_ref.option == RR_REMOTE_REF) {
- int explicit;
const char *merge;
- merge = remote_ref_for_branch(branch, atom->u.remote_ref.push,
- &explicit);
- *s = xstrdup(explicit ? merge : "");
+ merge = remote_ref_for_branch(branch, atom->u.remote_ref.push);
+ *s = xstrdup(merge ? merge : "");
} else
BUG("unhandled RR_* enum");
}