projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
git-shortlog: make the mailmap configurable.
[git.git]
/
fetch.c
diff --git
a/fetch.c
b/fetch.c
index
e6fd624
..
3e073d3
100644
(file)
--- a/
fetch.c
+++ b/
fetch.c
@@
-15,6
+15,7
@@
int get_tree = 0;
int get_history = 0;
int get_all = 0;
int get_verbosely = 0;
int get_history = 0;
int get_all = 0;
int get_verbosely = 0;
+int get_recover = 0;
static unsigned char current_commit_sha1[20];
void pull_say(const char *fmt, const char *hex)
static unsigned char current_commit_sha1[20];
void pull_say(const char *fmt, const char *hex)
@@
-48,6
+49,7
@@
static int process_tree(struct tree *tree)
struct tree_entry_list *next = entry->next;
if (process(entry->item.any))
return -1;
struct tree_entry_list *next = entry->next;
if (process(entry->item.any))
return -1;
+ free(entry->name);
free(entry);
entry = next;
}
free(entry);
entry = next;
}
@@
-206,13
+208,16
@@
int pull(char *target)
int fd = -1;
save_commit_buffer = 0;
int fd = -1;
save_commit_buffer = 0;
+ track_object_refs = 0;
if (write_ref && current_ref) {
fd = lock_ref_sha1(write_ref, current_ref);
if (fd < 0)
return -1;
}
if (write_ref && current_ref) {
fd = lock_ref_sha1(write_ref, current_ref);
if (fd < 0)
return -1;
}
- for_each_ref(mark_complete);
+ if (!get_recover) {
+ for_each_ref(mark_complete);
+ }
if (interpret_target(target, sha1))
return error("Could not interpret %s as something to pull",
if (interpret_target(target, sha1))
return error("Could not interpret %s as something to pull",