sha1-name.c: add repo_get_oid()

pclouds · gitster · commit ec580eaaa3bd · 2019-04-16T18:56:53.000+09:00
Signed-off-by: Nguyễn Thái Ngọc Duy &lt;pclouds@gmail.com&gt;
Signed-off-by: Junio C Hamano &lt;gitster@pobox.com&gt;
diff --git a/cache.h b/cache.h
@@ -1380,7 +1380,8 @@ enum get_oid_result {
 		       */
 };
 
-extern int get_oid(const char *str, struct object_id *oid);
+int repo_get_oid(struct repository *r, const char *str, struct object_id *oid);
+#define get_oid(str, oid) repo_get_oid(the_repository, str, oid)
 extern int get_oid_commit(const char *str, struct object_id *oid);
 extern int get_oid_committish(const char *str, struct object_id *oid);
 extern int get_oid_tree(const char *str, struct object_id *oid);
diff --git a/sha1-name.c b/sha1-name.c
@@ -1573,10 +1573,10 @@ int strbuf_check_branch_ref(struct strbuf *sb, const char *name)
  * This is like "get_oid_basic()", except it allows "object ID expressions",
  * notably "xyz^" for "parent of xyz"
  */
-int get_oid(const char *name, struct object_id *oid)
+int repo_get_oid(struct repository *r, const char *name, struct object_id *oid)
 {
 	struct object_context unused;
-	return get_oid_with_context(the_repository, name, 0, oid, &unused);
+	return get_oid_with_context(r, name, 0, oid, &unused);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -1573,10 +1573,10 @@ int strbuf_check_branch_ref(struct strbuf sb, const char name)`
`1573`	`1573`	`* This is like "get_oid_basic()", except it allows "object ID expressions",`
`1574`	`1574`	`* notably "xyz^" for "parent of xyz"`
`1575`	`1575`	`*/`
`1576`		`-int get_oid(const char name, struct object_id oid)`
	`1576`	`+int repo_get_oid(struct repository r, const char name, struct object_id *oid)`
`1577`	`1577`	`{`
`1578`	`1578`	`struct object_context unused;`
`1579`		`- return get_oid_with_context(the_repository, name, 0, oid, &unused);`
	`1579`	`+ return get_oid_with_context(r, name, 0, oid, &unused);`
`1580`	`1580`	`}`
`1581`	`1581`
`1582`	`1582`