summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2017-08-23 12:36:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2017-08-24 21:47:31 (GMT)
commit62f0b399e00f38751834e688677ab49fcccd28fe (patch)
tree414855e81317cc367d0e6edc5bb066835af5b6ff
parent29babbeeb32fb4e8b892940e69207ec7de2e7a63 (diff)
downloadgit-62f0b399e00f38751834e688677ab49fcccd28fe.zip
git-62f0b399e00f38751834e688677ab49fcccd28fe.tar.gz
git-62f0b399e00f38751834e688677ab49fcccd28fe.tar.bz2
refs: add refs_head_ref()
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
-rw-r--r--refs.c23
-rw-r--r--refs.h2
2 files changed, 15 insertions, 10 deletions
diff --git a/refs.c b/refs.c
index ea8e6b9..b3a0a24 100644
--- a/refs.c
+++ b/refs.c
@@ -1248,27 +1248,30 @@ int refs_rename_ref_available(struct ref_store *refs,
return ok;
}
-int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+int refs_head_ref(struct ref_store *refs, each_ref_fn fn, void *cb_data)
{
struct object_id oid;
int flag;
- if (submodule) {
- if (resolve_gitlink_ref(submodule, "HEAD", oid.hash) == 0)
- return fn("HEAD", &oid, 0, cb_data);
-
- return 0;
- }
-
- if (!read_ref_full("HEAD", RESOLVE_REF_READING, oid.hash, &flag))
+ if (!refs_read_ref_full(refs, "HEAD", RESOLVE_REF_READING,
+ oid.hash, &flag))
return fn("HEAD", &oid, flag, cb_data);
return 0;
}
+int head_ref_submodule(const char *submodule, each_ref_fn fn, void *cb_data)
+{
+ struct ref_store *refs = get_submodule_ref_store(submodule);
+
+ if (!refs)
+ return -1;
+ return refs_head_ref(refs, fn, cb_data);
+}
+
int head_ref(each_ref_fn fn, void *cb_data)
{
- return head_ref_submodule(NULL, fn, cb_data);
+ return refs_head_ref(get_main_ref_store(), fn, cb_data);
}
struct ref_iterator *refs_ref_iterator_begin(
diff --git a/refs.h b/refs.h
index 6daa78e..8073f8a 100644
--- a/refs.h
+++ b/refs.h
@@ -275,6 +275,8 @@ typedef int each_ref_fn(const char *refname,
* modifies the reference also returns a nonzero value to immediately
* stop the iteration. Returned references are sorted.
*/
+int refs_head_ref(struct ref_store *refs,
+ each_ref_fn fn, void *cb_data);
int refs_for_each_ref(struct ref_store *refs,
each_ref_fn fn, void *cb_data);
int refs_for_each_ref_in(struct ref_store *refs, const char *prefix,