Merge branch 'rs/get-oid-with-flags-cleanup'

Code clean-up. * rs/get-oid-with-flags-cleanup: use repo_get_oid_with_flags()