summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-04-19Git 2.18.4v2.18.4Jonathan Nieder10-42/+464
2020-04-19Git 2.17.5v2.17.5Jeff King3-2/+24
2020-04-19fsck: reject URL with empty host in .gitmodulesJonathan Nieder2-3/+39
2020-04-19credential: treat URL with empty scheme as invalidJonathan Nieder3-3/+43
2020-04-19credential: treat URL without scheme as invalidJonathan Nieder4-9/+84
2020-04-19credential: die() when parsing invalid urlsJeff King2-6/+3
2020-04-19fsck: convert gitmodules url to URL passed to curlJonathan Nieder2-5/+118
2020-04-19credential: refuse to operate when missing host or protocolJeff King2-14/+40
2020-04-19credential: parse URL without host as empty host, not unsetJeff King3-2/+19
2020-04-19t0300: use more realistic inputsJeff King1-4/+85
2020-04-19t0300: make "quit" helper more realisticJeff King1-3/+13
2020-03-17Git 2.18.3v2.18.3Junio C Hamano10-7/+122
2020-03-17Git 2.17.4v2.17.4Junio C Hamano3-2/+18
2020-03-12fsck: detect gitmodules URLs with embedded newlinesJeff King2-2/+32
2020-03-12credential: detect unrepresentable values when parsing urlsJeff King3-4/+60
2020-03-12t/lib-credential: use test_i18ncmp to check stderrJeff King1-1/+1
2020-03-12credential: avoid writing values with newlinesJeff King2-0/+8
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
2018-09-27Git 2.18.1v2.18.1Junio C Hamano3-2/+8
2018-09-27Sync with 2.17.2Junio C Hamano9-0/+142
2018-09-27Git 2.17.2v2.17.2Junio C Hamano3-2/+14
2018-09-27fsck: detect submodule paths starting with dashJeff King2-0/+15
2018-09-27fsck: detect submodule urls starting with dashJeff King2-0/+22
2018-09-27Sync with 2.16.5Junio C Hamano7-0/+93
2018-09-27Git 2.16.5v2.16.5Junio C Hamano3-2/+8
2018-09-27Sync with 2.15.3Junio C Hamano6-0/+87
2018-09-27Git 2.15.3v2.15.3Junio C Hamano3-2/+8
2018-09-27Sync with Git 2.14.4Junio C Hamano5-0/+81
2018-09-27Git 2.14.5v2.14.5Junio C Hamano3-2/+18
2018-09-27submodule-config: ban submodule paths that start with a dashJeff King2-0/+22
2018-09-27submodule-config: ban submodule urls that start with dashJeff King2-0/+42
2018-09-27submodule--helper: use "--" to signal end of clone optionsJeff King1-0/+1
2018-06-21Git 2.18v2.18.0Junio C Hamano1-1/+1
2018-06-19Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano0-0/+0
2018-06-19Merge tag 'l10n-2.18.0-rnd3.1' of git://github.com/git-l10n/git-poJunio C Hamano2-2522/+3541
2018-06-19Merge branch 'cf/submodule-progress-dissociate'Junio C Hamano1-2/+4
2018-06-19Merge branch 'js/rebase-i-root-fix'Junio C Hamano1-1/+2
2018-06-19t7400: encapsulate setup code in test_expect_successStefan Beller1-2/+4
2018-06-19t3404: check root commit in 'rebase -i --root reword root commit'Todd Zullinger1-1/+2
2018-06-19doc: fix typos in documentation and release notesKarthikeyan Singaravelan4-4/+4
2018-06-18Almost 2.18 finalJunio C Hamano1-0/+11
2018-06-18Merge branch 'es/make-no-iconv'Junio C Hamano1-10/+12
2018-06-18Merge branch 'sg/t7406-chain-fix'Junio C Hamano1-6/+6
2018-06-18Merge branch 'ks/branch-set-upstream'Junio C Hamano1-1/+1
2018-06-18Merge branch 'js/rebase-i-root-fix'Junio C Hamano2-1/+10
2018-06-18Merge branch 'jk/ewah-bounds-check'Junio C Hamano5-7/+38
2018-06-18Merge tag 'l10n-2.18.0-rnd3' of git://github.com/git-l10n/git-poJunio C Hamano10-17929/+26095
2018-06-18A bunch of micro-fixes before going 2.18 finalJunio C Hamano1-0/+11
2018-06-19l10n: ko.po: Update Korean translationChangwoo Ryu2-2522/+3541
2018-06-18Merge branch 'sb/blame-color'Junio C Hamano1-0/+1
2018-06-18Merge branch 'mw/doc-merge-enumfix'Junio C Hamano1-1/+1
2018-06-18Merge branch 'en/rename-directory-detection'Junio C Hamano1-5/+5
2018-06-18Merge branch 'rd/doc-remote-tracking-with-hyphen'Junio C Hamano3-5/+5
2018-06-18Merge branch 'jl/zlib-restore-nul-termination'Junio C Hamano1-0/+3
2018-06-18Merge branch 'ab/cred-netrc-no-autodie'Junio C Hamano1-1/+0
2018-06-18Merge branch 'km/doc-workflows-typofix'Junio C Hamano1-1/+1
2018-06-18Merge branch 'ld/git-p4-updates'Junio C Hamano5-24/+307
2018-06-18Merge branch 'rd/diff-options-typofix'Junio C Hamano1-4/+4
2018-06-18Merge branch 'rd/comment-typofix-in-sha1-file'Junio C Hamano1-1/+1
2018-06-18merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe1-5/+5
2018-06-18RelNotes 2.18: minor fix to entry about dynamically loading completionsSZEDER Gábor1-1/+1
2018-06-18t7406-submodule-update: fix broken &&-chainsSZEDER Gábor1-6/+6
2018-06-18rebase --root: fix amending root commit messagesJohannes Schindelin2-2/+2
2018-06-18rebase --root: demonstrate a bug while amending root commit messagesTodd Zullinger1-0/+9
2018-06-18ewah: adjust callers of ewah_read_mmap()Jeff King2-2/+3
2018-06-18ewah_read_mmap: bounds-check mmap readsJeff King3-5/+35
2018-06-18t3200: clarify description of --set-upstream testKaartic Sivaraam1-1/+1
2018-06-18l10n: zh_CN: for git v2.18.0 l10n round 1 to 3Jiang Xin1-2452/+3552
2018-06-17Merge branch 'master' of git://github.com/nafmo/git-l10n-svJiang Xin1-2453/+3562
2018-06-17Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-21/+21
2018-06-17Merge branch 'master' of git://github.com/alshopov/git-poJiang Xin1-19/+19
2018-06-17Merge branch 'fr_2.18_rnd3' of git://github.com/jnavila/gitJiang Xin1-466/+1071
2018-06-17l10n: bg.po: Updated Bulgarian translation (3608t)Alexander Shopov1-19/+19
2018-06-17l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round 3Tran Ngoc Quan1-21/+21
2018-06-16l10n: fr.po v2.18.0 round 3Jean-Noël Avila1-466/+1071
2018-06-16l10n: es.po: Spanish update for v2.18.0 round 3Christopher Diaz Riveros1-20/+20
2018-06-16l10n: git.pot: v2.18.0 round 3 (1 new, 1 removed)Jiang Xin1-17/+17
2018-06-16Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin8-12862/+18214
2018-06-15Makefile: make NO_ICONV really mean "no iconv"Eric Sunshine1-10/+12
2018-06-15Merge branch 'master' of https://github.com/vnwildman/gitJiang Xin1-430/+994
2018-06-14doc: update the order of the syntax `git merge --continue`Meng-Sung Wu1-1/+1
2018-06-14blame: release string_list after use in parse_color_fields()René Scharfe1-0/+1
2018-06-14merge-recursive: use xstrdup() instead of fixed bufferRené Scharfe1-5/+5
2018-06-14l10n: vi.po(3608t): Update Vietnamese translation for v2.18.0 round2Tran Ngoc Quan1-430/+994
2018-06-13Git 2.18-rc2v2.18.0-rc2Junio C Hamano2-1/+7
2018-06-13Merge branch 'jk/index-pack-maint'Junio C Hamano4-2/+25
2018-06-13Merge branch 'sg/completion-zsh-workaround'Junio C Hamano2-2/+5
2018-06-13Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano1-2/+2
2018-06-13Merge branch 'jk/submodule-fsck-loose-fixup'Junio C Hamano2-8/+24
2018-06-13packfile: correct zlib buffer handlingJeremy Linton1-0/+3
2018-06-13RelNotes 2.18: clarify where directory rename detection appliesElijah Newren1-1/+1
2018-06-13Use hyphenated "remote-tracking branch" (docs and comments)Robert P. J. Day3-5/+5
2018-06-13git-credential-netrc: remove use of "autodie"Ævar Arnfjörð Bjarmason1-1/+0
2018-06-12git-p4: auto-size the blockLuke Diamand2-6/+29
2018-06-12git-p4: narrow the scope of exceptions caught when parsing an intLuke Diamand1-1/+1
2018-06-12git-p4: raise exceptions from p4CmdList based on error from p4 serverLuke Diamand1-4/+40
2018-06-12git-p4: better error reporting when p4 failsLuke Diamand2-0/+133
2018-06-12git-p4: add option to disable syncing of p4/master with p4Luke Diamand2-11/+28
2018-06-12git-p4: disable-rebase: allow setting this via configurationLuke Diamand2-2/+5
2018-06-12git-p4: add options --commit and --disable-rebaseRomain Merland3-6/+77
2018-06-12gitworkflows: fix grammar in 'Merge upwards' ruleKyle Meyer1-1/+1
2018-06-12completion: correct zsh detection when run from git-completion.zshSZEDER Gábor2-2/+5
2018-06-12l10n: bg.po: Updated Bulgarian translation (3608t)Alexander Shopov1-2463/+3598
2018-06-11index-pack: correct install_packed_git() argsJunio C Hamano1-1/+1
2018-06-11diff-options.txt: fix minor typos, font inconsistencies, in docsRobert P. J. Day1-4/+4
2018-06-11merge-submodule: reduce output verbosityLeif Middelschulte1-2/+2
2018-06-11fsck: avoid looking at NULL blob->objectJeff King2-1/+20
2018-06-11t7415: don't bother creating commit for symlink testJeff King1-7/+4
2018-06-11RelNotes 2.18: typofixesJunio C Hamano1-2/+2
2018-06-10l10n: es.po: Spanish update for v2.18.0 round 2Christopher Diaz Riveros1-422/+994
2018-06-08l10n: sv.po: Update Swedish translation (3608t0f0u)Peter Krefting1-428/+981
2018-06-08l10n: sv.po: Update Swedish translation (3470t0f0u)Peter Krefting1-2296/+2852
2018-06-08l10n: git.pot: v2.18.0 round 2 (144 new, 6 removed)Jiang Xin1-409/+962
2018-06-08Merge branch 'master' of git://github.com/git-l10n/git-poJiang Xin7-9951/+12479
2018-06-04Git 2.18-rc1v2.18.0-rc1Junio C Hamano2-1/+13
2018-06-04Merge branch 'bc/t3430-fixup'Junio C Hamano1-3/+2
2018-06-04Merge branch 'bw/refspec-api'Junio C Hamano1-0/+2
2018-06-04Merge branch 'tg/doc-sec-list'Junio C Hamano2-4/+20
2018-06-04Merge branch 'rd/p4-doc-markup-env'Junio C Hamano1-5/+5
2018-06-04Merge branch 'nd/remote-update-doc'Junio C Hamano1-2/+2
2018-06-04Merge branch 'jt/submodule-pull-recurse-rebase'Junio C Hamano3-3/+29
2018-06-04remote: doc typofixDuy Nguyen1-1/+1
2018-06-04sha1-file.c: correct $GITDIR to $GIT_DIR in a commentRobert P. J. Day1-1/+1
2018-06-04t3430: test clean-upbrian m. carlson1-3/+2
2018-06-04Merge branch 'fr_2.18_round1' of git://github.com/jnavila/gitJiang Xin1-2317/+2889
2018-06-03l10n: fr.po v2.18 round 1Jean-Noël Avila1-2317/+2889
2018-06-03l10n: vi(3470t): Updated Vietnamese translation for v2.18.0Tran Ngoc Quan1-2298/+2863
2018-06-02l10n: es.po: Spanish update for v2.18.0 round 1Christopher Diaz Riveros1-2360/+2918
2018-06-01A bit more topics before -rc1Junio C Hamano1-0/+22
2018-06-01Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano3-0/+25
2018-06-01fetch: do not pass ref-prefixes for fetch by exact SHA1Jonathan Nieder3-0/+25
2018-06-01Merge branch 'cc/tests-without-assuming-ref-files-backend'Junio C Hamano11-27/+28
2018-06-01Merge branch 'rd/init-typo'Junio C Hamano1-1/+1
2018-06-01Merge branch 'js/rebase-recreate-merge'Junio C Hamano3-2/+19
2018-06-01Merge branch 'rd/tag-doc-lightweight'Junio C Hamano1-2/+2
2018-06-01Merge branch 'rd/doc-options-placeholder'Junio C Hamano19-38/+38
2018-06-01Merge branch 'en/rev-parse-invalid-range'Junio C Hamano2-2/+14
2018-06-01Merge branch 'ld/p4-unshelve'Junio C Hamano3-36/+347
2018-06-01Merge branch 'nd/use-opt-int-set-f'Junio C Hamano11-50/+47
2018-06-01Merge branch 'pa/import-tars-long-names'Junio C Hamano1-2/+29
2018-06-01Merge branch 'nd/command-list'Junio C Hamano25-313/+589
2018-06-01index-pack: handle --strict checks of non-repo packsJeff King2-2/+16
2018-06-01prepare_commit_graft: treat non-repository as a noopJeff King2-0/+9
2018-06-01refspec-api: avoid uninitialized field in refspec itemJunio C Hamano1-0/+2
2018-06-01p4.txt: Use backquotes for variable namesRobert P. J. Day1-5/+5
2018-06-01remote.txt: update documentation for 'update' commandDuy Nguyen1-2/+2
2018-06-01RelNotes: remove duplicate release noteElijah Newren1-11/+3
2018-06-01note git-security@googlegroups.com in more placesThomas Gummerer2-0/+16
2018-06-01SubmittingPatches: replace numbered attributes with namesThomas Gummerer1-4/+4
2018-05-31l10n: git.pot: v2.18.0 round 1 (108 new, 14 removed)Jiang Xin1-2259/+2739
2018-05-31Merge remote-tracking branch 'git-po/maint'Jiang Xin3-717/+1070
2018-05-30Git 2.18-rc0v2.18.0-rc0Junio C Hamano2-1/+37
2018-05-30Merge branch 'bw/remote-curl-compressed-responses'Junio C Hamano3-6/+12
2018-05-30Merge branch 'ma/unpack-trees-free-msgs'Junio C Hamano7-37/+64