Skip to content

Size_t : Make large files work #2166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1,281 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1281 commits
Select commit Hold shift + click to select a range
143f06d
Windows: add support for a Windows-wide configuration
dscho Apr 22, 2015
9eeee6a
mingw: use ANSI or Unicode functions explicitly
dscho Nov 27, 2018
9469759
Merge pull request #1859 from dscho/funny-cased-cwd
dscho Oct 17, 2018
6496b10
Merge pull request #1900 from tanushree27/remove-ipv6-fallback
dscho Nov 15, 2018
db92df6
gitk: Unicode file name support
kblees Feb 4, 2012
5d7660b
Revert "git-gui: set GIT_DIR and GIT_WORK_TREE after setup"
hvoigt Feb 18, 2010
26bc17e
Win32: make FILETIME conversion functions public
kblees Jul 6, 2013
c6980f5
Merge pull request #1915 from dscho/open-in-gdb
dscho Nov 7, 2018
5571bbf
gitk: work around the command line limit on Windows
sschuberth Aug 11, 2009
6dea407
git-gui: provide question helper for retry fallback on Windows
hvoigt Feb 21, 2010
6da976e
git-gui (Windows): use git-bash.exe if it is available
tomyy Oct 18, 2015
c087edc
Merge 'git-gui' into HEAD
dscho Jun 7, 2018
fafdfd0
Win32: dirent.c: Move opendir down
kblees Sep 8, 2013
fd15561
Merge branch 'dont-spawn-gzip-in-archive'
dscho Feb 21, 2019
1d33467
gitk: fix another invocation with an overly long command-line
FauxFaux Jul 25, 2010
ee090ee
git-gui--askyesno: fix funny text wrapping
dscho Sep 20, 2017
0bf5d2a
git gui: set GIT_ASKPASS=git-gui--askpass if not set yet
dscho Jul 23, 2010
61f29e3
respect core.hooksPath, falling back to .git/hooks
dscho Oct 4, 2018
f850feb
Merge branch 'msys2-git-gui'
dscho Jun 7, 2018
ea4b81e
Win32: Make the dirent implementation pluggable
kblees Sep 8, 2013
bb291b2
Merge branch 'msvc'
jeffhostetler Oct 23, 2018
bac56d4
gitk: Use an external icon file on Windows
sschuberth Jul 22, 2012
c67420d
git-gui--askyesno: allow overriding the window title
dscho Sep 20, 2017
f3fc090
git-gui: correctly restore GIT_DIR after invoking gitk
max630 Jan 18, 2017
87fc41a
Merge branch 'git-gui-hooks-path' of https://github.com/dscho/git-gui
dscho Jul 10, 2018
a14d270
Win32: make the lstat implementation pluggable
kblees Sep 8, 2013
0ea63ce
Merge branch 'visual-studio'
jeffhostetler Oct 23, 2018
5091685
gitk: fix arrow keys in input fields with Tcl/Tk >= 8.6
dscho Feb 16, 2016
79bd997
git-gui--askyesno (mingw): use Git for Windows' icon, if available
dscho Sep 20, 2017
a9fa6bd
Merge pull request #1032 from max630/gitgui_GIT_GIT_unset
dscho Jun 8, 2018
e974327
add infrastructure for read-only file system level caches
kblees Sep 8, 2013
97f8e67
Merge branch 'program-data-config'
dscho Jun 8, 2018
1d14e3e
gitk: make the "list references" default window width wider
sidecut Jan 21, 2016
76d3b49
Merge branch 'git-gui-askyesno'
dscho Jun 8, 2018
c81dc66
Win32: add a cache below mingw's lstat and dirent implementations
kblees Oct 1, 2013
03de165
pack-objects (mingw): demonstrate a segmentation fault with large deltas
vangdfang Jan 9, 2014
ad7e9e0
Merge pull request #1958 from dscho/ansi-unicode
dscho Nov 30, 2018
9991621
Merge 'gitk' into HEAD
dscho Jun 7, 2018
9f28d4e
fscache: load directories only once
kblees Jun 24, 2014
82bd8d9
strbuf_readlink: don't call readlink twice if hint is the exact link …
kblees May 11, 2015
5107d51
strbuf_readlink: support link targets that exceed PATH_MAX
kblees May 11, 2015
43c9d12
Makefile: Set htmldir to match the default HTML docs location under MSYS
sschuberth Sep 4, 2013
d5d7ccb
lockfile.c: use is_dir_sep() instead of hardcoded '/' checks
kblees May 11, 2015
2b60aa0
Help debugging with MSys2 by optionally executing bash with strace
dscho Feb 20, 2015
ad6dc13
Win32: don't call GetFileAttributes twice in mingw_lstat()
kblees May 12, 2015
42e80ef
Build Python stuff with MSys2
dscho Feb 16, 2015
d40a64d
Win32: implement stat() with symlink support
kblees May 15, 2015
130429d
mingw: Embed a manifest to trick UAC into Doing The Right Thing
cesarb Mar 9, 2015
9754ec3
Win32: remove separate do_lstat() function
kblees May 11, 2015
cd96bcf
mingw: enable stack smashing protector
dscho Nov 2, 2015
31c7acf
Win32: let mingw_lstat() error early upon problems with reparse points
kblees May 23, 2015
da9b0dd
Avoid illegal filenames when building Documentation on NTFS
dscho Apr 6, 2015
47cbf0e
Win32: teach fscache and dirent about symlinks
kblees Jan 10, 2017
778d1c1
gettext: always use UTF-8 on native Windows
kblees Apr 9, 2015
13a70b8
Win32: lstat(): return adequate stat.st_size for symlinks
kblees May 15, 2015
40bf881
mingw: initialize HOME on startup
kblees Apr 6, 2015
c0303d5
Win32: factor out retry logic
kblees May 19, 2015
49f4b5d
mingw: explicitly `fflush` stdout
Apr 16, 2015
46b405d
Win32: change default of 'core.symlinks' to false
kblees May 23, 2015
4777504
mingw: Support `git_terminal_prompt` with more terminals
kblees Mar 19, 2015
691a9f8
Win32: add symlink-specific error codes
kblees May 15, 2015
4fe0447
compat/terminal.c: only use the Windows console if bash 'read -r' fails
kblees May 9, 2015
6f1e9fe
Win32: mingw_unlink: support symlinks to directories
kblees May 23, 2015
8458163
winansi: simplify loading the GetCurrentConsoleFontEx() function
dscho Jan 10, 2017
4a7ab30
Win32: mingw_rename: support renaming symlinks
kblees May 19, 2015
3ca0deb
Unbreak interactive GPG prompt upon signing
dscho Sep 6, 2016
a18fc91
Win32: mingw_chdir: change to symlink-resolved directory
kblees May 23, 2015
d830bc4
mingw: ensure valid CTYPE
dscho Feb 21, 2017
a6c763b
Win32: implement readlink()
kblees May 23, 2015
63d0665
Introduce helper to create symlinks that knows about index_state
dscho Feb 11, 2019
16dc9cc
mingw: disable t9020
dscho Feb 23, 2015
384322b
mingw: make is_hidden tests in t0001/t5611 more robust
dscho Feb 21, 2017
63685ac
Win32: implement basic symlink() functionality (file symlinks only)
kblees May 23, 2015
835b966
Win32: symlink: move phantom symlink creation to a separate function
piscisaureus Oct 26, 2018
d95af32
fscache: add key for GIT_TRACE_FSCACHE
jeffhostetler Jan 24, 2017
b8f701d
dir.c: make add_excludes aware of fscache during status
jeffhostetler Nov 1, 2017
af0637d
Win32: support long paths
kblees Jul 28, 2015
2220c16
t9001, t9116: avoid pipes
dscho Jan 11, 2017
70e2bf9
diff: munmap() file contents before running external diff
dscho Oct 5, 2017
50ac26e
Win32: symlink: add support for symlinks to directories
kblees May 23, 2015
a7789d8
mingw: allow to specify the symlink type in .gitattributes
piscisaureus Oct 26, 2018
3933011
Allow `add -p` and `add -i` with a large number of files
kkheller May 27, 2015
e671e51
remove_dirs: do not swallow error when stat() failed
dscho Feb 16, 2016
b2bbe28
fscache: remember not-found directories
jeffhostetler Dec 13, 2016
9dd0a8d
fscache: make fscache_enabled() public
jeffhostetler Dec 20, 2017
85742cf
Win32: fix 'lstat("dir/")' with long paths
kblees Jul 4, 2014
cb2b382
Merge branch 'maybe-drop'
dscho Oct 12, 2018
beae6e8
mingw: try to create symlinks without elevated permissions
dscho May 30, 2017
af6a1ff
Win32: symlink: add test for `symlink` attribute
piscisaureus Oct 26, 2018
8b600f8
t3701: verify that we can add *lots* of files interactively
dscho Sep 12, 2015
bfa1afb
t7300: `git clean -dfx` must show an error with long paths
dscho Feb 16, 2016
84d244c
mingw: support spawning programs containing spaces in their names
dscho Apr 2, 2016
67da543
fscache: add a test for the dir-not-found optimization
dscho Jan 25, 2017
94fd5a1
mingw: ensure that core.longPaths is handled *always*
dscho Aug 29, 2017
82b6a3d
add: use preload-index and fscache for performance
jeffhostetler Nov 22, 2016
8aee87c
dir.c: regression fix for add_excludes with fscache
jeffhostetler Dec 20, 2017
b4ab7be
fetch-pack.c: enable fscache for stats under .git/objects
Nov 22, 2017
8e34c73
mingw: demonstrate that all file handles are inherited by child proce…
dscho Jan 26, 2018
47e09af
mingw: work around incorrect standard handles
dscho Feb 7, 2018
a5b647d
Merge branch 'spawn-with-spaces'
dscho Oct 12, 2018
d6ba665
mingw: spawned processes need to inherit only standard handles
dscho Jan 26, 2018
03c2e35
Merge pull request #1897 from piscisaureus/symlink-attr
dscho Oct 31, 2018
0fbb661
transport-helper: prefer Git's builtins over dashed form
dscho Jul 19, 2017
2977dbc
mingw: explicitly specify with which cmd to prefix the cmdline
dscho Jul 20, 2017
4dd0d13
mingw: when path_lookup() failed, try BusyBox
dscho Jul 20, 2017
838b560
test-run-command: learn to run (parts of) the testsuite
dscho Jul 18, 2017
f6e9104
test-lib: avoid unnecessary Perl invocation
dscho Aug 5, 2017
f553f37
tests: replace mingw_test_cmp with a helper in C
dscho Jun 7, 2018
35faa18
test-tool: learn to act as a drop-in replacement for `iconv`
dscho Jul 20, 2017
5aa1019
tests(mingw): if `iconv` is unavailable, use `test-helper --iconv`
dscho Jul 20, 2017
8fba85b
tests: use t/diff-lib/* consistently
dscho Aug 5, 2017
4d574b3
Merge branch 'jeffhostetler/jeffhostetler/add_preload_fscache'
dscho Feb 7, 2019
926f097
gitattributes: mark .png files as binary
dscho Oct 11, 2018
d26c76f
Merge branch 'atetubou/fscache_checkout_flush'
dscho Feb 7, 2019
763dc36
tests: move test PNGs into t/diff-lib/
dscho Aug 5, 2017
1666cfb
mingw: introduce code to detect whether we're inside a Windows container
ZCube Apr 23, 2018
d2640f7
mem_pool: add GIT_TRACE_MEMPOOL support
benpeart Oct 4, 2018
5cf6846
tests: only override sort & find if there are usable ones in /usr/bin/
dscho Jul 17, 2017
9e8e934
mingw: when running in a Windows container, try to rename() harder
ZCube Apr 23, 2018
283500b
fscache: fscache takes an initial size
benpeart Nov 2, 2018
09fd459
tests: use the correct path separator with BusyBox
dscho Nov 19, 2018
47d21dd
mingw: move the file_attr_to_st_mode() function definition
ZCube Apr 23, 2018
5f01568
Merge branch 'jeffhostetler/jeffhostetler/fscache_nfd'
dscho Feb 7, 2019
00d3742
fscache: update fscache to be thread specific instead of global
benpeart Oct 4, 2018
969d47d
mingw: only use Bash-ism `builtin pwd -W` when available
dscho Jun 29, 2017
131c4ad
checkout.c: enable fscache for checkout again
Jan 30, 2018
02680b5
mingw: Windows Docker volumes are *not* symbolic links
dscho Apr 23, 2018
0a235a1
Enable the filesystem cache (fscache) in refresh_index().
benpeart Sep 7, 2018
b9c37e2
fscache: use FindFirstFileExW to avoid retrieving the short name
benpeart Oct 23, 2018
ccb7ba5
status: disable and free fscache at the end of the status command
benpeart Nov 1, 2018
3dbf29f
fscache: add GIT_TEST_FSCACHE support
benpeart Oct 4, 2018
2f04edb
At the end of the add command, disable and free the fscache so that w…
benpeart Nov 5, 2018
d898aa9
fscache: add fscache hit statistics
benpeart Sep 25, 2018
a5c1c21
fscache: teach fscache to use mempool
benpeart Nov 2, 2018
812356c
tests (mingw): remove Bash-specific pwd option
dscho Jun 30, 2017
8581374
test-lib: add BUSYBOX prerequisite
dscho Jul 19, 2017
2a98be4
t0021: use Windows path when appropriate
dscho Aug 4, 2017
3d12ca5
t1300: mark all test cases with funny filenames as !MINGW
dscho Jul 3, 2017
9fcee07
t4124: avoid using "normal" diff mode
dscho Jul 5, 2017
4591615
t5003: use binary file from t/diff-lib/
dscho Aug 5, 2017
cc45640
t5003: skip `unzip -a` tests with BusyBox
dscho Jul 5, 2017
78bd6bd
t5532: workaround for BusyBox on Windows
dscho Jul 21, 2017
fc85392
t5605: special-case hardlink test for BusyBox-w32
dscho Jul 21, 2017
982ecc6
t5813: allow for $PWD to be a Windows path
dscho Jul 5, 2017
7d83625
Add a Code of Conduct
dscho Jul 24, 2015
0ccaee9
t7063: when running under BusyBox, avoid unsupported find option
dscho Jul 19, 2017
d1943b2
CONTRIBUTING.md: add guide for first-time contributors
derrickstolee Mar 1, 2018
67fd890
t9200: skip tests when $PWD contains a colon
dscho Jul 7, 2017
3239cac
README.md: Add a Windows-specific preamble
dscho Jan 10, 2014
b5184ee
t9350: skip ISO-8859-1 test when the environment is always-UTF-8
dscho Jul 8, 2017
723ddf6
Add an issue template
shiftkey Feb 18, 2016
383e26f
mingw: add a Makefile target to copy test artifacts
dscho Jul 19, 2017
4912d68
mingw (git_terminal_prompt): work around BusyBox & WSL issues
dscho Feb 23, 2018
f5c9333
Modify the GitHub Pull Request template (to reflect Git for Windows)
Dec 22, 2017
cf33c6a
Merge branch 'busybox-w32'
dscho Feb 7, 2019
1ba452c
Merge branch 'docker-volumes-are-no-symlinks'
dscho Feb 7, 2019
2f34714
mingw: kill child processes in a gentler way
dscho May 17, 2017
fd585e4
mingw (git_terminal_prompt): do fall back to CONIN$/CONOUT$ method
dscho Feb 23, 2018
566a91e
.github: Add configuration for the Sentiment Bot
dscho Feb 20, 2018
3413b7d
Add back the original, scripted interactive rebase backend
dscho Aug 24, 2018
6f305c8
status: reinstate --show-ignored-directory as a deprecated option
dscho Nov 9, 2017
8591614
fscache: make fscache_enable() thread safe
benpeart Nov 16, 2018
a6a0432
fscache: teach fscache to use NtQueryDirectoryFile
benpeart Nov 15, 2018
135a0ee
mingw: change core.fsyncObjectFiles = 1 by default
dscho Sep 4, 2017
7b1b1c0
mingw: really handle SIGINT
dscho Apr 22, 2018
b2683e8
mingw (git_terminal_prompt): turn on echo explictly
dscho Feb 23, 2018
7fa5f4b
Document how $HOME is set on Windows
alejandro5042 Mar 9, 2018
ac5e4ed
Merge branch 'make-builtin-stash-and-rebase-opt-ins'
dscho Aug 24, 2018
60578fd
status: carry the --no-lock-index option for backwards-compatibility
dscho Aug 12, 2016
e1b2ca1
status: verify that --show-ignored-directory prints a warning
dscho Nov 9, 2017
020e109
Merge branch 'ready-for-upstream'
dscho Oct 11, 2018
bffa4e7
Merge branch 'gitk-and-git-gui-patches'
dscho Oct 11, 2018
224f9cb
Merge branch 'fscache'
dscho Nov 15, 2018
2f29df7
Merge branch 'long-paths'
dscho Nov 15, 2018
a5bbd64
Merge branch 'msys2'
dscho Nov 15, 2018
1502999
Merge branch 'kblees/kb/symlinks'
dscho Nov 15, 2018
b94fd9c
Merge pull request #1897 from piscisaureus/symlink-attr
dscho Oct 31, 2018
3102b5f
Merge pull request #305 from dscho/msysgit_issues_182
dscho Jun 8, 2018
0230112
Merge branch 'clean-long-paths'
dscho Jun 8, 2018
6f33663
Merge branch 'spawn-with-spaces'
dscho Jun 8, 2018
2490d84
Merge pull request #994 from jeffhostetler/jeffhostetler/fscache_nfd
dscho Jun 8, 2018
dbbb3fb
Merge branch 'core-longpaths-everywhere'
dscho Jun 8, 2018
1580b64
Merge pull request #971 from jeffhostetler/jeffhostetler/add_preload_…
dscho Jun 8, 2018
650f1bc
Merge pull request #1344 from jeffhostetler/perf_add_excludes_with_fs…
dscho Jun 8, 2018
2a71580
Merge pull request #1426 from atetubou/fetch_pack
dscho Jun 8, 2018
b47eeec
Merge pull request #1468 from atetubou/fscache_checkout_flush
dscho Oct 12, 2018
ab8fe4b
Merge 'docker-volumes-are-no-symlinks'
dscho Oct 12, 2018
9ca8bdd
Merge pull request #1827 from benpeart/fscache_refresh_index
dscho Sep 27, 2018
9157c7d
Merge pull request #1908 from benpeart/FindFirstFileEx-gfw
dscho Nov 5, 2018
d62a43b
Merge pull request #1909 from benpeart/free-fscache-after-status-gfw
dscho Nov 5, 2018
9111ee8
Merge pull request #1911 from benpeart/git_test_fscache-gfw
dscho Nov 5, 2018
2dc22e6
Merge pull request #1914 from benpeart/free-fscache-after-add-gfw
dscho Nov 16, 2018
411488c
Merge pull request #1910 from benpeart/fscache_statistics-gfw
dscho Nov 16, 2018
4dcdd3d
Merge remote-tracking branch 'benpeart/fscache-per-thread-gfw'
dscho Nov 16, 2018
89248b1
Merge pull request #1934 from benpeart/fscache-thread-safe-enable-gfw
dscho Nov 26, 2018
7a13267
pkt-line: fix declaration of the `set_packet_header()` function
dscho Apr 10, 2019
b32dc18
parse-options: fix declaration of `parse_opt_unknown_cb()`
dscho Apr 10, 2019
4fb5c37
push: do not pretend to return `int` from `die_push_simple()`
dscho Apr 3, 2019
be919aa
msvc: avoid using minus operator on unsigned types
dscho Apr 3, 2019
d158595
Merge pull request #1937 from benpeart/fscache-NtQueryDirectoryFile-gfw
dscho Nov 27, 2018
d5b092f
winansi: use FLEX_ARRAY to avoid compiler warning
dscho Apr 3, 2019
d1649e0
Merge branch 'fsync-object-files-always'
dscho Oct 11, 2018
a6e9a62
fscache: avoid unnamed struct to avoid compiler warning
dscho Apr 3, 2019
f888446
Merge pull request #1170 from dscho/mingw-kill-process
dscho Oct 11, 2018
841e4b8
compat/win32/path-utils.h: add #include guards
dscho Apr 3, 2019
14cec0b
Merge branch 'fix-terminal-prompt'
dscho Jun 8, 2018
7e0a70b
msvc: ignore some libraries when linking
dscho Apr 3, 2019
cf1d85e
Merge 'readme' into HEAD
dscho Jun 7, 2018
0d571e5
msvc: handle DEVELOPER=1
dscho Apr 3, 2019
e201547
Merge 'builtin-stash-rebase-v3'
jamill Aug 28, 2018
2ec14e3
msvc: work around a bug in GetEnvironmentVariable()
dscho Apr 4, 2019
dcc6e2e
mingw: allow compiling with GCC 8 and DEVELOPER=1
dscho Mar 29, 2019
f885cff
Merge branch 'status-no-lock-index'
dscho Jun 8, 2018
08d2745
ci: really use shallow clones on Azure Pipelines
dscho Apr 3, 2019
b87bf40
kwset: allow building with GCC 8
dscho Mar 29, 2019
ee5efe6
Merge pull request #1354 from dscho/phase-out-show-ignored-directory-…
dscho Jun 8, 2018
24115ea
ci: also test with MS Visual C on Azure Pipelines
dscho Apr 2, 2019
5d237db
Merge pull request #2149 from dscho/gcc-8-gfw
dscho Apr 5, 2019
4b1c5a4
Merge pull request #2148 from dscho/azure-pipelines-msvc
dscho Apr 10, 2019
f64f683
Merge pull request #2160 from dscho/skip-t9822-on-apfs-gfw
dscho Apr 16, 2019
2184d89
Use size_t instead of 'unsigned long' for data in memory
Apr 21, 2019
1c6b12a
Add test prereq for size_t being 64bit wide
t-b Jan 31, 2019
ef6728f
Add test for large files on windows
t-b Jan 31, 2019
a01b33a
Signed-off-by: Thomas Braun <[email protected]>
Apr 21, 2019
81b88c6
t/helper/zlib-compile-flags: read zlib flags
Mar 17, 2019
9f27c3b
zlib.c: explicit cast comparisons of potential 32bit long to size_t
Mar 11, 2019
28f8826
http_push.c: explicit cast computation of potential 32bit long to si…
Mar 11, 2019
96ab005
zlib.c: deflateBound size coercion note
Mar 11, 2019
d53965c
config.mak.uname: Windows: zlib's deflateBounds is 32bit limited
Mar 12, 2019
f2e813e
zlib.c: refactor stream chuncking to fit uLong 32bit counting
Mar 12, 2019
263b8e9
index-pack.c: split bad object error messages
Mar 18, 2019
30beb16
index-pack.c: limit zlib stream buffer capacity
Mar 18, 2019
622fb52
zlib, cache.h: export zlib_buf_cap for public use
Mar 18, 2019
54572a1
xcrc32(): create extended crc32 for 64 bit compatibility
Mar 21, 2019
d5f976b
xcrc32: use xcrc32 wrapper
Mar 21, 2019
130beb0
SQUASH: xcrc32(): create extended crc32 for 64 bit compatibility
Mar 21, 2019
af98c4b
fix buffer size etc (more explain needed)
Mar 21, 2019
e827188
squash! zlib.c: deflateBound size coercion note
Apr 21, 2019
a659bef
t-large-files-on-windows.sh: extra fsck and early verify-pack
Apr 21, 2019
2e18f1e
Revert "index-pack.c: limit zlib stream buffer capacity"
Apr 21, 2019
92196bf
packfile.c: set shift limit to sizeof(size_t), not long
Apr 22, 2019
ba54d74
builtin/indexpack.c: use size_t for chain_histogram in show_pack_info()
Apr 22, 2019
d967625
csum-file.c: use size_t for flush() count
Apr 22, 2019
53723ca
csum-file.[ch]: more size_t conversions
Apr 22, 2019
8ea6681
cache.h: big_file_threshold & pack_size_limit_cfg are size_t
Apr 22, 2019
a9bbe26
make config_ulong be size_t
Apr 22, 2019
0f6695c
more size_t fixes for config and env values, inc new fns.
Apr 22, 2019
a941a49
csum-file: use xcrc for large file compatibility
Apr 22, 2019
2b5aef1
t/t-large-files-on-windows.sh: It's -v for verbose on index-pack
Apr 22, 2019
f5eb8de
test: specify an output file to index-pack
Apr 22, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ Cpp11BracedListStyle: false

# A list of macros that should be interpreted as foreach loops instead of as
# function calls.
ForEachMacros: ['for_each_string_list_item']
ForEachMacros: ['for_each_string_list_item', 'for_each_wanted_builtin', 'for_each_builtin', 'for_each_ut']

# The maximum number of consecutive empty lines to keep.
MaxEmptyLinesToKeep: 1
Expand Down
2 changes: 1 addition & 1 deletion .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ Git community does not use github.com for their contributions. Instead, we use
a mailing list ([email protected]) for code submissions, code
reviews, and bug reports.

Nevertheless, you can use [submitGit](http://submitgit.herokuapp.com/) to
Nevertheless, you can use [GitGitGadget](https://gitgitgadget.github.io/) to
conveniently send your Pull Requests commits to our mailing list.

Please read ["A note from the maintainer"](https://git.kernel.org/pub/scm/git/git.git/plain/MaintNotes?h=todo)
Expand Down
13 changes: 7 additions & 6 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
Thanks for taking the time to contribute to Git!

Those seeking to contribute to the Git for Windows fork should see
http://gitforwindows.org/#contribute on how to contribute Windows specific enhancements.
http://gitforwindows.org/#contribute on how to contribute Windows specific
enhancements.

If your contribution is for the core Git functions and documentation
please be aware that the Git community does not use the github.com issues
or pull request mechanism for their contributions.
or pull request mechanism for their contributions.

Instead, we use the Git mailing list ([email protected]) for code and
Instead, we use the Git mailing list ([email protected]) for code and
documenatation submissions, code reviews, and bug reports. The
mailing list is plain text only (anything with HTML is sent directly
to the spam folder).
to the spam folder).

Nevertheless, you can use submitGit to conveniently send your Pull
Requests commits to our mailing list.
Nevertheless, you can use GitGitGadget (https://gitgitgadget.github.io/)
to conveniently send your Pull Requests commits to our mailing list.

Please read the "guidelines for contributing" linked above!
5 changes: 2 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,6 @@
/git-init-db
/git-interpret-trailers
/git-instaweb
/git-legacy-rebase
/git-legacy-rebase--interactive
/git-legacy-stash
/git-log
/git-ls-files
Expand Down Expand Up @@ -137,14 +135,14 @@
/git-remote-ftps
/git-remote-fd
/git-remote-ext
/git-remote-testgit
/git-remote-testpy
/git-remote-testsvn
/git-repack
/git-replace
/git-request-pull
/git-rerere
/git-reset
/git-restore
/git-rev-list
/git-rev-parse
/git-revert
Expand All @@ -169,6 +167,7 @@
/git-submodule
/git-submodule--helper
/git-svn
/git-switch
/git-symbolic-ref
/git-tag
/git-unpack-file
Expand Down
10 changes: 0 additions & 10 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,6 @@ matrix:
compiler:
addons:
before_install:
- env: jobname=Windows
os: linux
compiler:
addons:
before_install:
script:
- >
test "$TRAVIS_REPO_SLUG" != "git/git" ||
ci/run-windows-build.sh $TRAVIS_BRANCH $(git rev-parse HEAD)
after_failure:
- env: jobname=Linux32
os: linux
compiler:
Expand Down
3 changes: 3 additions & 0 deletions Documentation/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,7 @@ cmds-*.txt
mergetools-*.txt
manpage-base-url.xsl
SubmittingPatches.txt
MyFirstContribution.txt
tmp-doc-diff/
GIT-ASCIIDOCFLAGS
/GIT-EXCLUDED-PROGRAMS
7 changes: 5 additions & 2 deletions Documentation/CodingGuidelines
Original file line number Diff line number Diff line change
Expand Up @@ -580,11 +580,14 @@ Writing Documentation:
or commands:

Literal examples (e.g. use of command-line options, command names,
branch names, configuration and environment variables) must be
typeset in monospace (i.e. wrapped with backticks):
branch names, URLs, pathnames (files and directories), configuration and
environment variables) must be typeset in monospace (i.e. wrapped with
backticks):
`--pretty=oneline`
`git rev-list`
`remote.pushDefault`
`http://git.example.com`
`.git/config`
`GIT_DIR`
`HEAD`

Expand Down
35 changes: 27 additions & 8 deletions Documentation/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,14 @@ ARTICLES =
SP_ARTICLES =
OBSOLETE_HTML =

-include GIT-EXCLUDED-PROGRAMS

MAN1_TXT += $(filter-out \
$(patsubst %,%.txt,$(EXCLUDED_PROGRAMS)) \
$(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
$(wildcard git-*.txt))
MAN1_TXT += git.txt
MAN1_TXT += gitk.txt
MAN1_TXT += gitremote-helpers.txt
MAN1_TXT += gitweb.txt

MAN5_TXT += gitattributes.txt
Expand All @@ -30,6 +32,7 @@ MAN7_TXT += gitdiffcore.txt
MAN7_TXT += giteveryday.txt
MAN7_TXT += gitglossary.txt
MAN7_TXT += gitnamespaces.txt
MAN7_TXT += gitremote-helpers.txt
MAN7_TXT += gitrevisions.txt
MAN7_TXT += gitsubmodules.txt
MAN7_TXT += gittutorial-2.txt
Expand Down Expand Up @@ -74,6 +77,7 @@ API_DOCS = $(patsubst %.txt,%,$(filter-out technical/api-index-skel.txt technica
SP_ARTICLES += $(API_DOCS)

TECH_DOCS += SubmittingPatches
TECH_DOCS += MyFirstContribution
TECH_DOCS += technical/hash-function-transition
TECH_DOCS += technical/http-protocol
TECH_DOCS += technical/index-format
Expand Down Expand Up @@ -331,39 +335,50 @@ mergetools-list.made: ../git-mergetool--lib.sh $(wildcard ../mergetools/*)
show_tool_names can_merge "* " || :' >mergetools-merge.txt && \
date >$@

TRACK_ASCIIDOCFLAGS = $(subst ','\'',$(ASCIIDOC_COMMON):$(ASCIIDOC_HTML):$(ASCIIDOC_DOCBOOK))

GIT-ASCIIDOCFLAGS: FORCE
@FLAGS='$(TRACK_ASCIIDOCFLAGS)'; \
if test x"$$FLAGS" != x"`cat GIT-ASCIIDOCFLAGS 2>/dev/null`" ; then \
echo >&2 " * new asciidoc flags"; \
echo "$$FLAGS" >GIT-ASCIIDOCFLAGS; \
fi

clean:
$(RM) *.xml *.xml.new *.html *.html.new *.1 *.5 *.7
$(RM) *.texi *.texi.new *.texi.new.new git.info gitman.info
$(RM) *.pdf
$(RM) howto-index.txt howto/*.html doc.dep
$(RM) technical/*.html technical/api-index.txt
$(RM) SubmittingPatches.txt
$(RM) MyFirstContribution.txt
$(RM) $(cmds_txt) $(mergetools_txt) *.made
$(RM) manpage-base-url.xsl
$(RM) GIT-ASCIIDOCFLAGS

$(MAN_HTML): %.html : %.txt asciidoc.conf
$(MAN_HTML): %.html : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) [email protected] $@ && \
$(TXT_TO_HTML) -d manpage -o [email protected] $< && \
mv [email protected] $@

$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf
$(OBSOLETE_HTML): %.html : %.txto asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) [email protected] $@ && \
$(TXT_TO_HTML) -o [email protected] $< && \
mv [email protected] $@

manpage-base-url.xsl: manpage-base-url.xsl.in
$(QUIET_GEN)sed "s|@@MAN_BASE_URL@@|$(MAN_BASE_URL)|" $< > $@

%.1 %.5 %.7 : %.xml manpage-base-url.xsl
%.1 %.5 %.7 : %.xml manpage-base-url.xsl $(wildcard manpage*.xsl)
$(QUIET_XMLTO)$(RM) $@ && \
$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<

%.xml : %.txt asciidoc.conf
%.xml : %.txt asciidoc.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) [email protected] $@ && \
$(TXT_TO_XML) -d manpage -o [email protected] $< && \
mv [email protected] $@

user-manual.xml: user-manual.txt user-manual.conf
user-manual.xml: user-manual.txt user-manual.conf asciidoctor-extensions.rb GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) [email protected] $@ && \
$(TXT_TO_XML) -d book -o [email protected] $< && \
mv [email protected] $@
Expand All @@ -373,12 +388,16 @@ technical/api-index.txt: technical/api-index-skel.txt \
$(QUIET_GEN)cd technical && '$(SHELL_PATH_SQ)' ./api-index.sh

technical/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt asciidoc.conf
$(patsubst %,%.html,$(API_DOCS) technical/api-index $(TECH_DOCS)): %.html : %.txt \
asciidoc.conf GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(TXT_TO_HTML) $*.txt

SubmittingPatches.txt: SubmittingPatches
$(QUIET_GEN) cp $< $@

MyFirstContribution.txt: MyFirstContribution
$(QUIET_GEN) cp $< $@

XSLT = docbook.xsl
XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css

Expand Down Expand Up @@ -430,7 +449,7 @@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
WEBDOC_DEST = /pub/software/scm/git/docs

howto/%.html: ASCIIDOC_EXTRA += -a git-relative-html-prefix=../
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt GIT-ASCIIDOCFLAGS
$(QUIET_ASCIIDOC)$(RM) [email protected] $@ && \
sed -e '1,/^$$/d' $< | \
$(TXT_TO_HTML) - >[email protected] && \
Expand Down
Loading