[PATCH 18/38] resolve_gitlink_ref(): rename path parameter to submodule

@@ -1299,22 +1299,23 @@ const char *resolve_ref_unsafe(const char *refname, int resolve_flags,
 				       resolve_flags, sha1, flags);
 }
 
-int resolve_gitlink_ref(const char *path, const char *refname, unsigned char *sha1)
+int resolve_gitlink_ref(const char *submodule, const char *refname,
+			unsigned char *sha1)
 {
-	size_t len, orig_len = strlen(path);
+	size_t len, orig_len = strlen(submodule);
 	struct ref_store *refs;
 	int flags;
 
-	for (len = orig_len; len && path[len - 1] == '/'; len--)
+	for (len = orig_len; len && submodule[len - 1] == '/'; len--)
 		;
 
 	if (!len)
 		return -1;
 
 	if (len == orig_len) {
-		refs = get_ref_store(path);
+		refs = get_ref_store(submodule);
 	} else {
-		char *stripped = xmemdupz(path, len);
+		char *stripped = xmemdupz(submodule, len);
 
 		refs = get_ref_store(stripped);
 		free(stripped);

@@ -77,11 +77,12 @@ int is_branch(const char *refname);
 int peel_ref(const char *refname, unsigned char *sha1);
 
 /**
- * Resolve refname in the nested "gitlink" repository that is located
- * at path.  If the resolution is successful, return 0 and set sha1 to
- * the name of the object; otherwise, return a non-zero value.
+ * Resolve refname in the nested "gitlink" repository in the specified
+ * submodule (which must be non-NULL). If the resolution is
+ * successful, return 0 and set sha1 to the name of the object;
+ * otherwise, return a non-zero value.
  */
-int resolve_gitlink_ref(const char *path, const char *refname,
+int resolve_gitlink_ref(const char *submodule, const char *refname,
 			unsigned char *sha1);
 
 /*