summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2019-12-06Git 2.22.2v2.22.2Johannes Schindelin3-2/+10
2019-12-06Sync with 2.21.1Johannes Schindelin44-87/+967
2019-12-06Git 2.21.1v2.21.1Johannes Schindelin3-2/+14
2019-12-06Merge branch 'fix-msys2-quoting-bugs'Johannes Schindelin1-5/+20
2019-12-06mingw: sh arguments need quoting in more circumstancesJohannes Schindelin1-2/+3
2019-12-06t7415: drop v2.20.x-specific work-aroundJohannes Schindelin1-1/+1
2019-12-06mingw: fix quoting of empty arguments for `sh`Johannes Schindelin1-1/+1
2019-12-06mingw: use MSYS2 quoting even when spawning shell scriptsJohannes Schindelin1-1/+2
2019-12-06mingw: detect when MSYS2's sh is to be spawned more robustlyJohannes Schindelin1-1/+14
2019-12-06Sync with 2.20.2Johannes Schindelin43-82/+935
2019-12-06Git 2.20.2v2.20.2Johannes Schindelin3-2/+20
2019-12-06submodule: defend against submodule.update = !command in .gitmodulesJonathan Nieder1-0/+2
2019-12-06t7415: adjust test for dubiously-nested submodule gitdirs for v2.20.xJohannes Schindelin1-1/+1
2019-12-06Sync with 2.19.3Johannes Schindelin40-82/+914
2019-12-06Git 2.19.3v2.19.3Johannes Schindelin3-2/+10
2019-12-06Sync with 2.18.2Johannes Schindelin39-82/+906
2019-12-06Git 2.18.2v2.18.2Johannes Schindelin3-2/+10
2019-12-06Sync with 2.17.3Johannes Schindelin38-83/+898
2019-12-06Git 2.17.3v2.17.3Johannes Schindelin3-2/+14
2019-12-06fsck: reject submodule.update = !command in .gitmodulesJonathan Nieder2-0/+21
2019-12-06Sync with 2.16.6Johannes Schindelin37-82/+865
2019-12-06Git 2.16.6v2.16.6Johannes Schindelin3-2/+10
2019-12-06test-drop-caches: use `has_dos_drive_prefix()`Johannes Schindelin1-5/+8
2019-12-06Sync with 2.15.4Johannes Schindelin35-77/+842
2019-12-06Git 2.15.4v2.15.4Johannes Schindelin3-2/+13
2019-12-06submodule: reject submodule.update = !command in .gitmodulesJonathan Nieder3-11/+20
2019-12-06Sync with 2.14.6Johannes Schindelin31-66/+811
2019-12-06Git 2.14.6v2.14.6Johannes Schindelin3-2/+56
2019-12-05Merge branch 'win32-accommodate-funny-drive-names'Johannes Schindelin4-6/+54
2019-12-05Merge branch 'win32-filenames-cannot-have-trailing-spaces-or-periods'Johannes Schindelin11-4/+127
2019-12-05Merge branch 'fix-mingw-quoting-bug'Johannes Schindelin3-5/+156
2019-12-05Merge branch 'dubiously-nested-submodules'Johannes Schindelin4-2/+79
2019-12-05Merge branch 'turn-on-protectntfs-by-default'Johannes Schindelin3-28/+31
2019-12-05mingw: handle `subst`-ed "DOS drives"Johannes Schindelin4-3/+36
2019-12-05Merge branch 'disallow-dotgit-via-ntfs-alternate-data-streams'Johannes Schindelin6-8/+162
2019-12-05mingw: refuse to access paths with trailing spaces or periodsJohannes Schindelin8-2/+123
2019-12-05quote-stress-test: offer to test quoting arguments for MSYS2 shJohannes Schindelin1-3/+10
2019-12-05mingw: refuse to access paths with illegal charactersJohannes Schindelin3-3/+18
2019-12-05unpack-trees: let merged_entry() pass through do_add_entry()'s errorsJohannes Schindelin1-1/+2
2019-12-05quote-stress-test: allow skipping some trialsJohannes Schindelin1-1/+5
2019-12-05t6130/t9350: prepare for stringent Win32 path validationJohannes Schindelin2-1/+2
2019-12-05quote-stress-test: accept arguments to test via the command-lineJohannes Schindelin1-13/+22
2019-12-05tests: add a helper to stress test argument quotingGarima Singh1-2/+116
2019-12-05Disallow dubiously-nested submodule git directoriesJohannes Schindelin4-2/+79
2019-12-05protect_ntfs: turn on NTFS protection by defaultJohannes Schindelin2-3/+1
2019-12-05path: also guard `.gitmodules` against NTFS Alternate Data StreamsJohannes Schindelin2-2/+7
2019-12-05mingw: fix quoting of argumentsJohannes Schindelin2-3/+20
2019-12-05is_ntfs_dotgit(): speed it upJohannes Schindelin1-25/+30
2019-12-05path: safeguard `.git` against NTFS Alternate Streams AccessesJohannes Schindelin2-1/+12
2019-12-05is_ntfs_dotgit(): only verify the leading segmentJohannes Schindelin3-5/+19
2019-12-05test-path-utils: offer to run a protectNTFS/protectHFS benchmarkGarima Singh1-0/+96
2019-12-04Merge branch 'prevent-name-squatting-on-windows'Johannes Schindelin7-2/+60
2019-12-04Merge branch 'jk/fast-import-unsafe'Johannes Schindelin4-18/+95
2019-12-04path.c: document the purpose of `is_ntfs_dotgit()`Johannes Schindelin1-0/+28
2019-12-04mingw: disallow backslash characters in tree objects' file namesJohannes Schindelin4-3/+13
2019-12-04clone --recurse-submodules: prevent name squatting on WindowsJohannes Schindelin4-2/+50
2019-12-04fast-import: disallow "feature import-marks" by defaultJeff King3-6/+21
2019-12-04fast-import: disallow "feature export-marks" by defaultJeff King4-8/+55
2019-12-04fast-import: delay creating leading directories for export-marksJeff King2-3/+17
2019-12-04fast-import: stop creating leading directories for import-marksJeff King1-1/+0
2019-12-04fast-import: tighten parsing of boolean command line optionsJeff King1-2/+2
2019-12-04t9300: create marks files for double-import-marks testJeff King1-0/+2
2019-12-04t9300: drop some useless uses of catJeff King1-5/+5
2019-08-11Git 2.22.1v2.22.1Junio C Hamano2-1/+4
2019-08-11.mailmap: update email address of Philip OakleyPhilip Oakley1-0/+1
2019-08-09Merge branch 'cb/xdiff-no-system-includes-in-dot-c' into maintJunio C Hamano3-8/+0
2019-08-09Merge branch 'jk/no-system-includes-in-dot-c' into maintJunio C Hamano3-3/+0
2019-08-09Merge branch 'sg/fsck-config-in-doc' into maintJunio C Hamano1-0/+5
2019-08-09Merge branch 'jk/xdiff-clamp-funcname-context-index' into maintJunio C Hamano2-2/+24
2019-08-01RelNotes/2.21.1: typofixMartin Ågren1-1/+1
2019-07-29Merge fixes made on the 'master' frontJunio C Hamano1-1/+72
2019-07-29Merge branch 'jc/post-c89-rules-doc' into maintJunio C Hamano1-3/+23
2019-07-29Merge branch 'fc/fetch-with-import-fix' into maintJunio C Hamano3-23/+45
2019-07-29Merge branch 'ds/close-object-store' into maintJunio C Hamano19-327/+398
2019-07-29Merge branch 'pw/add-p-recount' into maintJunio C Hamano2-1/+13
2019-07-29Merge branch 'rs/avoid-overflow-in-midpoint-computation' into maintJunio C Hamano6-7/+8
2019-07-29Merge branch 'jk/trailers-use-config' into maintJunio C Hamano2-27/+47
2019-07-29Merge branch 'tg/stash-ref-by-index-fix' into maintJunio C Hamano2-4/+23
2019-07-29Merge branch 'pw/rebase-abort-clean-rewritten' into maintJunio C Hamano3-15/+53
2019-07-29Merge branch 'nd/completion-no-cache-failure' into maintJunio C Hamano1-1/+2
2019-07-29Merge branch 'rs/config-unit-parsing' into maintJunio C Hamano1-21/+18
2019-07-29Merge branch 'jk/delta-islands-progress-fix' into maintJunio C Hamano3-4/+5
2019-07-29Merge branch 'sg/rebase-progress' into maintJunio C Hamano8-98/+104
2019-07-29Merge branch 'ms/submodule-foreach-fix' into maintJunio C Hamano2-0/+8
2019-07-29Merge branch 'js/rebase-reschedule-applies-only-to-interactive' into maintJunio C Hamano2-3/+15
2019-07-29Merge branch 'qn/clone-doc-use-long-form' into maintJunio C Hamano1-17/+17
2019-07-29Merge branch 'jc/denoise-rm-to-resolve' into maintJunio C Hamano2-1/+14
2019-07-29Merge branch 'js/mingw-spawn-with-spaces-in-path' into maintJunio C Hamano2-3/+11
2019-07-29Merge branch 'sr/gpg-interface-stop-at-the-end' into maintJunio C Hamano1-0/+3
2019-07-29Merge branch 'js/clean-report-too-long-a-path' into maintJunio C Hamano2-1/+14
2019-07-29Merge branch 'es/local-atomic-push-failure-with-http' into maintJunio C Hamano3-0/+69
2019-07-29Merge branch 'po/doc-branch' into maintJunio C Hamano2-7/+29
2019-07-29Merge branch 'dl/config-alias-doc' into maintJunio C Hamano1-6/+16
2019-07-29Merge branch 'cb/fsmonitor-intfix' into maintJunio C Hamano1-4/+4
2019-07-29Merge branch 'rs/copy-array' into maintJunio C Hamano5-22/+53
2019-07-29Merge branch 'js/t3404-typofix' into maintJunio C Hamano1-1/+1
2019-07-29Merge branch 'cb/mkstemps-uint-type-fix' into maintJunio C Hamano1-1/+1
2019-07-29Merge branch 'js/t0001-case-insensitive' into maintJunio C Hamano2-14/+23
2019-07-29Merge branch 'jw/gitweb-sample-update' into maintJunio C Hamano1-2/+1
2019-07-29Merge branch 'sg/t5551-fetch-smart-error-is-translated' into maintJunio C Hamano1-2/+2
2019-07-29Merge branch 'jt/t5551-test-chunked' into maintJunio C Hamano1-3/+2
2019-07-29Merge branch 'sg/git-C-empty-doc' into maintJunio C Hamano1-1/+2
2019-07-29Merge branch 'sg/ci-brew-gcc-workaround' into maintJunio C Hamano2-3/+5
2019-07-29Merge branch 'js/trace2-signo-typofix' into maintJunio C Hamano1-1/+1
2019-07-29Merge branch 'di/readme-markup-fix' into maintJunio C Hamano1-1/+1
2019-07-29Merge branch 'vn/xmmap-gently' into maintJunio C Hamano1-1/+1
2019-07-29Merge branch 'rm/gpg-program-doc-fix' into maintJunio C Hamano1-1/+1
2019-07-29Merge branch 'js/unmap-before-ext-diff' into maintJunio C Hamano1-0/+2
2019-07-29Merge branch 'js/gcc-8-and-9' into maintJunio C Hamano4-13/+15
2019-07-29Documentation/git-fsck.txt: include fsck.* config variablesSZEDER Gábor1-0/+5
2019-07-28xdiff: remove duplicate headers from xpatience.cCarlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: remove duplicate headers from xhistogram.cCarlo Marcelo Arenas Belón1-2/+0
2019-07-28xdiff: drop system includes in xutils.cCarlo Marcelo Arenas Belón1-4/+0
2019-07-25Flush fixes up to the third batch post 2.22.0Junio C Hamano2-1/+77
2019-07-25Merge branch 'ab/hash-object-doc' into maintJunio C Hamano1-3/+1
2019-07-25Merge branch 'cm/send-email-document-req-modules' into maintJunio C Hamano1-2/+6
2019-07-25Merge branch 'sw/git-p4-unshelve-branched-files' into maintJunio C Hamano2-2/+8
2019-07-25Merge branch 'js/bisect-helper-check-get-oid-return-value' into maintJunio C Hamano1-1/+4
2019-07-25Merge branch 'es/git-debugger-doc' into maintJunio C Hamano1-0/+6
2019-07-25Merge branch 'mo/clang-format-for-each-update' into maintJunio C Hamano1-2/+15
2019-07-25Merge branch 'md/url-parse-harden' into maintJunio C Hamano1-2/+2
2019-07-25Merge branch 'an/ignore-doc-update' into maintJunio C Hamano1-22/+44
2019-07-25Merge branch 'md/list-objects-filter-memfix' into maintJunio C Hamano1-8/+8
2019-07-25Merge branch 'jt/partial-clone-missing-ref-delta-base' into maintJunio C Hamano2-15/+123
2019-07-25Merge branch 'xl/record-partial-clone-origin' into maintJunio C Hamano2-4/+14
2019-07-25Merge branch 'pb/request-pull-verify-remote-ref' into maintJunio C Hamano2-17/+82
2019-07-25Merge branch 'mm/p4-unshelve-windows-fix' into maintJunio C Hamano1-1/+1
2019-07-25Merge branch 'bb/unicode-12.1-reiwa' into maintJunio C Hamano1-2/+1
2019-07-25Merge branch 'js/fsmonitor-unflake' into maintJunio C Hamano8-13/+14
2019-07-25Merge branch 'vv/merge-squash-with-explicit-commit' into maintJunio C Hamano3-1/+19
2019-07-25Merge branch 'js/bundle-verify-require-object-store' into maintJunio C Hamano2-0/+9
2019-07-25Merge branch 'jk/am-i-resolved-fix' into maintJunio C Hamano2-11/+64
2019-07-25Merge branch 'jk/HEAD-symref-in-xfer-namespaces' into maintJunio C Hamano3-3/+32
2019-07-25Merge branch 'ew/server-info-remove-crufts' into maintJunio C Hamano2-11/+9
2019-07-25Merge branch 'es/grep-require-name-when-needed' into maintJunio C Hamano1-0/+4
2019-07-25Merge branch 'ds/object-info-for-prefetch-fix' into maintJunio C Hamano2-4/+8
2019-07-25Merge branch 'mh/import-transport-fd-fix' into maintJunio C Hamano2-2/+2
2019-07-25Merge branch 'nd/corrupt-worktrees' into maintJunio C Hamano2-2/+17
2019-07-25Merge branch 'nd/init-relative-template-fix' into maintJunio C Hamano3-4/+7
2019-07-23xdiff: clamp function context indices in post-imageJeff King2-2/+24
2019-07-19clean: show an error message when the path is too longJohannes Schindelin2-1/+14
2019-07-18CodingGuidelines: spell out post-C89 rulesJunio C Hamano1-3/+23
2019-07-18README: fix rendering of text in angle bracketsDoug Ilijev1-1/+1
2019-07-18rm: resolving by removal is not a warning-worthy eventJunio C Hamano2-1/+14
2019-07-16transport-helper: avoid var decl in for () loop controlJunio C Hamano1-1/+2
2019-07-16mingw: support spawning programs containing spaces in their namesJohannes Schindelin2-3/+11
2019-07-16gpg-interface: do not scan past the end of bufferSteven Roberts1-0/+3
2019-07-14read-cache.c: do not die if mmap failsVarun Naik1-1/+1
2019-07-12gpg(docs): use correct --verify syntaxRobert Morgan1-1/+1
2019-07-12transport-helper: enforce atomic in push_refs_with_pushEmily Shaffer3-0/+68
2019-07-11diff: munmap() file contents before running external diffJohannes Schindelin1-0/+2
2019-07-09trace2: correct trace2 field name documentationJosh Steadmon1-1/+1
2019-07-08ci/lib.sh: update a comment about installed P4 and Git-LFS versionsSZEDER Gábor1-2/+4
2019-07-03ci: disable Homebrew's auto cleanupSZEDER Gábor1-1/+1
2019-07-03ci: don't update HomebrewSZEDER Gábor1-1/+1
2019-07-02docs: git-clone: list short form of options firstQuentin Nerden1-9/+9
2019-07-02docs: git-clone: refer to long form of optionsQuentin Nerden1-8/+8
2019-07-01Document that 'git -C ""' works and doesn't change directorySZEDER Gábor1-1/+2
2019-07-01rebase --am: ignore rebase.rescheduleFailedExecJohannes Schindelin2-3/+15
2019-06-27progress: use term_clear_line()SZEDER Gábor2-20/+14
2019-06-27rebase: fix garbled progress display with '-x'SZEDER Gábor2-5/+16
2019-06-27t5551: test usage of chunked encoding explicitlyJonathan Tan1-3/+2
2019-06-25t5551: use 'test_i18ngrep' to check translated outputSZEDER Gábor1-2/+2
2019-06-25submodule foreach: fix recursion of optionsMorian Sonnet2-0/+8
2019-06-24pager: add a helper function to clear the last line in the terminalSZEDER Gábor3-3/+24
2019-06-24t3404: make the 'rebase.missingCommitsCheck=ignore' test more focusedSZEDER Gábor1-14/+1
2019-06-24t3404: modernize here doc styleSZEDER Gábor1-65/+58
2019-06-24doc: don't use git.kernel.org as example gitweb URLJakub Wilk1-2/+1
2019-06-24config: simplify parsing of unit factorsRené Scharfe1-18/+12
2019-06-24config: don't multiply in parse_unit_factor()René Scharfe1-7/+9
2019-06-24config: use unsigned_mult_overflows to check for overflowsRené Scharfe1-6/+7
2019-06-24t0001: fix on case-insensitive filesystemsJohannes Schindelin2-14/+23
2019-06-20delta-islands: respect progress flagJeff King3-4/+5
2019-06-19stash: fix show referencing stash indexThomas Gummerer2-4/+23
2019-06-19wt-status.h: drop stdio.h includeJeff King1-1/+0
2019-06-19verify-tag: drop signal.h includeJeff King2-2/+0
2019-06-19wrapper: avoid undefined behaviour in macOSCarlo Marcelo Arenas Belón1-1/+1
2019-06-19interpret-trailers: load default configJeff King2-27/+47
2019-06-17use COPY_ARRAY for copying arraysRené Scharfe4-7/+7
2019-06-17coccinelle: use COPY_ARRAY for copying arraysRené Scharfe1-15/+46
2019-06-17fsmonitor: avoid signed integer overflow / infinite loopCarlo Marcelo Arenas Belón1-4/+4
2019-06-14t3404: fix a typoJohannes Schindelin1-1/+1
2019-06-13cleanup: fix possible overflow errors in binary search, part 2René Scharfe6-7/+8
2019-06-13add -p: fix checkout -p with pathological contextPhillip Wood2-1/+13
2019-06-13config: avoid calling `labs()` on too-large data typeJohannes Schindelin1-2/+2
2019-06-13winansi: simplify loading the GetCurrentConsoleFontEx() functionJohannes Schindelin1-9/+5
2019-06-13kwset: allow building with GCC 8Johannes Schindelin1-1/+7
2019-06-13poll (mingw): allow compiling with GCC 8 and DEVELOPER=1Johannes Schindelin1-1/+1
2019-06-12packfile: rename close_all_packs to close_object_storeDerrick Stolee11-12/+12
2019-06-12packfile: close commit-graph in close_all_packsDerrick Stolee1-0/+3
2019-06-12commit-graph: use raw_object_store when closingDerrick Stolee3-6/+6
2019-06-12commit-graph: extract write_commit_graph_file()Derrick Stolee1-75/+80
2019-06-12commit-graph: extract copy_oids_to_commits()Derrick Stolee1-25/+32
2019-06-12commit-graph: extract count_distinct_commits()Derrick Stolee1-13/+22
2019-06-12commit-graph: extract fill_oids_from_all_packs()Derrick Stolee1-11/+15
2019-06-12commit-graph: extract fill_oids_from_commit_hex()Derrick Stolee1-32/+40
2019-06-12commit-graph: extract fill_oids_from_packs()Derrick Stolee1-36/+47
2019-06-12commit-graph: create write_commit_graph_contextDerrick Stolee1-196/+194
2019-06-12commit-graph: remove Future Work sectionDerrick Stolee1-17/+0
2019-06-12commit-graph: collapse parameters into flagsDerrick Stolee5-13/+18