From 3173bd49690b02c756e32d2c9c3ed13e451806d2 Mon Sep 17 00:00:00 2001 From: Daniel Barkalow Date: Tue, 21 Jun 2005 20:35:53 -0400 Subject: [PATCH] Pull misc objects Make pull fetch whatever is specified, parse it to figure out what it is, and then process it appropriately. This also supports getting tag objects, and getting whatever they tag. Signed-off-by: Daniel Barkalow Signed-off-by: Linus Torvalds --- pull.c | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) diff --git a/pull.c b/pull.c index e70fc02f3b..91d9db6c7b 100644 --- a/pull.c +++ b/pull.c @@ -3,6 +3,8 @@ #include "cache.h" #include "commit.h" #include "tree.h" +#include "tag.h" +#include "blob.h" #include "refs.h" const char *write_ref = NULL; @@ -57,6 +59,8 @@ static int make_sure_we_have_it(const char *what, unsigned char *sha1) return status; } +static int process_unknown(unsigned char *sha1); + static int process_tree(unsigned char *sha1) { struct tree *tree = lookup_tree(sha1); @@ -115,6 +119,35 @@ static int process_commit(unsigned char *sha1) return 0; } +static int process_tag(unsigned char *sha1) +{ + struct tag *obj = lookup_tag(sha1); + + if (parse_tag(obj)) + return -1; + return process_unknown(obj->tagged->sha1); +} + +static int process_unknown(unsigned char *sha1) +{ + struct object *obj; + if (make_sure_we_have_it("object", sha1)) + return -1; + obj = parse_object(sha1); + if (!obj) + return error("Unable to parse object %s", sha1_to_hex(sha1)); + if (obj->type == commit_type) + return process_commit(sha1); + if (obj->type == tree_type) + return process_tree(sha1); + if (obj->type == blob_type) + return 0; + if (obj->type == tag_type) + return process_tag(sha1); + return error("Unable to determine requirement of type %s for %s", + obj->type, sha1_to_hex(sha1)); +} + static int interpret_target(char *target, unsigned char *sha1) { if (!get_sha1_hex(target, sha1)) @@ -142,7 +175,7 @@ int pull(char *target) if (interpret_target(target, sha1)) return error("Could not interpret %s as something to pull", target); - if (process_commit(sha1)) + if (process_unknown(sha1)) return -1; if (write_ref) { -- cgit v1.2.3