summaryrefslogtreecommitdiffstats
AgeCommit message (Expand)AuthorFilesLines
2020-12-14Git 2.30-rc0v2.30.0-rc0Junio C Hamano2-1/+29
2020-12-14Merge branch 'js/t5526-with-no-particular-primary-branch-name'Junio C Hamano1-40/+43
2020-12-14Merge branch 'js/cmake-extra-built-ins-fix'Junio C Hamano1-4/+11
2020-12-14Merge branch 'da/vs-build-iconv-fix'Junio C Hamano3-3/+2
2020-12-14Merge branch 'jk/multi-line-indent-style-fix'Junio C Hamano2-2/+2
2020-12-14Merge branch 'jk/check-config-parsing-error-in-upload-pack'Junio C Hamano2-1/+10
2020-12-14Merge branch 'ae/doc-reproducible-html'Junio C Hamano1-1/+4
2020-12-14Merge branch 'so/glossary-branch-is-not-necessarily-active'Junio C Hamano1-1/+1
2020-12-14Merge branch 'fc/atmark-in-refspec'Junio C Hamano3-51/+62
2020-12-14Merge branch 'dd/help-autocorrect-never'Junio C Hamano3-18/+52
2020-12-08Eleventh batchJunio C Hamano1-0/+45
2020-12-08Merge branch 'fc/zsh-completion'Junio C Hamano2-1/+2
2020-12-08Merge branch 'sn/config-doc-typofix'Junio C Hamano1-1/+1
2020-12-08Merge branch 'fc/random-cleanup'Junio C Hamano4-18/+16
2020-12-08Merge branch 'nm/imap-send-use-default-config'Junio C Hamano1-22/+30
2020-12-08Merge branch 'jk/banned'Junio C Hamano1-0/+13
2020-12-08Merge branch 'tb/bugreport-no-localtime'Junio C Hamano1-1/+2
2020-12-08Merge branch 'rs/maintenance-run-outside-repo'Junio C Hamano3-8/+9
2020-12-08Merge branch 'rs/fetch-pack-invalid-lockfile'Junio C Hamano1-2/+3
2020-12-08Merge branch 'nk/perf-fsmonitor-cleanup'Junio C Hamano1-2/+1
2020-12-08Merge branch 'ma/grep-init-default'Junio C Hamano6-100/+36
2020-12-08Merge branch 'js/trace2-session-id'Junio C Hamano12-3/+198
2020-12-08Merge branch 'mt/do-not-use-scld-in-working-tree'Junio C Hamano5-6/+47
2020-12-08Merge branch 'ds/maintenance-part-2'Junio C Hamano1-2/+4
2020-12-08Merge branch 'ds/maintenance-part-1'Junio C Hamano1-0/+1
2020-12-08Merge branch 'ds/maintenance-part-3'Junio C Hamano2-2/+15
2020-12-08Merge branch 'ds/config-literal-value'Junio C Hamano7-76/+312
2020-12-08Merge branch 'tb/idx-midx-race-fix'Junio C Hamano3-20/+31
2020-12-08Merge branch 'ps/update-ref-multi-transaction'Junio C Hamano4-50/+126
2020-12-08Merge branch 'js/add-i-color-fix'Junio C Hamano4-32/+127
2020-12-08Merge branch 'jt/trace-error-on-warning'Junio C Hamano2-1/+7
2020-12-08t7900: fix typo: "test_execpt_success"Josh Steadmon1-1/+1
2020-12-07completion: bash: fix gitk alias regressionFelipe Contreras1-1/+1
2020-12-04cmake: determine list of extra built-ins dynamicallyJohannes Schindelin1-4/+11
2020-12-04t5526: drop the prereq expecting the default branch name `main`Johannes Schindelin1-21/+21
2020-12-04t5526: avoid depending on a specific default branch nameJohannes Schindelin1-19/+22
2020-12-04ci(vs-build): stop passing the iconv library location explicitlyDennis Ameling3-3/+2
2020-12-03style: indent multiline "if" conditions to alignJeff King2-2/+2
2020-12-03upload-pack: propagate return value from object filter config callbackJeff King2-1/+10
2020-12-03Tenth batchJunio C Hamano1-5/+16
2020-12-03Merge branch 'pk/subsub-fetch-fix'Junio C Hamano2-67/+10
2020-12-03Merge branch 'jk/stop-pack-objects-when-fetch-is-killed'Junio C Hamano1-0/+1
2020-12-03Merge branch 'jk/stop-pack-objects-when-push-is-killed'Junio C Hamano1-0/+1
2020-12-03Merge branch 'tb/repack-simplify'Junio C Hamano1-99/+54
2020-12-03Merge branch 'pb/pull-rebase-recurse-submodules'Junio C Hamano2-14/+90
2020-12-03Merge branch 'ab/retire-parse-remote'Junio C Hamano6-138/+11
2020-12-02doc: make HTML manual reproducibleArnout Engelen1-1/+4
2020-12-02Revert "submodules: fix of regression on fetching of non-init subsub-repo"Junio C Hamano2-67/+10
2020-12-02glossary: improve "branch" definitionSergey Organov1-1/+1
2020-12-02Makefile: mark git-maintenance as a builtinJeff King1-0/+1
2020-12-02apply: don't use core.sharedRepository to create working tree filesMatheus Tavares5-6/+47
2020-12-02banned.h: mark ctime_r() and asctime_r() as bannedJeff King1-0/+4
2020-12-02gitignore: remove entry for git serveRené Scharfe1-1/+0
2020-12-02gitignore: drop duplicate entry for git-sh-i18nJeff King1-1/+0
2020-12-02t7900: speed up expensive testJeff King1-2/+4
2020-12-01banned.h: mark non-reentrant gmtime, etc as bannedJeff King1-0/+9
2020-12-01config.txt: fix a typo (backslash != backquote)Štěpán Němec1-1/+1
2020-12-01builtin/bugreport.c: use thread-safe localtime_r()Taylor Blau1-1/+2
2020-12-01upload-pack: kill pack-objects helper on signal or exitJeff King1-0/+1
2020-12-01imap-send: parse default git configNicolas Morey-Chaisemartin1-22/+30
2020-12-01completion: zsh: fix file completion regressionFelipe Contreras1-0/+1
2020-12-01tests: lib-functions: trivial style cleanupsFelipe Contreras1-4/+4
2020-12-01test: completion: fix typosFelipe Contreras1-2/+2
2020-12-01.gitignore: remove dangling fileFelipe Contreras1-1/+0
2020-12-01refspec: trivial cleanupFelipe Contreras1-9/+10
2020-11-30Ninth batchJunio C Hamano1-0/+21
2020-11-30Merge branch 'sa/credential-store-timeout'Junio C Hamano2-2/+12
2020-11-30Merge branch 'km/stash-error-message-fix'Junio C Hamano1-1/+1
2020-11-30Merge branch 'hn/sleep-millisec-decl'Junio C Hamano2-1/+2
2020-11-30Merge branch 'js/t3404-master-to-primary'Junio C Hamano1-44/+45
2020-11-30Merge branch 'na/notes-displayref-is-not-boolean'Junio C Hamano2-1/+6
2020-11-30Merge branch 'jc/do-not-just-explain-but-update-your-patch'Junio C Hamano1-1/+15
2020-11-30Merge branch 'mt/worktree-error-message-fix'Junio C Hamano1-2/+2
2020-11-30Merge branch 'ab/gc-keep-base-option'Junio C Hamano2-7/+7
2020-11-30Merge branch 'js/t1309-master-to-topic'Junio C Hamano1-2/+2
2020-11-30Merge branch 'js/pull-rebase-use-advise'Junio C Hamano2-14/+17
2020-11-30Merge branch 'js/t4015-wo-master'Junio C Hamano1-3/+3
2020-11-30Merge branch 'js/t3040-cleanup'Junio C Hamano1-3/+0
2020-11-30Merge branch 'js/t2106-cleanup'Junio C Hamano1-14/+17
2020-11-30fetch-pack: disregard invalid pack lockfilesRené Scharfe1-2/+3
2020-11-30refspec: make @ a synonym of HEADFelipe Contreras3-52/+62
2020-11-30tests: push: trivial cleanupFelipe Contreras1-2/+1
2020-11-30tests: push: improve cleanup of HEAD testsFelipe Contreras1-1/+3
2020-11-30MyFirstObjectWalk: drop `init_walken_defaults()`Martin Ågren1-24/+0
2020-11-30grep: copy struct in one fell swoopMartin Ågren1-23/+10
2020-11-30perf/fsmonitor: use test_must_be_empty helperNipunn Koorapati1-2/+1
2020-11-30maintenance: fix SEGFAULT when no repositoryRafael Silva3-8/+9
2020-11-25Eighth batchJunio C Hamano1-0/+32
2020-11-25Merge branch 'sg/tests-prereq'Junio C Hamano2-4/+25
2020-11-25Merge branch 'rs/plug-diff-cache-leak'Junio C Hamano1-0/+2
2020-11-25Merge branch 'rs/gc-sort-func-cast-fix'Junio C Hamano1-4/+2
2020-11-25Merge branch 'jc/ci-github-set-env'Junio C Hamano1-1/+1
2020-11-25Merge branch 'sg/t5310-jgit-wants-sha1'Junio C Hamano1-2/+2
2020-11-25Merge branch 'rs/archive-plug-leak-refname'Junio C Hamano2-1/+2
2020-11-25Merge branch 'ma/list-object-filter-opt-msgfix'Junio C Hamano1-1/+1
2020-11-25Merge branch 'pk/subsub-fetch-fix'Junio C Hamano2-10/+67
2020-11-25Merge branch 'jk/4gb-idx'Junio C Hamano7-19/+19
2020-11-25Merge branch 'jx/t5411-flake-fix'Junio C Hamano9-67/+545
2020-11-25Merge branch 'rs/hashwrite-be64'Junio C Hamano3-9/+10
2020-11-25Merge branch 'sg/bisect-approximately-halfway'Junio C Hamano1-7/+20
2020-11-25Merge branch 'fc/bash-completion-alias-of-alias'Junio C Hamano2-18/+55
2020-11-25maintenance: use 'git config --fixed-value'Derrick Stolee2-2/+15
2020-11-25Merge branch 'ds/config-literal-value' into ds/maintenance-part-3Junio C Hamano7-76/+312
2020-11-25config doc: value-pattern is not necessarily a regexpJunio C Hamano1-4/+7
2020-11-25config: implement --fixed-value with --get*Derrick Stolee2-5/+32
2020-11-25config: plumb --fixed-value into config APIDerrick Stolee4-5/+73
2020-11-25config: add --fixed-value option, un-implementedDerrick Stolee3-7/+73
2020-11-25t1300: add test for --replace-all with value-patternDerrick Stolee1-0/+14
2020-11-25t1300: test "set all" mode with value-patternDerrick Stolee1-0/+39
2020-11-25config: replace 'value_regex' with 'value_pattern'Derrick Stolee4-44/+44
2020-11-25config: convert multi_replace to flagsDerrick Stolee5-26/+45
2020-11-25midx.c: protect against disappearing packsTaylor Blau2-2/+8
2020-11-25packfile.c: protect against disappearing indexesTaylor Blau2-19/+24
2020-11-25help.c: help.autocorrect=never means "do not compute suggestions"Drew DeVault3-18/+52
2020-11-25crendential-store: use timeout when locking fileSimão Afonso2-2/+12
2020-11-24move sleep_millisec to git-compat-util.hHan-Wen Nienhuys2-1/+2
2020-11-24usage: add trace2 entry upon warning()Jonathan Tan2-1/+7
2020-11-24MyFirstContribition: answering questions is not the end of the storyJunio C Hamano1-1/+15
2020-11-24t3404: do not depend on any specific default branch nameJohannes Schindelin1-44/+45
2020-11-24submodule: fix fetch_in_submodule logicJeff King1-6/+6
2020-11-24stash: add missing space to an error messageKyle Meyer1-1/+1
2020-11-23t3301: test proper exit response to no-value notes.displayRef.Nate Avers1-0/+5
2020-11-23notes.c: fix a segfault in notes_display_config()Nate Avers1-1/+1
2020-11-21Seventh batchJunio C Hamano1-0/+20
2020-11-21Merge branch 'pd/mergetool-nvimdiff'Junio C Hamano2-0/+5
2020-11-21Merge branch 'ab/config-mak-uname-simplify'Junio C Hamano1-8/+0
2020-11-21Merge branch 'en/strmap'Junio C Hamano27-170/+621
2020-11-21Merge branch 'jk/diff-release-filespec-fix'Junio C Hamano2-0/+16
2020-11-21Merge branch 'jk/rev-parse-end-of-options'Junio C Hamano4-47/+99
2020-11-21Merge branch 'jc/format-patch-name-max'Junio C Hamano7-8/+83
2020-11-21grep: use designated initializers for `grep_defaults`Martin Ågren6-52/+26
2020-11-21grep: don't set up a "default" repo for grepMartin Ågren6-7/+6
2020-11-21send-pack: kill pack-objects helper on signal or exitJeff King1-0/+1
2020-11-21worktree: fix order of arguments in error messageMatheus Tavares1-2/+2
2020-11-21gc: rename keep_base_pack variable for --keep-largest-packÆvar Arnfjörð Bjarmason1-4/+4
2020-11-21gc docs: change --keep-base-pack to --keep-largest-packÆvar Arnfjörð Bjarmason1-3/+3
2020-11-19pull: colorize the hint about setting `pull.rebase`Johannes Schindelin2-14/+17
2020-11-19t4015: let the test pass with any default branch nameJohannes Schindelin1-3/+3
2020-11-19t1309: use a neutral branch name in the `onbranch` test casesJohannes Schindelin1-2/+2
2020-11-18gc: fix cast in compare_tasks_by_selection()René Scharfe1-4/+2
2020-11-18Sixth batchJunio C Hamano1-0/+35
2020-11-18Merge branch 'jc/blame-ignore-fix'Junio C Hamano2-4/+5
2020-11-18Merge branch 'jc/sparse-error-for-developer-build'Junio C Hamano1-0/+1
2020-11-18Merge branch 'pb/blame-funcname-range-userdiff'Junio C Hamano12-72/+79
2020-11-18Merge branch 'en/merge-ort-api-null-impl'Junio C Hamano13-15/+517
2020-11-18Merge branch 'ds/maintenance-part-3'Junio C Hamano17-8/+759
2020-11-18Merge branch 'pw/rebase-i-orig-head'Junio C Hamano4-22/+31
2020-11-18Merge branch 'rs/archive-high-compression'Junio C Hamano3-16/+14
2020-11-18Merge branch 'dg/bswap-msvc'Junio C Hamano1-1/+1
2020-11-18Merge branch 'jk/format-patch-output'Junio C Hamano2-15/+55
2020-11-18Merge branch 'jc/line-log-takes-no-pathspec'Junio C Hamano2-0/+25
2020-11-18Merge branch 'rs/empty-reflog-check-fix'Junio C Hamano1-14/+13
2020-11-18Merge branch 'nk/perf-fsmonitor'Junio C Hamano1-31/+63
2020-11-18Merge branch 'en/merge-tests'Junio C Hamano13-386/+807
2020-11-18Merge branch 'js/default-branch-name-adjust-t5515'Junio C Hamano128-305/+308
2020-11-18Merge branch 'dd/upload-pack-stateless-eof'Junio C Hamano2-1/+29
2020-11-18t3040: remove stale noteJohannes Schindelin1-3/+0
2020-11-18tests: fix description of 'test_set_prereq'SZEDER Gábor1-1/+1
2020-11-18tests: make sure nested lazy prereqs work reliablySZEDER Gábor2-3/+24
2020-11-18t2106: ensure that the checkout fails for the expected reasonJohannes Schindelin1-1/+2
2020-11-18t2106: make test independent of the current main branch nameJohannes Schindelin1-1/+1
2020-11-18t2106: adjust style to the current conventionsJohannes Schindelin1-14/+16
2020-11-17builtin/repack.c: don't move existing packs out of the wayTaylor Blau1-89/+14
2020-11-17ci: avoid `set-env` construct in print-test-failures.shJunio C Hamano1-1/+1
2020-11-17completion: bash: improve alias loop detectionFelipe Contreras1-4/+5
2020-11-16pull: check for local submodule modifications with the right rangePhilippe Blain2-1/+30
2020-11-16t5572: describe '--rebase' tests a little morePhilippe Blain1-2/+10
2020-11-16t5572: add notes on a peculiar testPhilippe Blain1-0/+15
2020-11-16pull --rebase: compute rebase arguments in separate functionPhilippe Blain1-11/+35
2020-11-16add -i: verify in the tests that colors can be overriddenJohannes Schindelin1-0/+84
2020-11-16add -p: prefer color.diff.context over color.diff.plainJohannes Schindelin2-5/+7
2020-11-16add -i (Perl version): color header to match the C versionJohannes Schindelin1-4/+2
2020-11-16add -i (built-in): use the same indentation as the Perl versionJohannes Schindelin1-1/+1
2020-11-16add -p (built-in): do not color the progress indicator separatelyJohannes Schindelin1-5/+5
2020-11-16builtin/repack.c: keep track of what pack-objects wroteTaylor Blau1-1/+30
2020-11-16repack: make "exts" array available outside cmd_repack()Jeff King1-9/+10
2020-11-16list-objects-filter-options: fix function name in BUGMartin Ågren1-1/+1
2020-11-16archive: release refname after useRené Scharfe2-1/+2
2020-11-16diff-lib: plug minor memory leaks in do_diff_cache()René Scharfe1-0/+2
2020-11-16update-ref: disallow "start" for ongoing transactionsPatrick Steinhardt2-0/+13
2020-11-16p1400: use `git-update-ref --stdin` to test multiple transactionsPatrick Steinhardt1-13/+7
2020-11-16update-ref: allow creation of multiple transactionsPatrick Steinhardt3-2/+64
2020-11-16t1400: avoid touching refs on filesystemPatrick Steinhardt1-35/+42
2020-11-16packfile: detect overflow in .idx file size checksJeff King1-3/+3
2020-11-16block-sha1: take a size_t length parameterJeff King2-2/+2
2020-11-16fsck: correctly compute checksums on idx files larger than 4GBJeff King1-4/+4
2020-11-16use size_t to store pack .idx byte offsetsJeff King2-5/+5
2020-11-16compute pack .idx byte offsets using size_tJeff King4-9/+9
2020-11-16parse-remote: remove this now-unused libraryÆvar Arnfjörð Bjarmason6-129/+0
2020-11-16submodule: remove sh function in favor of helperÆvar Arnfjörð Bjarmason1-1/+1
2020-11-16submodule: use "fetch" logic instead of custom remote discoveryÆvar Arnfjörð Bjarmason1-7/+9
2020-11-16t5310-pack-bitmaps: skip JGit tests with SHA256SZEDER Gábor1-2/+2
2020-11-12submodules: fix of regression on fetching of non-init subsub-repoPeter Kaestle2-10/+67
2020-11-12pack-write: use hashwrite_be64()René Scharfe1-4/+1
2020-11-12midx: use hashwrite_be64()René Scharfe1-5/+2
2020-11-12csum-file: add hashwrite_be64()René Scharfe1-0/+7
2020-11-12bisect: loosen halfway() check for a large number of commitsSZEDER Gábor1-7/+20
2020-11-11receive-pack: log received client session IDJosh Steadmon2-6/+21
2020-11-11send-pack: advertise session ID in capabilitiesJosh Steadmon1-0/+7
2020-11-11upload-pack, serve: log received client session IDJosh Steadmon3-6/+24