summaryrefslogtreecommitdiff
path: root/merge-recursive.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2012-08-22 18:52:19 (GMT)
committerJunio C Hamano <gitster@pobox.com>2012-08-22 18:52:19 (GMT)
commit8d35c114579fd870feb61f3746e1371634fd2163 (patch)
tree8b48c97128b7ecdc8236b70b6f6acd7688a1c10b /merge-recursive.c
parent64336ebe3413e07dcf9e0bcaba93884caab8d65d (diff)
parentf633ea2c736a2a38e92fcf61e90c8adadc5c504d (diff)
downloadgit-8d35c114579fd870feb61f3746e1371634fd2163.zip
git-8d35c114579fd870feb61f3746e1371634fd2163.tar.gz
git-8d35c114579fd870feb61f3746e1371634fd2163.tar.bz2
Merge branch 'tr/merge-recursive-flush'
Remove unnecessary code. * tr/merge-recursive-flush: merge-recursive: eliminate flush_buffer() in favor of write_in_full()
Diffstat (limited to 'merge-recursive.c')
-rw-r--r--merge-recursive.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/merge-recursive.c b/merge-recursive.c
index 39b2e16..3b24d93 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);