as it will be used outside pick.c in a later patch
Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
pick.c | 2 +-
pick.h | 1 +
2 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/pick.c b/pick.c
index 40673ca..078b78d 100644
--- a/pick.c
+++ b/pick.c
@@ -59,7 +59,7 @@ static struct tree *empty_tree(void)
return tree;
}
-static int check_parent(struct commit *commit, int mainline, int flags,
+int check_parent(struct commit *commit, int mainline, int flags,
struct commit **parent)
{
if (!commit->parents) {
diff --git a/pick.h b/pick.h
index 7a74ad8..39af1de 100644
--- a/pick.h
+++ b/pick.h
@@ -9,5 +9,6 @@
/* We don't need a PICK_QUIET. This is done by
* setenv("GIT_MERGE_VERBOSITY", "0", 1); */
extern int pick_commit(struct commit *commit, int mainline, int flags, struct strbuf *msg);
+extern int check_parent(struct commit *commit, int mainline, int flags, struct commit **parent);
#endif
--
1.7.0.321.g2d270
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html