Merge pull request #1227 from nulltoken/topic/emergeconflict

Introduce EMERGECONFLICT

4 files changed, 10 insertions, 10 deletions

diff --git a/src/checkout.c b/src/checkout.c
index 4d6f99463..cca66c34f 100644
--- a/src/checkout.c
+++ b/src/checkout.c
@@ -616,7 +616,7 @@ static int checkout_get_actions(
 	{
 		giterr_set(GITERR_CHECKOUT, "%d conflicts prevent checkout",
 			(int)counts[CHECKOUT_ACTION__CONFLICT]);
-		error = -1;
+		error = GIT_EMERGECONFLICT;
 		goto fail;
 	}
 
diff --git a/src/indexer.c b/src/indexer.c
index 70b2ce031..603c20656 100644
--- a/src/indexer.c
+++ b/src/indexer.c
@@ -273,7 +273,7 @@ static int crc_object(uint32_t *crc_out, git_mwindow_file *mwf, git_off_t start,
 		if (ptr == NULL)
 			return -1;
 
-		len = min(left, (size_t)size);
+		len = min(left, (unsigned int)size);
 		crc = crc32(crc, ptr, len);
 		size -= len;
 		start += len;
diff --git a/src/pack.c b/src/pack.c
index 608450825..3490c8bb9 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -621,7 +621,7 @@ ssize_t git_packfile_stream_read(git_packfile_stream *obj, void *buffer, size_t
 		return GIT_EBUFS;
 
 	obj->zstream.next_out = buffer;
-	obj->zstream.avail_out = len;
+	obj->zstream.avail_out = (unsigned int)len;
 	obj->zstream.next_in = in;
 
 	st = inflate(&obj->zstream, Z_SYNC_FLUSH);
diff --git a/src/transports/winhttp.c b/src/transports/winhttp.c
index 1a471b7de..808f6afaa 100644
--- a/src/transports/winhttp.c
+++ b/src/transports/winhttp.c
@@ -298,7 +298,7 @@ static int write_chunk(HINTERNET request, const char *buffer, size_t len)
 		return -1;
 
 	if (!WinHttpWriteData(request,
-		git_buf_cstr(&buf),	git_buf_len(&buf),
+		git_buf_cstr(&buf),	(DWORD)git_buf_len(&buf),
 		&bytes_written)) {
 		git_buf_free(&buf);
 		giterr_set(GITERR_OS, "Failed to write chunk header");
@@ -309,7 +309,7 @@ static int write_chunk(HINTERNET request, const char *buffer, size_t len)
 
 	/* Chunk body */
 	if (!WinHttpWriteData(request,
-		buffer, len,
+		buffer, (DWORD)len,
 		&bytes_written)) {
 		giterr_set(GITERR_OS, "Failed to write chunk");
 		return -1;
@@ -494,7 +494,7 @@ replay:
 
 	if (!WinHttpReadData(s->request,
 		(LPVOID)buffer,
-		buf_size,
+		(DWORD)buf_size,
 		&dw_bytes_read))
 	{
 		giterr_set(GITERR_OS, "Failed to read data");
@@ -580,7 +580,7 @@ static int put_uuid_string(LPWSTR buffer, DWORD buffer_len_cch)
 
 static int get_temp_file(LPWSTR buffer, DWORD buffer_len_cch)
 {
-	int len;
+	size_t len;
 
 	if (!GetTempPathW(buffer_len_cch, buffer)) {
 		giterr_set(GITERR_OS, "Failed to get temp path");
@@ -639,7 +639,7 @@ static int winhttp_stream_write_buffered(
 		}
 	}
 
-	if (!WriteFile(s->post_body, buffer, len, &bytes_written, NULL)) {
+	if (!WriteFile(s->post_body, buffer, (DWORD)len, &bytes_written, NULL)) {
 		giterr_set(GITERR_OS, "Failed to write to temporary file");
 		return -1;
 	}
@@ -697,7 +697,7 @@ static int winhttp_stream_write_chunked(
 	}
 	else {
 		/* Append as much to the buffer as we can */
-		int count = min(CACHED_POST_BODY_BUF_SIZE - s->chunk_buffer_len, len);
+		int count = min(CACHED_POST_BODY_BUF_SIZE - s->chunk_buffer_len, (int)len);
 
 		if (!s->chunk_buffer)
 			s->chunk_buffer = git__malloc(CACHED_POST_BODY_BUF_SIZE);
@@ -717,7 +717,7 @@ static int winhttp_stream_write_chunked(
 			/* Is there any remaining data from the source? */
 			if (len > 0) {
 				memcpy(s->chunk_buffer, buffer, len);
-				s->chunk_buffer_len = len;
+				s->chunk_buffer_len = (unsigned int)len;
 			}
 		}
 	}