Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'rs/parallel-checkout-test-fix' | Junio C Hamano | 2021-06-06 | 1 | -1/+1 |
|\ | |||||
| * | parallel-checkout: avoid dash local bug in tests | René Scharfe | 2021-06-06 | 1 | -1/+1 |
* | | Merge branch 'mt/t2080-cp-symlink-fix' | Junio C Hamano | 2021-05-27 | 1 | -1/+1 |
|\ \ | |||||
| * | | t2080: fix cp invocation to copy symlinks instead of following them | Matheus Tavares | 2021-05-27 | 1 | -1/+1 |
* | | | Merge branch 'ab/send-email-inline-hooks-path' | Junio C Hamano | 2021-05-27 | 1 | -3/+4 |
|\ \ \ | |||||
| * | | | send-email: don't needlessly abs_path() the core.hooksPath | Ævar Arnfjörð Bjarmason | 2021-05-27 | 1 | -3/+4 |
* | | | | Merge branch 'ds/t1092-fix-flake-from-progress' | Junio C Hamano | 2021-05-27 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | t1092: revert the "-1" hack for emulating "no progress meter" | Junio C Hamano | 2021-05-25 | 1 | -3/+3 |
| * | | | | t1092: use GIT_PROGRESS_DELAY for consistent results | Derrick Stolee | 2021-05-25 | 1 | -3/+3 |
* | | | | | Merge branch 'mt/init-template-userpath-fix' | Junio C Hamano | 2021-05-25 | 1 | -8/+20 |
|\ \ \ \ \ | |||||
| * | | | | | init: fix bug regarding ~/ expansion in init.templateDir | Matheus Tavares | 2021-05-25 | 1 | -8/+20 |
* | | | | | | Merge branch 'jt/send-email-validate-errors-fix' | Junio C Hamano | 2021-05-25 | 1 | -4/+3 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | t9001-send-email.sh: fix expected absolute paths on Windows | Johannes Sixt | 2021-05-25 | 1 | -4/+3 |
* | | | | | | Merge branch 'ab/send-email-validate-errors-fix' | Junio C Hamano | 2021-05-25 | 1 | -2/+21 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | send-email: fix missing error message regression | Ævar Arnfjörð Bjarmason | 2021-05-25 | 1 | -2/+21 |
| |/ / / / | |||||
* | | | | | Merge branch 'dl/stash-show-untracked-fixup' | Junio C Hamano | 2021-05-22 | 1 | -0/+2 |
|\ \ \ \ \ | |||||
| * | | | | | stash show: use stash.showIncludeUntracked even when diff options given | Denton Liu | 2021-05-22 | 1 | -0/+2 |
* | | | | | | Merge branch 'wm/rev-parse-path-format-wo-arg' | Junio C Hamano | 2021-05-22 | 1 | -0/+4 |
|\ \ \ \ \ \ | |||||
| * | | | | | | rev-parse: fix segfault with missing --path-format argument | Wolfgang Müller | 2021-05-17 | 1 | -0/+4 |
* | | | | | | | Merge branch 'tz/c-locale-output-is-no-more' | Junio C Hamano | 2021-05-20 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | t7500: remove non-existant C_LOCALE_OUTPUT prereq | Todd Zullinger | 2021-05-17 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'cs/http-use-basic-after-failed-negotiate' | Junio C Hamano | 2021-05-20 | 1 | -0/+41 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Revert "remote-curl: fall back to basic auth if Negotiate fails" | Jeff King | 2021-05-19 | 1 | -1/+1 |
| * | | | | | | | | t5551: test http interaction with credential helpers | Jeff King | 2021-05-19 | 1 | -0/+41 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'jk/test-chainlint-softer' | Junio C Hamano | 2021-05-20 | 4 | -3/+21 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | t: avoid sed-based chain-linting in some expensive cases | Jeff King | 2021-05-13 | 4 | -3/+21 |
| |/ / / / / / / | |||||
* | | | | | | | | Merge branch 'zh/ref-filter-push-remote-fix' | Junio C Hamano | 2021-05-20 | 1 | -0/+19 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | ref-filter: fix read invalid union member bug | ZheNing Hu | 2021-05-12 | 1 | -0/+19 |
* | | | | | | | | | Merge branch 'en/dir-traversal' | Junio C Hamano | 2021-05-20 | 6 | -91/+176 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | |||||
| * | | | | | | | | dir: traverse into untracked directories if they may have ignored subfiles | Elijah Newren | 2021-05-13 | 2 | -2/+2 |
| * | | | | | | | | dir: avoid unnecessary traversal into ignored directory | Elijah Newren | 2021-05-13 | 1 | -1/+1 |
| * | | | | | | | | t3001, t7300: add testcase showcasing missed directory traversal | Elijah Newren | 2021-05-13 | 2 | -0/+24 |
| * | | | | | | | | t7300: add testcase showing unnecessary traversal into ignored directory | Elijah Newren | 2021-05-13 | 1 | -0/+23 |
| * | | | | | | | | ls-files: error out on -i unless -o or -c are specified | Elijah Newren | 2021-05-13 | 2 | -3/+3 |
| * | | | | | | | | dir: report number of visited directories and paths with trace2 | Elijah Newren | 2021-05-13 | 1 | -1/+2 |
| * | | | | | | | | dir: convert trace calls to trace2 equivalents | Elijah Newren | 2021-05-13 | 2 | -88/+125 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dl/stash-show-untracked-fixup' | Junio C Hamano | 2021-05-16 | 1 | -1/+16 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | stash show: fix segfault with --{include,only}-untracked | Denton Liu | 2021-05-13 | 1 | -0/+15 |
| * | | | | | | | t3905: correct test title | Denton Liu | 2021-05-13 | 1 | -1/+1 |
* | | | | | | | | Merge branch 'wc/packed-ref-removal-cleanup' | Junio C Hamano | 2021-05-16 | 1 | -0/+9 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | refs: cleanup directories when deleting packed ref | Will Chandler | 2021-05-11 | 1 | -0/+9 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge branch 'dd/mailinfo-quoted-cr' | Junio C Hamano | 2021-05-16 | 7 | -0/+165 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | am: learn to process quoted lines that ends with CRLF | Đoàn Trần Công Danh | 2021-05-10 | 2 | -0/+49 |
| * | | | | | | | | mailinfo: allow stripping quoted CR without warning | Đoàn Trần Công Danh | 2021-05-10 | 1 | -0/+6 |
| * | | | | | | | | mailinfo: allow squelching quoted CRLF warning | Đoàn Trần Công Danh | 2021-05-10 | 1 | -1/+5 |
| * | | | | | | | | mailinfo: warn if CRLF found in decoded base64/QP email | Đoàn Trần Công Danh | 2021-05-10 | 5 | -0/+106 |
* | | | | | | | | | Merge branch 'mt/parallel-checkout-part-3' | Junio C Hamano | 2021-05-16 | 7 | -24/+660 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | ci: run test round with parallel-checkout enabled | Matheus Tavares | 2021-05-05 | 2 | -0/+7 |
| * | | | | | | | | parallel-checkout: add tests related to .gitattributes | Matheus Tavares | 2021-05-05 | 1 | -0/+194 |
| * | | | | | | | | t0028: extract encoding helpers to lib-encoding.sh | Matheus Tavares | 2021-05-05 | 2 | -24/+26 |