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: http://git.tremily.us/?a=commitdiff_plain;h=8d35c114579fd870feb61f3746e1371634fd2163;p=git.git

Merge branch 'tr/merge-recursive-flush'

Remove unnecessary code.

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

8d35c114579fd870feb61f3746e1371634fd2163
diff --cc merge-recursive.c
index 39b2e165e,eed936ebe..3b24d930e
--- a/merge-recursive.c
+++ b/merge-recursive.c
@@@ -788,8 -770,8 +771,8 @@@ static void update_file_flags(struct me
  				mode = 0666;
  			fd = open(path, O_WRONLY | O_TRUNC | O_CREAT, mode);
  			if (fd < 0)
 -				die_errno("failed to open '%s'", path);
 +				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);