"Phillip Wood via GitGitGadget" [off-list ref] writes:

From: Phillip Wood <redacted>

The state files for 'onto' and 'orig_head' should contain a full hex
oid, change the reading functions from get_oid() to get_oid_hex() to
reflect this.

OK.

-	if (get_oid(buf.buf, &oid))
+	if (get_oid_hex(buf.buf, &oid))
...
 		return -1;
-	if (get_oid(buf.buf, &opts->orig_head))
+	if (get_oid_hex(buf.buf, &opts->orig_head))