summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Git 2.32-rc2v2.32.0-rc2Junio C Hamano2021-05-281-1/+1
* Merge branch 'en/dir-traversal'Junio C Hamano2021-05-281-2/+1
|\
| * dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren2021-05-2711-45/+30
| * dir: update stale description of treat_directory()Derrick Stolee2021-05-271-7/+6
| * Revert "dir: update stale description of treat_directory()"Junio C Hamano2021-05-271-6/+7
| * Revert "dir: introduce readdir_skip_dot_and_dotdot() helper"Junio C Hamano2021-05-2711-31/+45
* | Merge branch 'ab/pack-linkage-fix'Junio C Hamano2021-05-272-166/+167
|\ \
| * | pack-objects: move static inline from a header to the sole consumerÆvar Arnfjörð Bjarmason2021-05-272-166/+167
* | | Merge branch 'mt/t2080-cp-symlink-fix'Junio C Hamano2021-05-271-1/+1
|\ \ \
| * | | t2080: fix cp invocation to copy symlinks instead of following themMatheus Tavares2021-05-271-1/+1
* | | | Merge branch 'ab/send-email-inline-hooks-path'Junio C Hamano2021-05-273-17/+6
|\ \ \ \
| * | | | send-email: move "hooks_path" invocation to git-send-email.perlÆvar Arnfjörð Bjarmason2021-05-272-13/+2
| * | | | send-email: don't needlessly abs_path() the core.hooksPathÆvar Arnfjörð Bjarmason2021-05-272-5/+5
* | | | | Merge branch 'ds/t1092-fix-flake-from-progress'Junio C Hamano2021-05-271-3/+3
|\ \ \ \ \
| * | | | | t1092: revert the "-1" hack for emulating "no progress meter"Junio C Hamano2021-05-261-3/+3
| * | | | | t1092: use GIT_PROGRESS_DELAY for consistent resultsDerrick Stolee2021-05-251-3/+3
* | | | | | Merge branch 'mt/init-template-userpath-fix'Junio C Hamano2021-05-252-9/+22
|\ \ \ \ \ \
| * | | | | | init: fix bug regarding ~/ expansion in init.templateDirMatheus Tavares2021-05-252-9/+22
* | | | | | | Merge branch 'jt/send-email-validate-errors-fix'Junio C Hamano2021-05-251-4/+3
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | t9001-send-email.sh: fix expected absolute paths on WindowsJohannes Sixt2021-05-251-4/+3
* | | | | | | Merge branch 'ab/send-email-validate-errors-fix'Junio C Hamano2021-05-252-3/+32
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | send-email: fix missing error message regressionÆvar Arnfjörð Bjarmason2021-05-252-3/+32
| |/ / / / /
* | | | | | Git 2.32-rc1v2.32.0-rc1Junio C Hamano2021-05-222-1/+6
* | | | | | Merge branch 'dl/stash-show-untracked-fixup'Junio C Hamano2021-05-224-9/+10
|\ \ \ \ \ \
| * | | | | | stash show: use stash.showIncludeUntracked even when diff options givenDenton Liu2021-05-224-9/+10
* | | | | | | Merge branch 'jh/simple-ipc-sans-pthread'Junio C Hamano2021-05-226-14/+48
|\ \ \ \ \ \ \
| * | | | | | | simple-ipc: correct ifdefs when NO_PTHREADS is definedJeff Hostetler2021-05-216-14/+48
* | | | | | | | Merge branch 'wm/rev-parse-path-format-wo-arg'Junio C Hamano2021-05-222-0/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | rev-parse: fix segfault with missing --path-format argumentWolfgang Müller2021-05-172-0/+6
* | | | | | | | | Merge branch 'ds/sparse-index-protections'Junio C Hamano2021-05-211-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | sparse-index: fix uninitialized jumpDerrick Stolee2021-05-181-1/+1
* | | | | | | | | | Merge branch 'tz/c-locale-output-is-no-more'Junio C Hamano2021-05-211-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t7500: remove non-existant C_LOCALE_OUTPUT prereqTodd Zullinger2021-05-181-1/+1
* | | | | | | | | | | Merge branch 'cs/http-use-basic-after-failed-negotiate'Junio C Hamano2021-05-213-13/+48
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Revert "remote-curl: fall back to basic auth if Negotiate fails"Jeff King2021-05-192-9/+8
| * | | | | | | | | | | t5551: test http interaction with credential helpersJeff King2021-05-191-0/+41
* | | | | | | | | | | | A handful more topics before -rc1Junio C Hamano2021-05-201-0/+19
* | | | | | | | | | | | Merge branch 'jk/test-chainlint-softer'Junio C Hamano2021-05-204-3/+21
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | t: avoid sed-based chain-linting in some expensive casesJeff King2021-05-134-3/+21
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge branch 'en/prompt-under-set-u'Junio C Hamano2021-05-201-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | git-prompt: work under set -uElijah Newren2021-05-131-3/+3
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge branch 'zh/ref-filter-push-remote-fix'Junio C Hamano2021-05-202-1/+20
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | ref-filter: fix read invalid union member bugZheNing Hu2021-05-122-1/+20
* | | | | | | | | | | | | Merge branch 'ew/sha256-clone-remote-curl-fix'Junio C Hamano2021-05-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | remote-curl: fix clone on sha256 reposEric Wong2021-05-121-0/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge branch 'en/dir-traversal'Junio C Hamano2021-05-2018-172/+298
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |
| * | | | | | | | | | | | dir: introduce readdir_skip_dot_and_dotdot() helperElijah Newren2021-05-1311-45/+31
| * | | | | | | | | | | | dir: update stale description of treat_directory()Derrick Stolee2021-05-131-7/+6
| * | | | | | | | | | | | dir: traverse into untracked directories if they may have ignored subfilesElijah Newren2021-05-133-6/+8
| * | | | | | | | | | | | dir: avoid unnecessary traversal into ignored directoryElijah Newren2021-05-132-16/+30