Commit message (Expand) | Author | Age | Lines | |
---|---|---|---|---|
* | Git 2.32-rc2v2.32.0-rc2 | Junio C Hamano | 2021-05-28 | -1/+1 |
* | Merge branch 'en/dir-traversal' | Junio C Hamano | 2021-05-28 | -2/+1 |
|\ | ||||
| * | dir: introduce readdir_skip_dot_and_dotdot() helper | Elijah Newren | 2021-05-27 | -45/+30 |
| * | dir: update stale description of treat_directory() | Derrick Stolee | 2021-05-27 | -7/+6 |
| * | Revert "dir: update stale description of treat_directory()" | Junio C Hamano | 2021-05-27 | -6/+7 |
| * | Revert "dir: introduce readdir_skip_dot_and_dotdot() helper" | Junio C Hamano | 2021-05-27 | -31/+45 |
* | | Merge branch 'ab/pack-linkage-fix' | Junio C Hamano | 2021-05-27 | -166/+167 |
|\ \ | ||||
| * | | pack-objects: move static inline from a header to the sole consumer | Ævar Arnfjörð Bjarmason | 2021-05-27 | -166/+167 |
* | | | Merge branch 'mt/t2080-cp-symlink-fix' | Junio C Hamano | 2021-05-27 | -1/+1 |
|\ \ \ | ||||
| * | | | t2080: fix cp invocation to copy symlinks instead of following them | Matheus Tavares | 2021-05-27 | -1/+1 |
* | | | | Merge branch 'ab/send-email-inline-hooks-path' | Junio C Hamano | 2021-05-27 | -17/+6 |
|\ \ \ \ | ||||
| * | | | | send-email: move "hooks_path" invocation to git-send-email.perl | Ævar Arnfjörð Bjarmason | 2021-05-27 | -13/+2 |
| * | | | | send-email: don't needlessly abs_path() the core.hooksPath | Ævar Arnfjörð Bjarmason | 2021-05-27 | -5/+5 |
* | | | | | Merge branch 'ds/t1092-fix-flake-from-progress' | Junio C Hamano | 2021-05-27 | -3/+3 |
|\ \ \ \ \ | ||||
| * | | | | | t1092: revert the "-1" hack for emulating "no progress meter" | Junio C Hamano | 2021-05-26 | -3/+3 |
| * | | | | | t1092: use GIT_PROGRESS_DELAY for consistent results | Derrick Stolee | 2021-05-25 | -3/+3 |
* | | | | | | Merge branch 'mt/init-template-userpath-fix' | Junio C Hamano | 2021-05-25 | -9/+22 |
|\ \ \ \ \ \ | ||||
| * | | | | | | init: fix bug regarding ~/ expansion in init.templateDir | Matheus Tavares | 2021-05-25 | -9/+22 |
* | | | | | | | Merge branch 'jt/send-email-validate-errors-fix' | Junio C Hamano | 2021-05-25 | -4/+3 |
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| * | | | | | | t9001-send-email.sh: fix expected absolute paths on Windows | Johannes Sixt | 2021-05-25 | -4/+3 |
* | | | | | | | Merge branch 'ab/send-email-validate-errors-fix' | Junio C Hamano | 2021-05-25 | -3/+32 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||
| * | | | | | | send-email: fix missing error message regression | Ævar Arnfjörð Bjarmason | 2021-05-25 | -3/+32 |
| |/ / / / / | ||||
* | | | | | | Git 2.32-rc1v2.32.0-rc1 | Junio C Hamano | 2021-05-22 | -1/+6 |
* | | | | | | Merge branch 'dl/stash-show-untracked-fixup' | Junio C Hamano | 2021-05-22 | -9/+10 |
|\ \ \ \ \ \ | ||||
| * | | | | | | stash show: use stash.showIncludeUntracked even when diff options given | Denton Liu | 2021-05-22 | -9/+10 |
* | | | | | | | Merge branch 'jh/simple-ipc-sans-pthread' | Junio C Hamano | 2021-05-22 | -14/+48 |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | simple-ipc: correct ifdefs when NO_PTHREADS is defined | Jeff Hostetler | 2021-05-21 | -14/+48 |
* | | | | | | | | Merge branch 'wm/rev-parse-path-format-wo-arg' | Junio C Hamano | 2021-05-22 | -0/+6 |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | rev-parse: fix segfault with missing --path-format argument | Wolfgang Müller | 2021-05-17 | -0/+6 |
* | | | | | | | | | Merge branch 'ds/sparse-index-protections' | Junio C Hamano | 2021-05-21 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | sparse-index: fix uninitialized jump | Derrick Stolee | 2021-05-18 | -1/+1 |
* | | | | | | | | | | Merge branch 'tz/c-locale-output-is-no-more' | Junio C Hamano | 2021-05-21 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | t7500: remove non-existant C_LOCALE_OUTPUT prereq | Todd Zullinger | 2021-05-18 | -1/+1 |
* | | | | | | | | | | | Merge branch 'cs/http-use-basic-after-failed-negotiate' | Junio C Hamano | 2021-05-21 | -13/+48 |
|\ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | Revert "remote-curl: fall back to basic auth if Negotiate fails" | Jeff King | 2021-05-19 | -9/+8 |
| * | | | | | | | | | | | t5551: test http interaction with credential helpers | Jeff King | 2021-05-19 | -0/+41 |
* | | | | | | | | | | | | A handful more topics before -rc1 | Junio C Hamano | 2021-05-20 | -0/+19 |
* | | | | | | | | | | | | Merge branch 'jk/test-chainlint-softer' | Junio C Hamano | 2021-05-20 | -3/+21 |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | t: avoid sed-based chain-linting in some expensive cases | Jeff King | 2021-05-13 | -3/+21 |
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | ||||
* | | | | | | | | | | | | Merge branch 'en/prompt-under-set-u' | Junio C Hamano | 2021-05-20 | -3/+3 |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | git-prompt: work under set -u | Elijah Newren | 2021-05-13 | -3/+3 |
| |/ / / / / / / / / / / | ||||
* | | | | | | | | | | | | Merge branch 'zh/ref-filter-push-remote-fix' | Junio C Hamano | 2021-05-20 | -1/+20 |
|\ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | ref-filter: fix read invalid union member bug | ZheNing Hu | 2021-05-12 | -1/+20 |
* | | | | | | | | | | | | | Merge branch 'ew/sha256-clone-remote-curl-fix' | Junio C Hamano | 2021-05-20 | -0/+2 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | | | | | remote-curl: fix clone on sha256 repos | Eric Wong | 2021-05-12 | -0/+2 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | ||||
* | | | | | | | | | | | | | Merge branch 'en/dir-traversal' | Junio C Hamano | 2021-05-20 | -172/+298 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | ||||
| * | | | | | | | | | | | | dir: introduce readdir_skip_dot_and_dotdot() helper | Elijah Newren | 2021-05-13 | -45/+31 |
| * | | | | | | | | | | | | dir: update stale description of treat_directory() | Derrick Stolee | 2021-05-13 | -7/+6 |
| * | | | | | | | | | | | | dir: traverse into untracked directories if they may have ignored subfiles | Elijah Newren | 2021-05-13 | -6/+8 |
| * | | | | | | | | | | | | dir: avoid unnecessary traversal into ignored directory | Elijah Newren | 2021-05-13 | -16/+30 |