OSDN Git Service
(root)
/
git-core
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'js/win32-lazyload-dll'
[git-core/git.git]
/
http-backend.c
diff --git
a/http-backend.c
b/http-backend.c
index
519025d
..
f3dc218
100644
(file)
--- a/
http-backend.c
+++ b/
http-backend.c
@@
-9,6
+9,7
@@
#include "string-list.h"
#include "url.h"
#include "argv-array.h"
#include "string-list.h"
#include "url.h"
#include "argv-array.h"
+#include "packfile.h"
static const char content_type[] = "Content-Type";
static const char content_length[] = "Content-Length";
static const char content_type[] = "Content-Type";
static const char content_length[] = "Content-Length";
@@
-357,7
+358,7
@@
static void inflate_request(const char *prog_name, int out, int buffer_input)
die("zlib error inflating request, result %d", ret);
n = stream.total_out - cnt;
die("zlib error inflating request, result %d", ret);
n = stream.total_out - cnt;
- if (write_in_full(out, out_buf, n)
!= n
)
+ if (write_in_full(out, out_buf, n)
< 0
)
die("%s aborted reading request", prog_name);
cnt += n;
die("%s aborted reading request", prog_name);
cnt += n;
@@
-378,7
+379,7
@@
static void copy_request(const char *prog_name, int out)
ssize_t n = read_request(0, &buf);
if (n < 0)
die_errno("error reading request body");
ssize_t n = read_request(0, &buf);
if (n < 0)
die_errno("error reading request body");
- if (write_in_full(out, buf, n)
!= n
)
+ if (write_in_full(out, buf, n)
< 0
)
die("%s aborted reading request", prog_name);
close(out);
free(buf);
die("%s aborted reading request", prog_name);
close(out);
free(buf);
@@
-485,10
+486,9
@@
static int show_head_ref(const char *refname, const struct object_id *oid,
struct strbuf *buf = cb_data;
if (flag & REF_ISSYMREF) {
struct strbuf *buf = cb_data;
if (flag & REF_ISSYMREF) {
- struct object_id unused;
const char *target = resolve_ref_unsafe(refname,
RESOLVE_REF_READING,
const char *target = resolve_ref_unsafe(refname,
RESOLVE_REF_READING,
-
unused.hash
, NULL);
+
NULL
, NULL);
if (target)
strbuf_addf(buf, "ref: %s\n", strip_namespace(target));
if (target)
strbuf_addf(buf, "ref: %s\n", strip_namespace(target));