Remove get_object_hash.
Convert all instances of get_object_hash to use an appropriate reference to the hash member of the oid member of struct object. This provides no functional change, as it is essentially a macro substitution. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Jeff King <peff@peff.net>
This commit is contained in:
committed by
Jeff King
parent
f2fd0760f6
commit
ed1c9977cb
6
bisect.c
6
bisect.c
@ -500,7 +500,7 @@ struct commit_list *filter_skipped(struct commit_list *list,
|
||||
struct commit_list *next = list->next;
|
||||
list->next = NULL;
|
||||
if (0 <= sha1_array_lookup(&skipped_revs,
|
||||
get_object_hash(list->item->object))) {
|
||||
list->item->object.oid.hash)) {
|
||||
if (skipped_first && !*skipped_first)
|
||||
*skipped_first = 1;
|
||||
/* Move current to tried list */
|
||||
@ -784,7 +784,7 @@ static void check_merge_bases(int no_checkout)
|
||||
result = get_merge_bases_many(rev[0], rev_nr - 1, rev + 1);
|
||||
|
||||
for (; result; result = result->next) {
|
||||
const unsigned char *mb = get_object_hash(result->item->object);
|
||||
const unsigned char *mb = result->item->object.oid.hash;
|
||||
if (!hashcmp(mb, current_bad_oid->hash)) {
|
||||
handle_bad_merge_base();
|
||||
} else if (0 <= sha1_array_lookup(&good_revs, mb)) {
|
||||
@ -973,7 +973,7 @@ int bisect_next_all(const char *prefix, int no_checkout)
|
||||
exit(4);
|
||||
}
|
||||
|
||||
bisect_rev = get_object_hash(revs.commits->item->object);
|
||||
bisect_rev = revs.commits->item->object.oid.hash;
|
||||
|
||||
if (!hashcmp(bisect_rev, current_bad_oid->hash)) {
|
||||
exit_if_skipped_commits(tried, current_bad_oid);
|
||||
|
||||
Reference in New Issue
Block a user