[DO NOT MERGE] Rebase to v2.21.0-rc1#2071

Closed

dscho wants to merge 1268 commits intogit-for-windows:masterfrom

dscho:rebase-to-v2.21.0-rc1

This pull request is big! We're only showing the most recent 250 commits

Commits on Feb 14, 2019

msvc: fix dependencies of compat/msvc.c
dscho
committed
msvc: include sigset_t definition

Philip Oakley
authored and
dscho
committed
Merge 'gitk' into HEAD
dscho
committed
msvc: define O_ACCMODE

Philip Oakley
authored and
dscho
committed
msvc: mark a variable as non-const

jeffhostetler
authored and
dscho
committed
msvc: do not re-declare the timespec struct

jeffhostetler
authored and
dscho
committed
msvc: define ftello()

jeffhostetler
authored and
dscho
committed
msvc: fix detect_msys_tty()

jeffhostetler
authored and
dscho
committed
msvc: add pragmas for common warnings

Philip Oakley
authored and
dscho
committed
msvc: do not pretend to support all signals

jeffhostetler
authored and
dscho
committed
msvc: support building Git using MS Visual C++

jeffhostetler
authored and
dscho
committed
Vcproj.pm: auto-generate GUIDs
dscho
committed
msvc: avoid debug assertion windows in Debug Mode
dscho
committed
Vcproj.pm: list git.exe first to be startup project

Philip Oakley
authored and
dscho
committed
msvc: ignore .dll and incremental compile output

jeffhostetler
authored and
dscho
committed
Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool
dscho
committed
Vcproj.pm: urlencode '<' and '>' when generating VC projects
dscho
committed
contrib/buildsystems: ignore invalidcontinue.obj

Philip Oakley
authored and
dscho
committed
contrib/buildsystems: ignore irrelevant files in Generators/
dscho
committed
contrib/buildsystems: fix misleading error message

Philip Oakley
authored and
dscho
committed
contrib/buildsystems: handle quoted spaces in filenames

Philip Oakley
authored and
dscho
committed
contrib/buildsystems: ignore gettext stuff

Philip Oakley
authored and
dscho
committed
contrib/buildsystems: redirect errors of the dry run into a log file

Philip Oakley
authored and
dscho
committed
contrib/buildsystems: optionally capture the dry-run in a file

Philip Oakley
authored and
dscho
committed
contrib/buildsystems: handle the curl library option

Philip Oakley
authored and
dscho
committed
contrib/buildsystems: handle libiconv, too
dscho
committed
contrib/buildsystems: handle options starting with a slash
dscho
committed
contrib/buildsystems: error out on unknown option
dscho
committed
contrib/buildsystems: add a backend for modern Visual Studio versions
dscho
committed
msvc: add a Makefile target to pre-generate the VS solution
dscho
committed
vcxproj: also link-or-copy builtins
dscho
committed
.gitignore: touch up the entries regarding Visual Studio

Philip Oakley
authored and
dscho
committed
WIP .gitignore: ignore library directories created by MSVC VS2008 buildsystem

Philip Oakley
authored and
dscho
committed
.gitignore: ignore Visual Studio's temporary/generated files
dscho
committed
bin-wrappers: append `.exe` to target paths if necessary
dscho
committed
t5505,t5516: create .git/branches/ when needed
dscho
committed
Merge branch 'msvc'

jeffhostetler
authored and
dscho
committed
git: avoid calling aliased builtins via their dashed form
dscho
committed
Merge branch 'visual-studio'

jeffhostetler
authored and
dscho
committed
Win32: make FILETIME conversion functions public

kblees
authored and
dscho
committed
Win32: dirent.c: Move opendir down

kblees
authored and
dscho
committed
Win32: Make the dirent implementation pluggable

kblees
authored and
dscho
committed
Win32: make the lstat implementation pluggable

kblees
authored and
dscho
committed
add infrastructure for read-only file system level caches

kblees
authored and
dscho
committed
Win32: add a cache below mingw's lstat and dirent implementations

kblees
authored and
dscho
committed
pack-objects (mingw): demonstrate a segmentation fault with large deltas

vangdfang
authored and
dscho
committed
fscache: load directories only once

kblees
authored and
dscho
committed
Makefile: Set htmldir to match the default HTML docs location under MSYS

sschuberth
authored and
dscho
committed
Help debugging with MSys2 by optionally executing bash with strace
dscho
committed
Build Python stuff with MSys2
dscho
committed
mingw: Embed a manifest to trick UAC into Doing The Right Thing

cesarb
authored and
dscho
committed
mingw: enable stack smashing protector
dscho
committed
Avoid illegal filenames when building Documentation on NTFS
dscho
committed
gettext: always use UTF-8 on native Windows

kblees
authored and
dscho
committed
mingw: initialize HOME on startup

kblees
authored and
dscho
committed
Win32: support long paths

kblees
authored and
dscho
committed
mingw: explicitly `fflush` stdout

nalla
authored and
dscho
committed
Win32: fix 'lstat("dir/")' with long paths

kblees
authored and
dscho
committed
mingw: Support `git_terminal_prompt` with more terminals

kblees
authored and
dscho
committed
compat/terminal.c: only use the Windows console if bash 'read -r' fails

kblees
authored and
dscho
committed
winansi: simplify loading the GetCurrentConsoleFontEx() function
dscho
committed
Unbreak interactive GPG prompt upon signing
dscho
committed
mingw: ensure valid CTYPE
dscho
committed
mingw: drop MakeMaker reference
dscho
committed
mingw: make is_hidden tests in t0001/t5611 more robust
dscho
committed
Merge branch 'no-perl-makemaker'
dscho
committed
diff: munmap() file contents before running external diff
dscho
committed
strbuf_readlink: don't call readlink twice if hint is the exact link size

kblees
authored and
dscho
committed
strbuf_readlink: support link targets that exceed PATH_MAX

kblees
authored and
dscho
committed
lockfile.c: use is_dir_sep() instead of hardcoded '/' checks

kblees
authored and
dscho
committed
Win32: don't call GetFileAttributes twice in mingw_lstat()

kblees
authored and
dscho
committed
Win32: implement stat() with symlink support

kblees
authored and
dscho
committed
mingw: disable t9020
dscho
committed
Win32: remove separate do_lstat() function

kblees
authored and
dscho
committed
t9001, t9116: avoid pipes
dscho
committed
Win32: let mingw_lstat() error early upon problems with reparse points

kblees
authored and
dscho
committed
Merge branch 'maybe-drop'
dscho
committed
Win32: teach fscache and dirent about symlinks

kblees
authored and
dscho
committed
Win32: lstat(): return adequate stat.st_size for symlinks

kblees
authored and
dscho
committed
Win32: factor out retry logic

kblees
authored and
dscho
committed
Win32: change default of 'core.symlinks' to false

kblees
authored and
dscho
committed
Win32: add symlink-specific error codes

kblees
authored and
dscho
committed
Win32: mingw_unlink: support symlinks to directories

kblees
authored and
dscho
committed
Win32: mingw_rename: support renaming symlinks

kblees
authored and
dscho
committed
Win32: mingw_chdir: change to symlink-resolved directory

kblees
authored and
dscho
committed
Win32: implement readlink()

kblees
authored and
dscho
committed
Win32: implement basic symlink() functionality (file symlinks only)

kblees
authored and
dscho
committed
Win32: symlink: add support for symlinks to directories

kblees
authored and
dscho
committed
mingw: try to create symlinks without elevated permissions
dscho
committed
Win32: symlink: move phantom symlink creation to a separate function

piscisaureus
authored and
dscho
committed
Win32: symlink: specify symlink type in .gitattributes

piscisaureus
authored and
dscho
committed
Allow `add -p` and `add -i` with a large number of files

kkheller
authored and
dscho
committed
remove_dirs: do not swallow error when stat() failed
dscho
committed
Win32: symlink: add test for `symlink` attribute

piscisaureus
authored and
dscho
committed
Windows: add support for a Windows-wide configuration
dscho
committed
t3701: verify that we can add *lots* of files interactively
dscho
committed
fscache: add key for GIT_TRACE_FSCACHE

jeffhostetler
authored and
dscho
committed
fscache: remember not-found directories

jeffhostetler
authored and
dscho
committed
t7300: `git clean -dfx` must show an error with long paths
dscho
committed
mingw: support spawning programs containing spaces in their names
dscho
committed
fscache: add a test for the dir-not-found optimization
dscho
committed
mingw: ensure that core.longPaths is handled *always*
dscho
committed
dir.c: make add_excludes aware of fscache during status

jeffhostetler
authored and
dscho
committed
fscache: make fscache_enabled() public

jeffhostetler
authored and
dscho
committed
add: use preload-index and fscache for performance

jeffhostetler
authored and
dscho
committed
dir.c: regression fix for add_excludes with fscache

jeffhostetler
authored and
dscho
committed
fetch-pack.c: enable fscache for stats under .git/objects

Takuto Ikuta
authored and
dscho
committed
checkout.c: enable fscache for checkout again

Takuto Ikuta
authored and
dscho
committed
Merge branch 'program-data-config'
dscho
committed
mingw: introduce code to detect whether we're inside a Windows container

zcube
authored and
dscho
committed
mingw: when running in a Windows container, try to rename() harder

zcube
authored and
dscho
committed
mingw: move the file_attr_to_st_mode() function definition

zcube
authored and
dscho
committed
mingw: Windows Docker volumes are *not* symbolic links
dscho
committed
Enable the filesystem cache (fscache) in refresh_index().

benpeart
authored and
dscho
committed
fscache: use FindFirstFileExW to avoid retrieving the short name

benpeart
authored and
dscho
committed
status: disable and free fscache at the end of the status command

benpeart
authored and
dscho
committed
Merge branch 'jeffhostetler/jeffhostetler/fscache_nfd'
dscho
committed
Merge branch 'jeffhostetler/jeffhostetler/add_preload_fscache'
dscho
committed
fscache: add GIT_TEST_FSCACHE support

benpeart
authored and
dscho
committed
At the end of the add command, disable and free the fscache so that we don't

benpeart
authored and
dscho
committed
fscache: add fscache hit statistics

benpeart
authored and
dscho
committed
Merge branch 'atetubou/fscache_checkout_flush'
dscho
committed
mem_pool: add GIT_TRACE_MEMPOOL support

benpeart
authored and
dscho
committed
fscache: fscache takes an initial size

benpeart
authored and
dscho
committed
mingw: demonstrate that all file handles are inherited by child processes
dscho
committed
fscache: update fscache to be thread specific instead of global

benpeart
authored and
dscho
committed
mingw: work around incorrect standard handles
dscho
committed
fscache: teach fscache to use mempool

benpeart
authored and
dscho
committed
Merge branch 'spawn-with-spaces'
dscho
committed
mingw: spawned processes need to inherit only standard handles
dscho
committed
Merge branch 'program-data-config'
dscho
committed
Merge pull request #1897 from piscisaureus/symlink-attr
dscho
committed
transport-helper: prefer Git's builtins over dashed form
dscho
committed
mingw: explicitly specify with which cmd to prefix the cmdline
dscho
committed
mingw: when path_lookup() failed, try BusyBox
dscho
committed
test-run-command: learn to run (parts of) the testsuite
dscho
committed
test-lib: avoid unnecessary Perl invocation
dscho
committed
tests: replace mingw_test_cmp with a helper in C
dscho
committed
test-tool: learn to act as a drop-in replacement for `iconv`
dscho
committed
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho
committed
tests: use t/diff-lib/* consistently
dscho
committed
gitattributes: mark .png files as binary
dscho
committed
tests: move test PNGs into t/diff-lib/
dscho
committed
tests: only override sort & find if there are usable ones in /usr/bin/
dscho
committed
tests: use the correct path separator with BusyBox
dscho
committed
mingw: only use Bash-ism `builtin pwd -W` when available
dscho
committed
tests (mingw): remove Bash-specific pwd option
dscho
committed
test-lib: add BUSYBOX prerequisite
dscho
committed
t0021: use Windows path when appropriate
dscho
committed
t1300: mark all test cases with funny filenames as !MINGW
dscho
committed
t4124: avoid using "normal" diff mode
dscho
committed
t5003: use binary file from t/diff-lib/
dscho
committed
t5003: skip `unzip -a` tests with BusyBox
dscho
committed
t5532: workaround for BusyBox on Windows
dscho
committed
t5605: special-case hardlink test for BusyBox-w32
dscho
committed
t5813: allow for $PWD to be a Windows path
dscho
committed
t7063: when running under BusyBox, avoid unsupported find option
dscho
committed
t9200: skip tests when $PWD contains a colon
dscho
committed
t9350: skip ISO-8859-1 test when the environment is always-UTF-8
dscho
committed
mingw: add a Makefile target to copy test artifacts
dscho
committed
Merge branch 'busybox-w32'
dscho
committed
Merge branch 'docker-volumes-are-no-symlinks'
dscho
committed
fscache: make fscache_enable() thread safe

benpeart
authored and
dscho
committed
mingw (git_terminal_prompt): work around BusyBox & WSL issues
dscho
committed
mingw: kill child processes in a gentler way
dscho
committed
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho
committed
fscache: teach fscache to use NtQueryDirectoryFile

benpeart
authored and
dscho
committed
mingw: change core.fsyncObjectFiles = 1 by default
dscho
committed
mingw: really handle SIGINT
dscho
committed
mingw (git_terminal_prompt): turn on echo explictly
dscho
committed
Add a Code of Conduct
dscho
committed
CONTRIBUTING.md: add guide for first-time contributors

derrickstolee
authored and
dscho
committed
README.md: Add a Windows-specific preamble
dscho
committed
Add an issue template

shiftkey
authored and
dscho
committed
Modify the GitHub Pull Request template (to reflect Git for Windows)

Philip Oakley
authored and
dscho
committed
.github: Add configuration for the Sentiment Bot
dscho
committed
sha1-name.c: add `get_oidf()` which acts like `get_oid()`

ungps
authored and
dscho
committed
Document how $HOME is set on Windows

alejandro5042
authored and
dscho
committed
strbuf.c: add `strbuf_join_argv()`

ungps
authored and
dscho
committed
strbuf.c: add `strbuf_insertf()` and `strbuf_vinsertf()`

ungps
authored and
dscho
committed
ident: add the ability to provide a "fallback identity"
dscho
committed
stash: improve option parsing test coverage

klusark
authored and
dscho
committed
t3903: modernize style

ungps
authored and
dscho
committed
stash: rename test cases to be more descriptive

ungps
authored and
dscho
committed
stash: add tests for `git stash show` config

ungps
authored and
dscho
committed
stash: mention options in `show` synopsis

ungps
authored and
dscho
committed
stash: convert apply to builtin

klusark
authored and
dscho
committed
stash: convert drop and clear to builtin

klusark
authored and
dscho
committed
stash: convert branch to builtin

klusark
authored and
dscho
committed
stash: convert pop to builtin

klusark
authored and
dscho
committed
stash: convert list to builtin

ungps
authored and
dscho
committed
stash: convert show to builtin

ungps
authored and
dscho
committed
stash: convert store to builtin

ungps
authored and
dscho
committed
stash: convert create to builtin

ungps
authored and
dscho
committed
stash: convert push to builtin

ungps
authored and
dscho
committed
stash: make push -q quiet

ungps
authored and
dscho
committed
stash: convert save to builtin

ungps
authored and
dscho
committed
stash: optimize `get_untracked_files()` and `check_changes()`

ungps
authored and
dscho
committed
stash: replace all `write-tree` child processes with API calls

ungps
authored and
dscho
committed
stash: convert `stash--helper.c` into `stash.c`

ungps
authored and
dscho
committed
stash: add back the original, scripted `git stash`
dscho
committed
stash: optionally use the scripted version again
dscho
committed
tests: add a special setup where stash.useBuiltin is off
dscho
committed
stash: fix segmentation fault when files were added with intent

kraai
authored and
dscho
committed
Add back the original, scripted interactive rebase backend
dscho
committed
strbuf_vinsertf: provide the correct buffer size to vsnprintf

j6t
authored and
dscho
committed
non-builtin rebase: use non-builtin interactive backend
dscho
committed
Merge 'ps/stash-in-c'
dscho
committed
Merge branch 'ready-for-upstream'
dscho
committed
Merge branch 'gitk-and-git-gui-patches'
dscho
committed
Merge branch 'make-builtin-stash-and-rebase-opt-ins'
dscho
committed
Merge branch 'msvc'

jeffhostetler
authored and
dscho
committed
Merge branch 'visual-studio'

jeffhostetler
authored and
dscho
committed
Merge branch 'fscache'
dscho
committed
Merge branch 'long-paths'
dscho
committed
Merge branch 'msys2'
dscho
committed
Merge branch 'kblees/kb/symlinks'
dscho
committed
Merge pull request #1897 from piscisaureus/symlink-attr
dscho
committed
Merge branch 'program-data-config'
dscho
committed
Merge pull request #305 from dscho/msysgit_issues_182
dscho
committed
Merge branch 'clean-long-paths'
dscho
committed
Merge branch 'spawn-with-spaces'
dscho
committed
Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd
dscho
committed
Merge branch 'core-longpaths-everywhere'
dscho
committed
Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_fscache
dscho
committed
Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fscache
dscho
committed
Merge pull request #1426 from atetubou/fetch_pack
dscho
committed
Merge pull request #1468 from atetubou/fscache_checkout_flush
dscho
committed
Merge 'docker-volumes-are-no-symlinks'
dscho
committed
Merge pull request #1827 from benpeart/fscache_refresh_index
dscho
committed
Merge pull request #1908 from benpeart/FindFirstFileEx-gfw
dscho
committed
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho
committed
Merge pull request #1911 from benpeart/git_test_fscache-gfw
dscho
committed
Merge pull request #1914 from benpeart/free-fscache-after-add-gfw
dscho
committed
Merge pull request #1910 from benpeart/fscache_statistics-gfw
dscho
committed
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho
committed
Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw
dscho
committed
Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw
dscho
committed
Merge branch 'fsync-object-files-always'
dscho
committed
Merge pull request #1170 from dscho/mingw-kill-process
dscho
committed
Merge branch 'fix-terminal-prompt'
dscho
committed
Merge 'readme' into HEAD
dscho
committed
mingw: use ANSI or Unicode functions explicitly
dscho
committed
Merge 'builtin-stash-rebase-v3'

jamill
authored and
dscho
committed
status: reinstate --show-ignored-directory as a deprecated option
dscho
committed
status: carry the --no-lock-index option for backwards-compatibility
dscho
committed
status: verify that --show-ignored-directory prints a warning
dscho
committed
Merge pull request #1958 from dscho/ansi-unicode
dscho
committed
Merge branch 'status-no-lock-index'
dscho
committed
Merge pull request #1354 from dscho/phase-out-show-ignored-directory-gracefully
dscho
committed