From: Stefan Beller <sbeller@google.com>
To: git@vger.kernel.org
Cc: Stefan Beller <sbeller@google.com>
Subject: [PATCH 3/4] submodule.c: get superprojects gitlink value
Date: Wed, 8 Nov 2017 11:55:08 -0800 [thread overview]
Message-ID: <20171108195509.7839-4-sbeller@google.com> (raw)
In-Reply-To: <20171108195509.7839-1-sbeller@google.com>
Signed-off-by: Stefan Beller <sbeller@google.com>
---
submodule.c | 27 +++++++++++++++++++++++++++
submodule.h | 6 ++++++
2 files changed, 33 insertions(+)
diff --git a/submodule.c b/submodule.c
index 4fcb64469e..68b123eb13 100644
--- a/submodule.c
+++ b/submodule.c
@@ -2074,6 +2074,33 @@ const char *get_superproject_working_tree(void)
return ret;
}
+/*
+ * Returns 0 when the gitlink is found in the superprojects index,
+ * the value will be found in `oid`. Otherwise return -1.
+ */
+int get_superproject_gitlink(struct object_id *oid)
+{
+ struct child_process cp = CHILD_PROCESS_INIT;
+ struct strbuf sb = STRBUF_INIT;
+ const char *hash;
+
+ if (start_ls_files_dot_dot(&cp, &sb) < 0)
+ return -1;
+
+ if (!skip_prefix(sb.buf, "160000 ", &hash))
+ /*
+ * superproject doesn't have a gitlink at submodule position or
+ * output is gibberish
+ */
+ return -1;
+
+ if (get_oid_hex(hash, oid))
+ /* could not parse the object name */
+ return -1;
+
+ return 0;
+}
+
/*
* Put the gitdir for a submodule (given relative to the main
* repository worktree) into `buf`, or return -1 on error.
diff --git a/submodule.h b/submodule.h
index f0da0277a4..5fc602f0c7 100644
--- a/submodule.h
+++ b/submodule.h
@@ -137,4 +137,10 @@ extern void absorb_git_dir_into_superproject(const char *prefix,
*/
extern const char *get_superproject_working_tree(void);
+/*
+ * Returns 0 when the gitlink is found in the superprojects index,
+ * the value will be found in `oid`. Otherwise return -1.
+ */
+extern int get_superproject_gitlink(struct object_id *oid);
+
#endif
--
2.15.0.128.g40905b34bf.dirty
next prev parent reply other threads:[~2017-11-08 19:55 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-08 19:55 [RFC PATCH 0/4] git-status reports relation to superproject Stefan Beller
2017-11-08 19:55 ` [PATCH 1/4] remote, revision: factor out exclusive counting between two commits Stefan Beller
2017-11-08 19:55 ` [PATCH 2/4] submodule.c: factor start_ls_files_dot_dot out of get_superproject_working_tree Stefan Beller
2017-11-08 19:55 ` Stefan Beller [this message]
2017-11-08 19:55 ` [PATCH 4/4] git-status: report reference to superproject Stefan Beller
2017-11-08 22:36 ` [RFC PATCH 0/4] git-status reports relation " Jonathan Tan
2017-11-09 0:10 ` [RFD] Long term plan with submodule refs? Stefan Beller
2017-11-09 1:29 ` Jonathan Tan
2017-11-09 5:47 ` Junio C Hamano
2017-11-09 5:08 ` Junio C Hamano
2017-11-09 19:57 ` Stefan Beller
2017-11-09 6:54 ` Jacob Keller
2017-11-09 20:16 ` Stefan Beller
2017-11-10 3:37 ` Jacob Keller
2017-11-10 20:01 ` Stefan Beller
2017-11-11 5:25 ` Jacob Keller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171108195509.7839-4-sbeller@google.com \
--to=sbeller@google.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).