index 395ca45328d1f17c795839d3cbfd405852933f5a..ed3078e3b27c62c07558fd94f339801cbd685593 100644 (file)
--- a/pull.c
+++ b/pull.c
#include "cache.h"
#include "commit.h"
#include "tree.h"
+#include "tag.h"
+#include "blob.h"
#include "refs.h"
const char *write_ref = NULL;
int get_tree = 0;
int get_history = 0;
-/* 1 means "get delta", 2 means "really check delta harder */
-int get_delta = 1;
int get_all = 0;
int get_verbosely = 0;
static unsigned char current_commit_sha1[20];
if (status && what)
report_missing(what, sha1);
}
- else if (get_delta < 2)
- return 0;
-
- if (get_delta) {
- char delta_sha1[20];
- status = sha1_delta_base(sha1, delta_sha1);
- if (0 < status)
- status = make_sure_we_have_it(what, delta_sha1);
- }
return status;
}
+static int process_unknown(unsigned char *sha1);
+
static int process_tree(unsigned char *sha1)
{
struct tree *tree = lookup_tree(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))
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) {