summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeLines
* Git 2.32-rc1v2.32.0-rc1Junio C Hamano2021-05-22-1/+6
* Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano2021-05-22-9/+10
|\
| * stash show: use stash.showIncludeUntracked even when diff options givenDenton Liu2021-05-22-9/+10
* | Merge branch 'jh/simple-ipc-sans-pthread'Junio C Hamano2021-05-22-14/+48
|\ \
| * | simple-ipc: correct ifdefs when NO_PTHREADS is definedJeff Hostetler2021-05-21-14/+48
* | | Merge branch 'wm/rev-parse-path-format-wo-arg'Junio C Hamano2021-05-22-0/+6
|\ \ \
| * | | rev-parse: fix segfault with missing --path-format argumentWolfgang Müller2021-05-17-0/+6
* | | | Merge branch 'ds/sparse-index-protections'Junio C Hamano2021-05-21-1/+1
|\ \ \ \
| * | | | sparse-index: fix uninitialized jumpDerrick Stolee2021-05-18-1/+1
* | | | | Merge branch 'tz/c-locale-output-is-no-more'Junio C Hamano2021-05-21-1/+1
|\ \ \ \ \
| * | | | | t7500: remove non-existant C_LOCALE_OUTPUT prereqTodd Zullinger2021-05-18-1/+1
* | | | | | Merge branch 'cs/http-use-basic-after-failed-negotiate'Junio C Hamano2021-05-21-13/+48
|\ \ \ \ \ \
| * | | | | | Revert "remote-curl: fall back to basic auth if Negotiate fails"Jeff King2021-05-19-9/+8
| * | | | | | t5551: test http interaction with credential helpersJeff King2021-05-19-0/+41
* | | | | | | A handful more topics before -rc1Junio C Hamano2021-05-20-0/+19
* | | | | | | Merge branch 'jk/test-chainlint-softer'Junio C Hamano2021-05-20-3/+21
|\ \ \ \ \ \ \
| * | | | | | | t: avoid sed-based chain-linting in some expensive casesJeff King2021-05-13-3/+21
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge branch 'en/prompt-under-set-u'Junio C Hamano2021-05-20-3/+3
|\ \ \ \ \ \ \
| * | | | | | | git-prompt: work under set -uElijah Newren2021-05-13-3/+3
| |/ / / / / /
* | | | | | | Merge branch 'zh/ref-filter-push-remote-fix'Junio C Hamano2021-05-20-1/+20
|\ \ \ \ \ \ \
| * | | | | | | ref-filter: fix read invalid union member bugZheNing Hu2021-05-12-1/+20
* | | | | | | | Merge branch 'ew/sha256-clone-remote-curl-fix'Junio C Hamano2021-05-20-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | remote-curl: fix clone on sha256 reposEric Wong2021-05-12-0/+2
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge branch 'en/dir-traversal'Junio C Hamano2021-05-20-172/+298
|\ \ \ \ \ \ \ \
| * | | | | | | | dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren2021-05-13-45/+31
| * | | | | | | | dir: update stale description of treat_directory()Derrick Stolee2021-05-13-7/+6
| * | | | | | | | dir: traverse into untracked directories if they may have ignored subfilesElijah Newren2021-05-13-6/+8
| * | | | | | | | dir: avoid unnecessary traversal into ignored directoryElijah Newren2021-05-13-16/+30
| * | | | | | | | t3001, t7300: add testcase showcasing missed directory traversalElijah Newren2021-05-13-0/+24
| * | | | | | | | t7300: add testcase showing unnecessary traversal into ignored directoryElijah Newren2021-05-13-0/+23
| * | | | | | | | ls-files: error out on -i unless -o or -c are specifiedElijah Newren2021-05-13-3/+6
| * | | | | | | | dir: report number of visited directories and paths with trace2Elijah Newren2021-05-13-1/+15
| * | | | | | | | dir: convert trace calls to trace2 equivalentsElijah Newren2021-05-13-101/+162
| |/ / / / / / /
* | | | | | | | Merge branch 'ab/perl-makefile-cleanup'Junio C Hamano2021-05-20-4/+19
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Makefile: make PERL_DEFINES recursively expandedÆvar Arnfjörð Bjarmason2021-05-13-1/+1
| * | | | | | | perl: use mock i18n functions under NO_GETTEXT=YÆvar Arnfjörð Bjarmason2021-05-06-0/+13
| * | | | | | | Makefile: regenerate *.pm on NO_PERL_CPAN_FALLBACKS changeÆvar Arnfjörð Bjarmason2021-05-06-0/+1
| * | | | | | | Makefile: regenerate perl/build/* if GIT-PERL-DEFINES changesÆvar Arnfjörð Bjarmason2021-05-06-1/+1
| * | | | | | | Makefile: don't re-define PERL_DEFINESÆvar Arnfjörð Bjarmason2021-05-06-3/+4
* | | | | | | | Git 2.32-rc0v2.32.0-rc0Junio C Hamano2021-05-16-1/+17
* | | | | | | | Merge branch 'ls/typofix'Junio C Hamano2021-05-16-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | pretty: fix a typo in the documentation for %(trailers)Louis Sautier2021-05-13-1/+1
* | | | | | | | | Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano2021-05-16-3/+22
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| * | | | | | | | stash show: fix segfault with --{include,only}-untrackedDenton Liu2021-05-13-2/+21
| * | | | | | | | t3905: correct test titleDenton Liu2021-05-13-1/+1
* | | | | | | | | Merge branch 'wc/packed-ref-removal-cleanup'Junio C Hamano2021-05-16-6/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | refs: cleanup directories when deleting packed refWill Chandler2021-05-11-6/+15
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'lh/maintenance-leakfix'Junio C Hamano2021-05-16-2/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | maintenance: fix two memory leaksLénaïc Huard2021-05-12-2/+8
* | | | | | | | | | Merge branch 'ma/typofixes'Junio C Hamano2021-05-16-2/+2
|\ \ \ \ \ \ \ \ \ \