diff options
| author | Edward Thomson <ethomson@microsoft.com> | 2013-11-05 03:28:57 +0400 |
|---|---|---|
| committer | Edward Thomson <ethomson@microsoft.com> | 2013-11-05 07:33:05 +0400 |
| commit | 1d3a8aeb4bd032d0bf34039fbcb308fba06b862a (patch) | |
| tree | 8e9165cfd8c4c3919abd2d4f301b1f45e281d5eb /src/checkout.c | |
| parent | f966acd13366d21e0b9beeecf021c0114596c716 (diff) | |
move mode_t to filebuf_open instead of _commit
Diffstat (limited to 'src/checkout.c')
| -rw-r--r-- | src/checkout.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/checkout.c b/src/checkout.c index a4f326637..6d7e3cfd4 100644 --- a/src/checkout.c +++ b/src/checkout.c @@ -1673,9 +1673,9 @@ static int checkout_write_merge( goto done; if ((error = git_futils_mkpath2file(path_workdir.ptr, 0755)) < 0 || - (error = git_filebuf_open(&output, path_workdir.ptr, GIT_FILEBUF_DO_NOT_BUFFER)) < 0 || + (error = git_filebuf_open(&output, path_workdir.ptr, GIT_FILEBUF_DO_NOT_BUFFER, result.mode)) < 0 || (error = git_filebuf_write(&output, result.data, result.len)) < 0 || - (error = git_filebuf_commit(&output, result.mode)) < 0) + (error = git_filebuf_commit(&output)) < 0) goto done; done: |