summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* ls-files: use repository objectbw/repo-objectBrandon Williams2017-06-231-0/+39
*-. Merge branches 'bw/ls-files-sans-the-index' and 'bw/config-h' into bw/repo-ob...Junio C Hamano2017-06-235-1/+22
|\ \
| | * config: don't include config.h by defaultBrandon Williams2017-06-152-0/+2
| | * alias: use the early config machinery to expand aliasesjs/alias-early-configJohannes Schindelin2017-06-151-1/+1
| | * t7006: demonstrate a problem with aliases in subdirectoriesJohannes Schindelin2017-06-151-0/+11
| | * t1308: relax the test verifying that empty alias values are disallowedJohannes Schindelin2017-06-151-1/+3
| | * config: report correct line number upon errorJohannes Schindelin2017-06-151-0/+6
* | | Merge branch 'jk/consistent-h'Junio C Hamano2017-06-191-0/+12
|\ \ \
| * | | t0012: test "-h" with builtinsjk/consistent-hJeff King2017-06-051-0/+12
| | |/ | |/|
* | | Merge branch 'ab/perf-remove-index-lock'Junio C Hamano2017-06-191-1/+8
|\ \ \
| * | | perf: work around the tested repo having an index.lockab/perf-remove-index-lockÆvar Arnfjörð Bjarmason2017-06-051-1/+8
| | |/ | |/|
* | | Merge branch 'ab/pcre-v2'Junio C Hamano2017-06-192-1/+13
|\ \ \
| * | | grep: add support for PCRE v2Ævar Arnfjörð Bjarmason2017-06-021-1/+1
| * | | log: add -P as a synonym for --perl-regexpÆvar Arnfjörð Bjarmason2017-05-261-0/+12
* | | | Merge branch 'jk/pathspec-magic-disambiguation'Junio C Hamano2017-06-191-0/+32
|\ \ \ \
| * | | | verify_filename(): treat ":(magic)" as a pathspecJeff King2017-05-291-0/+13
| * | | | check_filename(): handle ":^" path magicJeff King2017-05-291-0/+13
| * | | | t4208: add check for ":/" without matching fileJeff King2017-05-291-0/+6
| | |_|/ | |/| |
* | | | Merge branch 'jk/pack-idx-corruption-safety'Junio C Hamano2017-06-131-1/+7
|\ \ \ \
| * | | | t5313: make extended-table test more deterministicjk/pack-idx-corruption-safetyJeff King2017-06-071-1/+7
* | | | | Merge branch 'nd/fopen-errors'Junio C Hamano2017-06-133-6/+30
|\ \ \ \ \
| * | | | | mingw_fopen: report ENOENT for invalid file namesJohannes Sixt2017-06-021-1/+1
| * | | | | mingw: verify that paths are not mistaken for remote nicknamesJohannes Schindelin2017-06-021-2/+8
| * | | | | wrapper.c: add and use fopen_or_warn()Nguyễn Thái Ngọc Duy2017-05-262-3/+12
| * | | | | wrapper.c: add and use warn_on_fopen_errors()Nguyễn Thái Ngọc Duy2017-05-261-1/+2
| * | | | | config.mak.uname: set FREAD_READS_DIRECTORIES for Linux and FreeBSDNguyễn Thái Ngọc Duy2017-05-261-0/+8
* | | | | | Merge branch 'sb/submodule-blanket-recursive'Junio C Hamano2017-06-137-10/+73
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | builtin/fetch.c: respect 'submodule.recurse' optionsb/submodule-blanket-recursiveStefan Beller2017-06-011-0/+10
| * | | | | builtin/push.c: respect 'submodule.recurse' optionStefan Beller2017-06-011-0/+21
| * | | | | builtin/grep.c: respect 'submodule.recurse' optionStefan Beller2017-06-011-0/+18
| * | | | | Introduce 'submodule.recurse' option for worktree manipulatorsStefan Beller2017-06-011-0/+12
| * | | | | submodule test invocation: only pass additional argumentsStefan Beller2017-05-304-10/+12
| * | | | | Merge branch 'ab/grep-preparatory-cleanup' into sb/submodule-blanket-recursiveJunio C Hamano2017-05-3015-164/+729
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
* | | | | | Merge branch 'tb/pull-ff-rebase-autostash'Junio C Hamano2017-06-051-0/+18
|\ \ \ \ \ \
| * | | | | | pull: ff --rebase --autostash works in dirty repotb/pull-ff-rebase-autostashTyler Brazier2017-06-011-0/+18
| | |_|_|_|/ | |/| | | |
* | | | | | Merge branch 'mh/packed-ref-store-prep'Junio C Hamano2017-06-054-5/+6
|\ \ \ \ \ \
| * | | | | | ref_store: take a `msg` parameter when deleting referencesMichael Haggerty2017-05-233-3/+4
| * | | | | | t3600: clean up permissions test properlyMichael Haggerty2017-05-231-2/+2
| * | | | | | Merge branch 'bc/object-id'Junio C Hamano2017-05-232-4/+4
| |\ \ \ \ \ \
* | \ \ \ \ \ \ Merge branch 'mb/diff-default-to-indent-heuristics'Junio C Hamano2017-06-052-17/+170
|\ \ \ \ \ \ \ \
| * | | | | | | | diff: enable indent heuristic by defaultStefan Beller2017-05-092-28/+115
| * | | | | | | | diff: have the diff-* builtins configure diff before initializing revisionsMarc Branchaud2017-05-091-0/+66
* | | | | | | | | Merge branch 'ab/t3070-test-dedup'Junio C Hamano2017-06-041-1/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | wildmatch test: remove redundant duplicate testab/t3070-test-dedupÆvar Arnfjörð Bjarmason2017-05-291-1/+0
* | | | | | | | | | Merge branch 'sd/t3200-typofix'Junio C Hamano2017-06-041-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | branch test: fix invalid config key accesssd/t3200-typofixSahil Dua2017-05-291-1/+1
| |/ / / / / / / / /
* | | | | | | | | | Merge branch 'ab/grep-preparatory-cleanup'Junio C Hamano2017-06-0215-164/+729
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | grep: given --threads with NO_PTHREADS=YesPlease, warnÆvar Arnfjörð Bjarmason2017-05-261-0/+18
| * | | | | | | | | pack-objects: fix buggy warning about threadsÆvar Arnfjörð Bjarmason2017-05-261-1/+1
| * | | | | | | | | pack-objects & index-pack: add test for --threads warningÆvar Arnfjörð Bjarmason2017-05-261-0/+36