From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 22 Aug 2012 18:52:19 +0000 (-0700)
Subject: Merge branch 'tr/merge-recursive-flush'
X-Git-Tag: v1.8.0-rc0~148
X-Git-Url: https://www.git.lorimer.id.au/gitweb.git/diff_plain/8d35c114579fd870feb61f3746e1371634fd2163?hp=64336ebe3413e07dcf9e0bcaba93884caab8d65d

Merge branch 'tr/merge-recursive-flush'

Remove unnecessary code.

* tr/merge-recursive-flush:
merge-recursive: eliminate flush_buffer() in favor of write_in_full()
---

diff --git a/merge-recursive.c b/merge-recursive.c
index 39b2e165e0..3b24d930e2 100644
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@ -614,23 +614,6 @@ static char *unique_path(struct merge_options *o, const char *path, const char *
 	return newpath;
 }
 
-static void flush_buffer(int fd, const char *buf, unsigned long size)
-{
-	while (size > 0) {
-		long ret = write_in_full(fd, buf, size);
-		if (ret < 0) {
-			/* Ignore epipe */
-			if (errno == EPIPE)
-				break;
-			die_errno("merge-recursive");
-		} else if (!ret) {
-			die(_("merge-recursive: disk full?"));
-		}
-		size -= ret;
-		buf += ret;
-	}
-}
-
 static int dir_in_way(const char *path, int check_working_copy)
 {
 	int pos, pathlen = strlen(path);
@@ -789,7 +772,7 @@ static void update_file_flags(struct merge_options *o,
 			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
 			if (fd < 0)
 				die_errno(_("failed to open '%s'"), path);
-			flush_buffer(fd, buf, size);
+			write_in_full(fd, buf, size);
 			close(fd);
 		} else if (S_ISLNK(mode)) {
 			char *lnk = xmemdupz(buf, size);