Skip to content

Commit 5f0dc75

Browse files
sunzhuoshidscho
andcommitted
Add config option windows.appendAtomically
Atomic append on windows is only supported on local disk files, and it may cause errors in other situations, e.g. network file system. If that is the case, this config option should be used to turn atomic append off. Co-Authored-By: Johannes Schindelin <[email protected]> Signed-off-by: 孙卓识 <[email protected]> Signed-off-by: Johannes Schindelin <[email protected]>
1 parent f305fce commit 5f0dc75

File tree

3 files changed

+37
-2
lines changed

3 files changed

+37
-2
lines changed

Documentation/config.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -545,4 +545,6 @@ include::config/versionsort.txt[]
545545

546546
include::config/web.txt[]
547547

548+
include::config/windows.txt[]
549+
548550
include::config/worktree.txt[]

Documentation/config/windows.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
windows.appendAtomically::
2+
By default, append atomic API is used on windows. But it works only with
3+
local disk files, if you're working on a network file system, you should
4+
set it false to turn it off.

compat/mingw.c

Lines changed: 31 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
#include "gettext.h"
1919
#define SECURITY_WIN32
2020
#include <sspi.h>
21+
#include "../repository.h"
2122

2223
#define HCAST(type, handle) ((type)(intptr_t)handle)
2324

@@ -545,6 +546,7 @@ static int is_local_named_pipe_path(const char *filename)
545546

546547
int mingw_open (const char *filename, int oflags, ...)
547548
{
549+
static int append_atomically = -1;
548550
typedef int (*open_fn_t)(wchar_t const *wfilename, int oflags, ...);
549551
va_list args;
550552
unsigned mode;
@@ -561,7 +563,16 @@ int mingw_open (const char *filename, int oflags, ...)
561563
return -1;
562564
}
563565

564-
if ((oflags & O_APPEND) && !is_local_named_pipe_path(filename))
566+
/*
567+
* Only set append_atomically to default value(1) when repo is initialized
568+
* and fail to get config value
569+
*/
570+
if (append_atomically < 0 && the_repository && the_repository->commondir &&
571+
git_config_get_bool("windows.appendatomically", &append_atomically))
572+
append_atomically = 1;
573+
574+
if (append_atomically && (oflags & O_APPEND) &&
575+
!is_local_named_pipe_path(filename))
565576
open_fn = mingw_open_append;
566577
else
567578
open_fn = _wopen;
@@ -710,8 +721,26 @@ ssize_t mingw_write(int fd, const void *buf, size_t len)
710721
HANDLE h = (HANDLE) _get_osfhandle(fd);
711722
if (GetFileType(h) == FILE_TYPE_PIPE)
712723
errno = EPIPE;
713-
else
724+
else {
725+
wchar_t path[MAX_PATH];
726+
DWORD ret = GetFinalPathNameByHandleW(h, path,
727+
ARRAY_SIZE(path), 0);
728+
UINT drive_type = ret > 0 && ret < ARRAY_SIZE(path) ?
729+
GetDriveTypeW(path) : DRIVE_UNKNOWN;
730+
731+
/*
732+
* The default atomic append causes such an error on
733+
* network file systems, in such a case, it should be
734+
* turned off via config.
735+
*
736+
* `drive_type` of UNC path: DRIVE_NO_ROOT_DIR
737+
*/
738+
if (DRIVE_NO_ROOT_DIR == drive_type || DRIVE_REMOTE == drive_type)
739+
warning("invalid write operation detected; you may try:\n"
740+
"\n\tgit config windows.appendAtomically false");
741+
714742
errno = EINVAL;
743+
}
715744
}
716745

717746
return result;

0 commit comments

Comments
 (0)