summaryrefslogtreecommitdiff
path: root/http-fetch.c
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-05-22 18:54:19 -0700
committerJunio C Hamano <junkio@cox.net>2006-05-22 18:54:19 -0700
commit4d8df3feb806ef85693a9f7c4b8c20ca5c1caa56 (patch)
tree82a6c78b367b284e3ee371e7530c5fec5f7857ea /http-fetch.c
parent22f7c8cc9179dec90a7d735330455347b92b7777 (diff)
parent07001f95a60149619bed62af7ad59052ace7ac92 (diff)
downloadgit-4d8df3feb806ef85693a9f7c4b8c20ca5c1caa56.tar.gz
Merge branch 'se/http' into next
* se/http: Remove possible segfault in http-fetch. Install git builtins into gitexecdir rather than bindir. Change GIT-VERSION-GEN to call git commands with "git" not "git-". cvsimport: replace anonymous sub ref with a normal sub cvsimport: minor fixups Problem: 'trap...exit' causes error message when /bin/sh is ash. Avoid segfault in diff --stat rename output. Tutorial #2: broken link fix. git help: remove whatchanged from list of common commands
Diffstat (limited to 'http-fetch.c')
-rw-r--r--http-fetch.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/http-fetch.c b/http-fetch.c
index 861644b27e..178f1ee311 100644
--- a/http-fetch.c
+++ b/http-fetch.c
@@ -1269,10 +1269,10 @@ int main(int argc, char **argv)
if (pull(commit_id))
rc = 1;
- curl_slist_free_all(no_pragma_header);
-
http_cleanup();
+ curl_slist_free_all(no_pragma_header);
+
if (corrupt_object_found) {
fprintf(stderr,
"Some loose object were found to be corrupt, but they might be just\n"