projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
xdiff: post-process hunks to make them consistent.
[git.git]
/
fetch.c
diff --git
a/fetch.c
b/fetch.c
index
1a33ae9
..
73bde07
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)
@@
-164,7
+165,7
@@
static int loop(void)
* the queue because we needed to fetch it first.
*/
if (! (obj->flags & TO_SCAN)) {
* the queue because we needed to fetch it first.
*/
if (! (obj->flags & TO_SCAN)) {
- if (
!has_sha1_file(obj->sha1) &&
fetch(obj->sha1)) {
+ if (fetch(obj->sha1)) {
report_missing(obj->type
? obj->type
: "object", obj->sha1);
report_missing(obj->type
? obj->type
: "object", obj->sha1);
@@
-214,7
+215,9
@@
int pull(char *target)
return -1;
}
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",