summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
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
2018-05-30Merge branch 'bc/hash-independent-tests'Junio C Hamano71-267/+338
2018-05-30Merge branch 'ma/regex-no-regfree-after-comp-fail'Junio C Hamano2-3/+0
2018-05-30Merge branch 'ma/config-store-data-clear'Junio C Hamano1-18/+18
2018-05-30Merge branch 'jk/snprintf-truncation'Junio C Hamano6-50/+55
2018-05-30Merge branch 'jk/config-blob-sans-repo'Junio C Hamano2-0/+7
2018-05-30Merge branch 'sb/submodule-merge-in-merge-recursive'Junio C Hamano3-173/+186
2018-05-30Merge branch 'js/empty-config-section-fix'Junio C Hamano1-1/+1
2018-05-30Merge branch 'bw/ref-prefix-for-configured-refspec'Junio C Hamano23-613/+570
2018-05-30Merge branch 'sb/grep-die-on-unreadable-index'Junio C Hamano1-1/+2
2018-05-30The seventh batch for 2.18Junio C Hamano1-0/+80
2018-05-30Merge branch 'sb/submodule-update-try-harder'Junio C Hamano1-1/+1
2018-05-30Merge branch 'lm/credential-netrc'Junio C Hamano7-50/+135
2018-05-30Merge branch 'ab/get-short-oid'Junio C Hamano6-21/+101
2018-05-30Merge branch 'jt/partial-clone-proto-v2'Junio C Hamano5-6/+171
2018-05-30Merge branch 'bc/object-id'Junio C Hamano46-306/+348
2018-05-30Merge branch 'sb/blame-color'Junio C Hamano3-4/+200
2018-05-30Merge branch 'cf/submodule-progress-dissociate'Junio C Hamano5-9/+78
2018-05-30Merge branch 'sg/complete-paths'Junio C Hamano3-28/+362
2018-05-30Merge branch 'nd/travis-gcc-8'Junio C Hamano2-0/+6
2018-05-30Merge branch 'nd/pack-struct-commit'Junio C Hamano1-1/+1
2018-05-30Merge branch 'ma/create-pseudoref-with-null-old-oid'Junio C Hamano2-5/+77
2018-05-30Merge branch 'jk/unavailable-can-be-missing'Junio C Hamano1-40/+50
2018-05-30Merge branch 'bp/status-rename-config'Junio C Hamano6-1/+192
2018-05-30Merge branch 'js/use-bug-macro'Junio C Hamano69-206/+214
2018-05-30Merge branch 'rs/no-null-ptr-arith-in-fast-export'Junio C Hamano1-4/+3
2018-05-30Merge branch 'nd/repo-clear-keep-the-index'Junio C Hamano1-1/+2
2018-05-30Merge branch 'ma/lockfile-cleanup'Junio C Hamano18-38/+32
2018-05-30Merge branch 'sg/t6500-no-redirect-of-stdin'Junio C Hamano1-2/+0
2018-05-30Merge branch 'bp/merge-rename-config'Junio C Hamano8-14/+69
2018-05-30Merge branch 'js/sequencer-and-root-commits'Junio C Hamano6-35/+276
2018-05-30Merge branch 'dd/send-email-reedit'Junio C Hamano1-7/+31
2018-05-29Sync with Git 2.17.1Junio C Hamano28-72/+794
2018-05-23The sixth batch for 2.18Junio C Hamano1-0/+101
2018-05-23Merge branch 'fg/completion-external'Junio C Hamano1-2/+9
2018-05-23Merge branch 'bc/asciidoctor-tab-width'Junio C Hamano2-1/+3
2018-05-23Merge branch 'nd/pack-unreachable-objects-doc'Junio C Hamano2-0/+15
2018-05-23Merge branch 'nd/completion-aliasfiletype-typofix'Junio C Hamano1-1/+1
2018-05-23Merge branch 'em/status-rename-config'Junio C Hamano3-5/+13
2018-05-23Merge branch 'cc/perf-bisect'Junio C Hamano1-0/+6
2018-05-23Merge branch 'ah/misc-doc-updates'Junio C Hamano6-68/+77
2018-05-23Merge branch 'bp/test-drop-caches'Junio C Hamano1-12/+4
2018-05-23Merge branch 'en/unpack-trees-split-index-fix'Junio C Hamano1-4/+15
2018-05-23Merge branch 'nd/doc-header'Junio C Hamano38-96/+96
2018-05-23Merge branch 'bc/format-patch-cover-no-attach'Junio C Hamano4-5/+16
2018-05-23Merge branch 'tb/test-apfs-utf8-normalization'Junio C Hamano1-6/+1
2018-05-23Merge branch 'js/rebase-recreate-merge'Junio C Hamano14-59/+1352
2018-05-23Merge branch 'nd/pack-objects-pack-struct'Junio C Hamano16-167/+656
2018-05-23Merge branch 'en/rename-directory-detection-reboot'Junio C Hamano11-178/+6092
2018-05-23Merge branch 'js/no-pager-shorthand'Junio C Hamano2-3/+4
2018-05-23Merge branch 'js/rebase-i-clean-msg-after-fixup-continue'Junio C Hamano3-48/+200
2018-05-23Merge branch 'tg/worktree-add-existing-branch'Junio C Hamano3-36/+100
2018-05-23Merge branch 'js/deprecate-grafts'Junio C Hamano14-118/+274
2018-05-23Merge branch 'js/test-unset-prereq'Junio C Hamano1-1/+13
2018-05-23Merge branch 'ab/perl-python-attrs'Junio C Hamano1-2/+4
2018-05-23Merge branch 'sb/oid-object-info'Junio C Hamano36-94/+125
2018-05-23Merge branch 'cc/perf-aggregate-unknown-option'Junio C Hamano1-36/+26
2018-05-23Merge branch 'en/git-debugger'Junio C Hamano2-10/+33
2018-05-23Merge branch 'bw/server-options'Junio C Hamano14-3/+116
2018-05-23Merge branch 'nd/repack-keep-pack'Junio C Hamano13-36/+349
2018-05-23Merge branch 'ds/lazy-load-trees'Junio C Hamano26-66/+152
2018-05-23Merge branch 'nd/term-columns'Junio C Hamano3-5/+9
2018-05-23Merge branch 'sg/t7005-spaces-in-filenames-cleanup'Junio C Hamano1-9/+3
2018-05-23Merge branch 'sg/t5516-fixes'Junio C Hamano1-5/+5
2018-05-23Merge branch 'sg/t5310-jgit-bitmap-test'Junio C Hamano1-4/+4
2018-05-23Merge branch 'nd/pack-format-doc'Junio C Hamano2-0/+97
2018-05-23Merge branch 'jk/apply-p-doc'Junio C Hamano1-2/+4
2018-05-23Merge branch 'ao/config-api-doc'Junio C Hamano1-8/+10
2018-05-23Merge branch 'bc/mailmap-self'Junio C Hamano1-2/+2
2018-05-23Merge branch 'sb/object-store-replace'Junio C Hamano3-1/+7
2018-05-23Merge branch 'hn/sort-ls-remote'Junio C Hamano1-1/+1
2018-05-23remote-curl: accept compressed responses with protocol v2Brandon Williams1-0/+1
2018-05-23remote-curl: accept all encodings supported by curlBrandon Williams3-6/+11
2018-05-22Git 2.17.1v2.17.1Junio C Hamano3-2/+18
2018-05-22Merge branch 'jk/submodule-fsck-loose' into maintJunio C Hamano8-30/+271
2018-05-22Sync with Git 2.16.4Junio C Hamano20-42/+507
2018-05-22Git 2.16.4v2.16.4Junio C Hamano3-2/+7
2018-05-22Sync with Git 2.15.2Junio C Hamano18-41/+500
2018-05-22Git 2.15.2v2.15.2Junio C Hamano2-1/+4
2018-05-22Sync with Git 2.14.4Junio C Hamano17-41/+497
2018-05-22Git 2.14.4v2.14.4Junio C Hamano3-2/+7
2018-05-22Sync with Git 2.13.7Junio C Hamano16-41/+492
2018-05-22Git 2.13.7v2.13.7Junio C Hamano3-2/+22
2018-05-22Merge branch 'jk/submodule-fix-loose' into maint-2.13Junio C Hamano15-41/+472
2018-05-21fsck: complain when .gitmodules is a symlinkJeff King2-2/+38
2018-05-21index-pack: check .gitmodules files with --strictJeff King3-0/+60
2018-05-21unpack-objects: call fsck_finish() after fscking objectsJeff King2-1/+11
2018-05-21fsck: call fsck_finish() after fscking objectsJeff King2-0/+7
2018-05-21fsck: check .gitmodules contentJeff King1-1/+59
2018-05-21fsck: handle promisor objects in .gitmodules checkJeff King1-0/+3
2018-05-21fsck: detect gitmodules filesJeff King2-0/+65
2018-05-21fsck: actually fsck blob dataJeff King3-24/+28
2018-05-21fsck: simplify ".git" checkJeff King1-3/+1
2018-05-21index-pack: make fsck error message more specificJeff King2-2/+2
2018-05-21Merge branch 'jk/submodule-name-verify-fix' into jk/submodule-name-verify-fsckJeff King16-42/+474
2018-05-21verify_path: disallow symlinks in .gitmodulesJeff King4-15/+37
2018-05-21update-index: stat updated files earlierJeff King1-8/+17
2018-05-21verify_dotfile: mention case-insensitivity in commentJeff King1-1/+4
2018-05-21verify_path: drop clever fallthroughJeff King1-4/+4
2018-05-21skip_prefix: add case-insensitive variantJeff King1-0/+17
2018-05-21is_{hfs,ntfs}_dotgitmodules: add testsJohannes Schindelin2-0/+106
2018-05-21is_ntfs_dotgit: match other .git filesJohannes Schindelin2-1/+93
2018-05-21is_hfs_dotgit: match other .git filesJeff King2-12/+51
2018-05-21is_ntfs_dotgit: use a size_t for traversing stringJeff King1-1/+1
2018-05-21submodule-config: verify submodule names as pathsJeff King5-0/+143
2018-05-22submodule: add --dissociate option to add/update commandsCasey Fitzpatrick4-5/+48
2018-05-22submodule: add --progress option to add commandCasey Fitzpatrick3-1/+27
2018-05-22submodule: clean up substitutions in scriptCasey Fitzpatrick1-4/+4
2018-05-22unpack_trees_options: free messages when doneMartin Ågren5-4/+26
2018-05-22argv-array: return the pushed string from argv_push*()Junio C Hamano2-4/+6
2018-05-21travis-ci: run gcc-8 on linux-gcc jobsNguyễn Thái Ngọc Duy2-0/+6
2018-05-21regex: do not call `regfree()` if compilation failsMartin Ågren2-3/+0
2018-05-21config: let `config_store_data_clear()` handle `key`Martin Ågren1-7/+3
2018-05-21config: let `config_store_data_clear()` handle `value_regex`Martin Ågren1-11/+6
2018-05-21config: free resources of `struct config_store_data`Martin Ågren1-0/+9
2018-05-21t5300: abstract away SHA-1-specific constantsbrian m. carlson1-3/+5
2018-05-21t4208: abstract away SHA-1-specific constantsbrian m. carlson1-1/+2
2018-05-21t4045: abstract away SHA-1-specific constantsbrian m. carlson1-2/+4
2018-05-21t4042: abstract away SHA-1-specific constantsbrian m. carlson1-6/+10
2018-05-21t4205: sort log output in a hash-independent waybrian m. carlson1-4/+4
2018-05-21t/lib-diff-alternative: abstract away SHA-1-specific constantsbrian m. carlson1-4/+8
2018-05-21t4030: abstract away SHA-1-specific constantsbrian m. carlson1-2/+3
2018-05-21t4029: abstract away SHA-1-specific constantsbrian m. carlson1-1/+6
2018-05-21t4029: fix test indentationbrian m. carlson1-17/+16
2018-05-21t4022: abstract away SHA-1-specific constantsbrian m. carlson1-2/+4
2018-05-21t4020: abstract away SHA-1-specific constantsbrian m. carlson1-2/+8
2018-05-21t4014: abstract away SHA-1-specific constantsbrian m. carlson1-3/+6
2018-05-21t4008: abstract away SHA-1-specific constantsbrian m. carlson1-27/+32
2018-05-21t4007: abstract away SHA-1-specific constantsbrian m. carlson1-8/+9
2018-05-21t3905: abstract away SHA-1-specific constantsbrian m. carlson1-4/+7
2018-05-21t3702: abstract away SHA-1-specific constantsbrian m. carlson1-4/+3
2018-05-21fmt_with_err: add a comment that truncation is OKJeff King1-0/+1
2018-05-21shorten_unambiguous_ref: use xsnprintfJeff King1-2/+2
2018-05-21fsmonitor: use internal argv_array of struct child_processRené Scharfe1-10/+4
2018-05-21log_write_email_headers: use strbufsJeff King1-6/+10
2018-05-21http: use strbufs instead of fixed buffersJeff King2-32/+38
2018-05-21config: die when --blob is used outside a repositoryJeff King2-0/+7
2018-05-21get_main_ref_store: BUG() when outside a repositoryJeff King1-0/+3
2018-05-21t9902-completion: exercise __git_complete_index_file() directlySZEDER Gábor1-107/+118
2018-05-21completion: don't return with error from __gitcomp_file_direct()SZEDER Gábor1-2/+4
2018-05-21merge-recursive: provide pair of `unpack_trees_{start,finish}()`Elijah Newren1-14/+15
2018-05-21merge: setup `opts` later in `checkout_fast_forward()`Martin Ågren1-15/+17
2018-05-18config: a user-provided invalid section is not a BUGJohannes Schindelin1-1/+1
2018-05-18merge-recursive: give notice when submodule commit gets fast-forwardedLeif Middelschulte1-0/+16
2018-05-18object.c: clear replace map before freeing itStefan Beller1-0/+2
2018-05-18fetch: generate ref-prefixes when using a configured refspecBrandon Williams2-1/+23
2018-05-18refspec: consolidate ref-prefix generation logicBrandon Williams4-32/+35
2018-05-18submodule: convert push_unpushed_submodules to take a struct refspecBrandon Williams3-12/+12
2018-05-18remote: convert check_push_refs to take a struct refspecBrandon Williams3-11/+7
2018-05-18remote: convert match_push_refs to take a struct refspecBrandon Williams6-22/+13
2018-05-18http-push: store refspecs in a struct refspecBrandon Williams1-9/+8
2018-05-18transport: remove transport_verify_remote_namesBrandon Williams3-28/+0
2018-05-18send-pack: store refspecs in a struct refspecBrandon Williams1-17/+7
2018-05-18transport: convert transport_push to take a struct refspecBrandon Williams3-13/+9
2018-05-18push: convert to use struct refspecBrandon Williams1-23/+15
2018-05-18push: check for errors earlierBrandon Williams1-17/+14
2018-05-18remote: convert match_explicit_refs to take a struct refspecBrandon Williams1-5/+4
2018-05-18remote: convert get_ref_match to take a struct refspecBrandon Williams1-12/+14
2018-05-18remote: convert query_refspecs to take a struct refspecBrandon Williams3-8/+7
2018-05-18remote: convert apply_refspecs to take a struct refspecBrandon Williams4-15/+11
2018-05-18remote: convert get_stale_heads to take a struct refspecBrandon Williams4-13/+12
2018-05-18fetch: convert prune_refs to take a struct refspecBrandon Williams1-6/+5
2018-05-18fetch: convert get_ref_map to take a struct refspecBrandon Williams1-23/+20
2018-05-18fetch: convert do_fetch to take a struct refspecBrandon Williams1-5/+5
2018-05-18refspec: remove the deprecated functionsBrandon Williams2-54/+0
2018-05-18fetch: convert refmap to use struct refspecBrandon Williams1-10/+7
2018-05-18fetch: convert fetch_one to use struct refspecBrandon Williams1-27/+19
2018-05-18transport-helper: convert to use struct refspecBrandon Williams1-26/+12
2018-05-18remote: remove add_prune_tags_to_fetch_refspecBrandon Williams3-8/+1
2018-05-18remote: convert fetch refspecs to struct refspecBrandon Williams4-49/+32
2018-05-18remote: convert push refspecs to struct refspecBrandon Williams4-37/+28
2018-05-18fast-export: convert to use struct refspecBrandon Williams1-14/+7
2018-05-18clone: convert cmd_clone to use refspec_item_initBrandon Williams1-6/+4
2018-05-18remote: convert match_push_refs to use struct refspecBrandon Williams1-5/+8
2018-05-18remote: convert check_push_refs to use struct refspecBrandon Williams1-4/+6
2018-05-18transport: convert transport_push to use struct refspecBrandon Williams1-8/+9
2018-05-18pull: convert get_tracking_branch to use refspec_item_initBrandon Williams1-4/+4
2018-05-18submodule--helper: convert push_check to use struct refspecBrandon Williams1-6/+7
2018-05-18refspec: convert valid_fetch_refspec to use parse_refspecBrandon Williams2-10/+10
2018-05-18refspec: introduce struct refspecBrandon Williams2-0/+89
2018-05-18refspec: factor out parsing a single refspecBrandon Williams1-91/+104
2018-05-18refspec: rename struct refspec to struct refspec_itemBrandon Williams15-73/+73
2018-05-18refspec: move refspec parsing logic into its own fileBrandon Williams17-184/+204
2018-05-16merge-recursive: i18n submodule merge output and respect verbosityStefan Beller1-18/+15
2018-05-16submodule.c: move submodule merging to merge-recursive.cStefan Beller3-170/+170
2018-05-16git-submodule.sh: try harder to fetch a submoduleStefan Beller1-1/+1
2018-05-16grep: handle corrupt index files earlyStefan Beller1-1/+2
2018-05-15t7005-editor: get rid of the SPACES_IN_FILENAMES prereqSZEDER Gábor1-9/+3
2018-05-14t3103: abstract away SHA-1-specific constantsbrian m. carlson1-1/+2
2018-05-14t2203: abstract away SHA-1-specific constantsbrian m. carlson1-4/+4
2018-05-14t: skip pack tests if not using SHA-1brian m. carlson2-0/+12
2018-05-14t4044: skip test if not using SHA-1brian m. carlson1-0/+6
2018-05-14t1512: skip test if not using SHA-1brian m. carlson1-0/+6
2018-05-14t1007: annotate with SHA1 prerequisitebrian m. carlson1-8/+8
2018-05-14t0000: annotate with SHA1 prerequisitebrian m. carlson1-12/+12
2018-05-14t: switch $_x40 to $OID_REGEXbrian m. carlson20-33/+33
2018-05-14t/test-lib: introduce OID_REGEXbrian m. carlson1-1/+2
2018-05-14t: switch $_z40 to $ZERO_OIDbrian m. carlson32-119/+119