projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make merge-cache not fail immediatelly when the merge program
[git.git]
/
http-pull.c
diff --git
a/http-pull.c
b/http-pull.c
index
d877c4a
..
024457a
100644
(file)
--- a/
http-pull.c
+++ b/
http-pull.c
@@
-53,10
+53,6
@@
int fetch(unsigned char *sha1)
char *url;
char *posn;
char *url;
char *posn;
- if (has_sha1_file(sha1)) {
- return 0;
- }
-
local = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (local < 0)
local = open(filename, O_WRONLY | O_CREAT | O_EXCL, 0666);
if (local < 0)
@@
-83,8
+79,6
@@
int fetch(unsigned char *sha1)
curl_easy_setopt(curl, CURLOPT_URL, url);
curl_easy_setopt(curl, CURLOPT_URL, url);
- /*printf("Getting %s\n", hex);*/
-
if (curl_easy_perform(curl))
return error("Couldn't get %s for %s\n", url, hex);
if (curl_easy_perform(curl))
return error("Couldn't get %s for %s\n", url, hex);
@@
-100,6
+94,7
@@
int fetch(unsigned char *sha1)
return error("File %s has bad hash\n", hex);
}
return error("File %s has bad hash\n", hex);
}
+ pull_say("got %s\n", hex);
return 0;
}
return 0;
}
@@
-118,11
+113,13
@@
int main(int argc, char **argv)
get_all = 1;
get_tree = 1;
get_history = 1;
get_all = 1;
get_tree = 1;
get_history = 1;
+ } else if (argv[arg][1] == 'v') {
+ get_verbosely = 1;
}
arg++;
}
if (argc < arg + 2) {
}
arg++;
}
if (argc < arg + 2) {
- usage("
http-pull [-c] [-t] [-a
] commit-id url");
+ usage("
git-http-pull [-c] [-t] [-a] [-v
] commit-id url");
return 1;
}
commit_id = argv[arg];
return 1;
}
commit_id = argv[arg];