sha1_name: consistently refer to object_context as "oc"
An early version of the patch to add object_context used the name object_resolve_context. This was later shortened to just object_context, but the "orc" variable name stuck in a few places. Let's use "oc", which is used elsewhere in the code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Jeff King committed
May 19, 2017 at 08:52 UTC
c0a487eafb63301004af424bf02b1951abdc4da7
2 files changed
+3
-3
cache.h
+1
-1
@@ -1363,7 +1363,7 @@ extern int get_sha1_tree(const char *str, unsigned char *sha1);
1363
extern int get_sha1_treeish(const char *str, unsigned char *sha1);
1364
extern int get_sha1_blob(const char *str, unsigned char *sha1);
1365
extern void maybe_die_on_misspelt_object_name(const char *name, const char *prefix);
1366
-extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc);
1366
+extern int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *oc);
1367
1368
extern int get_oid(const char *str, struct object_id *oid);
1369
sha1_name.c
+2
-2
@@ -1638,9 +1638,9 @@ void maybe_die_on_misspelt_object_name(const char *name, const char *prefix)
1638
get_sha1_with_context_1(name, GET_SHA1_ONLY_TO_DIE, prefix, sha1, &oc);
1639
}
1640
1641
-int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *orc)
1641
+int get_sha1_with_context(const char *str, unsigned flags, unsigned char *sha1, struct object_context *oc)
1642
{
1643
if (flags & GET_SHA1_FOLLOW_SYMLINKS && flags & GET_SHA1_ONLY_TO_DIE)
1644
die("BUG: incompatible flags for get_sha1_with_context");
1645
- return get_sha1_with_context_1(str, flags, NULL, sha1, orc);
1645
+ return get_sha1_with_context_1(str, flags, NULL, sha1, oc);
1646
}