revision: rename add_pending_sha1 to add_pending_oid
Rename this function and convert it to take a pointer to struct object_id. This is a prerequisite for converting get_reference, which is needed to convert parse_object. Signed-off-by: brian m. carlson <sandals@crustytoothpaste.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
brian m. carlson committed
May 6, 2017 at 22:10 UTC
a58a1b01ff86465f503bf835a41c83e34be376ce
4 files changed
+10
-10
builtin/am.c
+1
-1
@@ -1618,7 +1618,7 @@ static int fall_back_threeway(const struct am_state *state, const char *index_pa
1618
init_revisions(&rev_info, NULL);
1619
rev_info.diffopt.output_format = DIFF_FORMAT_NAME_STATUS;
1620
diff_opt_parse(&rev_info.diffopt, &diff_filter_str, 1, rev_info.prefix);
1621
- add_pending_sha1(&rev_info, "HEAD", our_tree.hash, 0);
1621
+ add_pending_oid(&rev_info, "HEAD", &our_tree, 0);
1622
diff_setup_done(&rev_info.diffopt);
1623
run_diff_index(&rev_info, 1);
1624
}
builtin/checkout.c
+2
-2
@@ -721,7 +721,7 @@ static int add_pending_uninteresting_ref(const char *refname,
721
const struct object_id *oid,
722
int flags, void *cb_data)
723
{
724
- add_pending_sha1(cb_data, refname, oid->hash, UNINTERESTING);
724
+ add_pending_oid(cb_data, refname, oid, UNINTERESTING);
725
return 0;
726
}
727
@@ -807,7 +807,7 @@ static void orphaned_commit_warning(struct commit *old, struct commit *new)
807
add_pending_object(&revs, object, oid_to_hex(&object->oid));
808
809
for_each_ref(add_pending_uninteresting_ref, &revs);
810
- add_pending_sha1(&revs, "HEAD", new->object.oid.hash, UNINTERESTING);
810
+ add_pending_oid(&revs, "HEAD", &new->object.oid, UNINTERESTING);
811
812
refs = revs.pending;
813
revs.leak_pending = 1;
revision.c
+4
-4
@@ -203,10 +203,10 @@ static struct object *get_reference(struct rev_info *revs, const char *name,
203
return object;
204
}
205
206
-void add_pending_sha1(struct rev_info *revs, const char *name,
207
- const unsigned char *sha1, unsigned int flags)
206
+void add_pending_oid(struct rev_info *revs, const char *name,
207
+ const struct object_id *oid, unsigned int flags)
208
{
209
- struct object *object = get_reference(revs, name, sha1, flags);
209
+ struct object *object = get_reference(revs, name, oid->hash, flags);
210
add_pending_object(revs, object, name);
211
}
212
@@ -1159,7 +1159,7 @@ static int handle_one_ref(const char *path, const struct object_id *oid,
1159
1160
object = get_reference(cb->all_revs, path, oid->hash, cb->all_flags);
1161
add_rev_cmdline(cb->all_revs, object, path, REV_CMD_REF, cb->all_flags);
1162
- add_pending_sha1(cb->all_revs, path, oid->hash, cb->all_flags);
1162
+ add_pending_oid(cb->all_revs, path, oid, cb->all_flags);
1163
return 0;
1164
}
1165
revision.h
+3
-3
@@ -263,9 +263,9 @@ extern void show_object_with_name(FILE *, struct object *, const char *);
263
264
extern void add_pending_object(struct rev_info *revs,
265
struct object *obj, const char *name);
266
-extern void add_pending_sha1(struct rev_info *revs,
267
- const char *name, const unsigned char *sha1,
268
- unsigned int flags);
266
+extern void add_pending_oid(struct rev_info *revs,
267
+ const char *name, const struct object_id *oid,
268
+ unsigned int flags);
269
270
extern void add_head_to_pending(struct rev_info *);
271
extern void add_reflogs_to_pending(struct rev_info *, unsigned int flags);