mirror of
https://github.com/git/git
synced 2024-10-06 00:29:28 +00:00
core.hidedotfiles: hide '.git' dir by default
At least for cross-platform projects, it makes sense to hide the files starting with a dot, as this is the behavior on Unix/MacOSX. However, at least Eclipse has problems interpreting the hidden flag correctly, so the default is to hide only the .git/ directory. The config setting core.hideDotFiles therefore supports not only 'true' and 'false', but also 'dotGitOnly'. [jes: clarified the commit message, made git init respect the setting by marking the .git/ directory only after reading the config, and added documentation, and rebased on top of current junio/next] Signed-off-by: Erik Faye-Lund <kusmabite@gmail.com> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
This commit is contained in:
parent
76cc4e01a0
commit
dab4396724
|
@ -154,6 +154,12 @@ The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
|
|||
will probe and set core.fileMode false if appropriate when the
|
||||
repository is created.
|
||||
|
||||
core.hideDotFiles::
|
||||
(Windows-only) If true (which is the default), mark newly-created
|
||||
directories and files whose name starts with a dot as hidden.
|
||||
If 'dotGitOnly', only the .git/ directory is hidden, but no other
|
||||
files starting with a dot.
|
||||
|
||||
core.ignoreCygwinFSTricks::
|
||||
This option is only used by Cygwin implementation of Git. If false,
|
||||
the Cygwin stat() and lstat() functions are used. This may be useful
|
||||
|
|
|
@ -384,6 +384,7 @@ int init_db(const char *template_dir, unsigned int flags)
|
|||
check_repository_format();
|
||||
|
||||
reinit = create_default_files(template_dir);
|
||||
mark_as_git_dir(get_git_dir());
|
||||
|
||||
create_object_directory();
|
||||
|
||||
|
|
7
cache.h
7
cache.h
|
@ -601,6 +601,13 @@ extern int fsync_object_files;
|
|||
extern int core_preload_index;
|
||||
extern int core_apply_sparse_checkout;
|
||||
|
||||
enum hide_dotfiles_type {
|
||||
HIDE_DOTFILES_FALSE = 0,
|
||||
HIDE_DOTFILES_TRUE,
|
||||
HIDE_DOTFILES_DOTGITONLY,
|
||||
};
|
||||
extern enum hide_dotfiles_type hide_dotfiles;
|
||||
|
||||
enum branch_track {
|
||||
BRANCH_TRACK_UNSPECIFIED = -1,
|
||||
BRANCH_TRACK_NEVER = 0,
|
||||
|
|
|
@ -3,8 +3,10 @@
|
|||
#include <conio.h>
|
||||
#include "../strbuf.h"
|
||||
#include "../run-command.h"
|
||||
#include "../cache.h"
|
||||
|
||||
static const int delay[] = { 0, 1, 10, 20, 40 };
|
||||
unsigned int _CRT_fmode = _O_BINARY;
|
||||
|
||||
int err_win_to_posix(DWORD winerr)
|
||||
{
|
||||
|
@ -278,6 +280,38 @@ int mingw_rmdir(const char *pathname)
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int make_hidden(const char *path)
|
||||
{
|
||||
DWORD attribs = GetFileAttributes(path);
|
||||
if (SetFileAttributes(path, FILE_ATTRIBUTE_HIDDEN | attribs))
|
||||
return 0;
|
||||
errno = err_win_to_posix(GetLastError());
|
||||
return -1;
|
||||
}
|
||||
|
||||
void mingw_mark_as_git_dir(const char *dir)
|
||||
{
|
||||
if (hide_dotfiles != HIDE_DOTFILES_FALSE && make_hidden(dir))
|
||||
warning("Failed to make '%s' hidden", dir);
|
||||
}
|
||||
|
||||
#undef mkdir
|
||||
int mingw_mkdir(const char *path, int mode)
|
||||
{
|
||||
int ret = mkdir(path);
|
||||
if (!ret && hide_dotfiles == HIDE_DOTFILES_TRUE) {
|
||||
/*
|
||||
* In Windows a file or dir starting with a dot is not
|
||||
* automatically hidden. So lets mark it as hidden when
|
||||
* such a directory is created.
|
||||
*/
|
||||
const char *start = basename((char*)path);
|
||||
if (*start == '.')
|
||||
return make_hidden(path);
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
#undef open
|
||||
int mingw_open (const char *filename, int oflags, ...)
|
||||
{
|
||||
|
@ -299,6 +333,17 @@ int mingw_open (const char *filename, int oflags, ...)
|
|||
if (attrs != INVALID_FILE_ATTRIBUTES && (attrs & FILE_ATTRIBUTE_DIRECTORY))
|
||||
errno = EISDIR;
|
||||
}
|
||||
if ((oflags & O_CREAT) && fd >= 0 &&
|
||||
hide_dotfiles == HIDE_DOTFILES_TRUE) {
|
||||
/*
|
||||
* In Windows a file or dir starting with a dot is not
|
||||
* automatically hidden. So lets mark it as hidden when
|
||||
* such a file is created.
|
||||
*/
|
||||
const char *start = basename((char*)filename);
|
||||
if (*start == '.' && make_hidden(filename))
|
||||
warning("Could not mark '%s' as hidden.", filename);
|
||||
}
|
||||
return fd;
|
||||
}
|
||||
|
||||
|
@ -322,17 +367,33 @@ ssize_t mingw_write(int fd, const void *buf, size_t count)
|
|||
#undef fopen
|
||||
FILE *mingw_fopen (const char *filename, const char *otype)
|
||||
{
|
||||
int hide = 0;
|
||||
FILE *file;
|
||||
if (hide_dotfiles == HIDE_DOTFILES_TRUE &&
|
||||
basename((char*)filename)[0] == '.')
|
||||
hide = access(filename, F_OK);
|
||||
if (filename && !strcmp(filename, "/dev/null"))
|
||||
filename = "nul";
|
||||
return fopen(filename, otype);
|
||||
file = fopen(filename, otype);
|
||||
if (file && hide && make_hidden(filename))
|
||||
warning("Could not mark '%s' as hidden.", filename);
|
||||
return file;
|
||||
}
|
||||
|
||||
#undef freopen
|
||||
FILE *mingw_freopen (const char *filename, const char *otype, FILE *stream)
|
||||
{
|
||||
int hide = 0;
|
||||
FILE *file;
|
||||
if (hide_dotfiles == HIDE_DOTFILES_TRUE &&
|
||||
basename((char*)filename)[0] == '.')
|
||||
hide = access(filename, F_OK);
|
||||
if (filename && !strcmp(filename, "/dev/null"))
|
||||
filename = "nul";
|
||||
return freopen(filename, otype, stream);
|
||||
file = freopen(filename, otype, stream);
|
||||
if (file && hide && make_hidden(filename))
|
||||
warning("Could not mark '%s' as hidden.", filename);
|
||||
return file;
|
||||
}
|
||||
|
||||
/*
|
||||
|
|
|
@ -119,10 +119,7 @@ static inline int fcntl(int fd, int cmd, ...)
|
|||
* simple adaptors
|
||||
*/
|
||||
|
||||
static inline int mingw_mkdir(const char *path, int mode)
|
||||
{
|
||||
return mkdir(path);
|
||||
}
|
||||
int mingw_mkdir(const char *path, int mode);
|
||||
#define mkdir mingw_mkdir
|
||||
|
||||
#define WNOHANG 1
|
||||
|
@ -321,6 +318,9 @@ static inline char *mingw_find_last_dir_sep(const char *path)
|
|||
void mingw_open_html(const char *path);
|
||||
#define open_html mingw_open_html
|
||||
|
||||
void mingw_mark_as_git_dir(const char *dir);
|
||||
#define mark_as_git_dir mingw_mark_as_git_dir
|
||||
|
||||
/*
|
||||
* helpers
|
||||
*/
|
||||
|
|
9
config.c
9
config.c
|
@ -662,6 +662,15 @@ static int git_default_core_config(const char *var, const char *value)
|
|||
return 0;
|
||||
}
|
||||
|
||||
if (!strcmp(var, "core.hidedotfiles")) {
|
||||
if (value && !strcasecmp(value, "dotgitonly")) {
|
||||
hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
|
||||
return 0;
|
||||
}
|
||||
hide_dotfiles = git_config_bool(var, value);
|
||||
return 0;
|
||||
}
|
||||
|
||||
/* Add other config variables here and to Documentation/config.txt. */
|
||||
return 0;
|
||||
}
|
||||
|
|
|
@ -59,6 +59,7 @@ char *notes_ref_name;
|
|||
int grafts_replace_parents = 1;
|
||||
int core_apply_sparse_checkout;
|
||||
struct startup_info *startup_info;
|
||||
enum hide_dotfiles_type hide_dotfiles = HIDE_DOTFILES_DOTGITONLY;
|
||||
|
||||
/* Parallel index stat data preload? */
|
||||
int core_preload_index = 0;
|
||||
|
|
|
@ -575,4 +575,8 @@ int rmdir_or_warn(const char *path);
|
|||
*/
|
||||
int remove_or_warn(unsigned int mode, const char *path);
|
||||
|
||||
#ifndef mark_as_git_dir
|
||||
#define mark_as_git_dir(x) /* noop */
|
||||
#endif
|
||||
|
||||
#endif
|
||||
|
|
Loading…
Reference in a new issue