#include "refs.h"
const char *write_ref = NULL;
-
-const unsigned char *current_ref = NULL;
+const char *write_ref_log_details = NULL;
int get_tree = 0;
int get_history = 0;
int pull(char *target)
{
- struct ref_lock *lock;
+ struct ref_lock *lock = NULL;
unsigned char sha1[20];
+ char *msg;
+ int ret;
save_commit_buffer = 0;
track_object_refs = 0;
if (write_ref) {
- lock = lock_ref_sha1(write_ref, current_ref, 1);
- if (!lock)
+ lock = lock_ref_sha1(write_ref, NULL, 0);
+ if (!lock) {
+ error("Can't lock ref %s", write_ref);
return -1;
+ }
}
- if (!get_recover) {
+ if (!get_recover)
for_each_ref(mark_complete);
- }
if (interpret_target(target, sha1)) {
error("Could not interpret %s as something to pull", target);
- unlock_ref(lock);
+ if (lock)
+ unlock_ref(lock);
return -1;
}
if (process(lookup_unknown_object(sha1))) {
- unlock_ref(lock);
+ if (lock)
+ unlock_ref(lock);
return -1;
}
if (loop()) {
- unlock_ref(lock);
+ if (lock)
+ unlock_ref(lock);
return -1;
}
if (write_ref) {
- return write_ref_sha1(lock, sha1, "git fetch");
+ if (write_ref_log_details) {
+ msg = xmalloc(strlen(write_ref_log_details) + 12);
+ sprintf(msg, "fetch from %s", write_ref_log_details);
+ } else
+ msg = NULL;
+ ret = write_ref_sha1(lock, sha1, msg ? msg : "fetch (unknown)");
+ if (msg)
+ free(msg);
+ return ret;
}
return 0;
}