summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* wildmatch test: mark test as EXPENSIVE_ON_WINDOWSab/wildmatch-testsÆvar Arnfjörð Bjarmason2018-01-301-8/+8
* test-lib: add an EXPENSIVE_ON_WINDOWS prerequisiteÆvar Arnfjörð Bjarmason2018-01-301-0/+4
* wildmatch test: create & test files on disk in addition to in-memoryÆvar Arnfjörð Bjarmason2018-01-301-11/+190
* wildmatch test: perform all tests under all wildmatch() modesÆvar Arnfjörð Bjarmason2018-01-302-252/+228
* wildmatch test: use test_must_fail, not ! for test-wildmatchÆvar Arnfjörð Bjarmason2018-01-301-3/+3
* wildmatch test: remove dead fnmatch() test codeÆvar Arnfjörð Bjarmason2018-01-301-178/+178
* wildmatch test: use a paranoia pattern from nul_match()Ævar Arnfjörð Bjarmason2018-01-301-3/+12
* wildmatch test: don't try to vertically align our outputÆvar Arnfjörð Bjarmason2018-01-301-5/+5
* wildmatch test: use more standard shell styleÆvar Arnfjörð Bjarmason2018-01-301-3/+6
* wildmatch test: indent with tabs, not spacesÆvar Arnfjörð Bjarmason2018-01-301-27/+27
* Merge branch 'ex/deprecate-empty-pathspec-as-match-all'Junio C Hamano2017-11-064-14/+9
|\
| * pathspec: die on empty strings as pathspecex/deprecate-empty-pathspec-as-match-allEmily Xie2017-06-233-13/+8
| * t0027: do not use an empty string as a pathspec elementJunio C Hamano2017-06-231-1/+1
* | Merge branch 'jk/rebase-i-exec-gitdir-fix'Junio C Hamano2017-11-062-1/+17
|\ \
| * | sequencer: pass absolute GIT_DIR to exec commandsjk/rebase-i-exec-gitdir-fixJacob Keller2017-11-022-1/+17
* | | Merge branch 'cn/diff-indent-no-longer-is-experimental'Junio C Hamano2017-11-064-9/+6
|\ \ \
| * | | diff: --indent-heuristic is no longer experimentalcn/diff-indent-no-longer-is-experimentalCarlos Martín Nieto2017-11-024-9/+6
* | | | Merge branch 'bw/grep-recurse-submodules'Junio C Hamano2017-11-061-0/+2
|\ \ \ \
| * | | | grep: take the read-lock when adding a submodulebw/grep-recurse-submodulesMartin Ågren2017-11-021-0/+2
* | | | | Merge branch 'mh/test-local-canary'Junio C Hamano2017-11-061-0/+25
|\ \ \ \ \
| * | | | | t0000: check whether the shell supports the "local" keywordmh/test-local-canaryMichael Haggerty2017-10-311-0/+25
* | | | | | Merge branch 'js/submodule-in-excluded'Junio C Hamano2017-11-062-1/+12
|\ \ \ \ \ \
| * | | | | | status: do not get confused by submodules in excluded directoriesjs/submodule-in-excludedJohannes Schindelin2017-10-262-1/+12
* | | | | | | Merge branch 'ao/check-resolve-ref-unsafe-result'Junio C Hamano2017-11-061-0/+2
|\ \ \ \ \ \ \
| * | | | | | | commit: check result of resolve_ref_unsafeao/check-resolve-ref-unsafe-resultAndrey Okoshkin2017-10-211-0/+2
* | | | | | | | Merge branch 'jk/misc-resolve-ref-unsafe-fixes'Junio C Hamano2017-11-064-4/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | worktree: handle broken symrefs in find_shared_symref()jk/misc-resolve-ref-unsafe-fixesJeff King2017-10-211-1/+2
| * | | | | | | | log: handle broken HEAD in decoration checkJeff King2017-10-211-1/+1
| * | | | | | | | remote: handle broken symrefsJeff King2017-10-211-1/+1
| * | | | | | | | test-ref-store: avoid passing NULL to printfJeff King2017-10-211-1/+1
* | | | | | | | | Merge branch 'sb/diff-color-moved-use-xdl-recmatch'Junio C Hamano2017-11-063-78/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | diff.c: get rid of duplicate implementationsb/diff-color-moved-use-xdl-recmatchStefan Beller2017-10-261-78/+4
| * | | | | | | | | xdiff-interface: export comparing and hashing stringsStefan Beller2017-10-262-0/+28
* | | | | | | | | | Merge branch 'jk/diff-color-moved-fix'Junio C Hamano2017-11-062-42/+188
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | diff: handle NULs in get_string_hash()jk/diff-color-moved-fixJeff King2017-10-211-1/+1
| * | | | | | | | | diff: fix whitespace-skipping with --color-movedJeff King2017-10-212-5/+77
| * | | | | | | | | t4015: test the output of "diff --color-moved -b"Jeff King2017-10-211-9/+64
| * | | | | | | | | t4015: check "negative" case for "-w --color-moved"Jeff King2017-10-211-8/+18
| * | | | | | | | | t4015: refactor --color-moved whitespace testJeff King2017-10-211-20/+29
| |/ / / / / / / /
* | | | | | | | | Merge branch 'kd/auto-col-with-pager-fix'Junio C Hamano2017-11-062-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | column: do not include pager.ckd/auto-col-with-pager-fixJunio C Hamano2017-10-241-1/+0
| * | | | | | | | | column: show auto columns when pager is activeKevin Daudt2017-10-172-1/+16
* | | | | | | | | | Merge branch 'jc/no-cmd-as-subroutine'Junio C Hamano2017-11-062-13/+18
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | merge-ours: do not use cmd_*() as a subroutinejc/no-cmd-as-subroutineJunio C Hamano2017-10-111-9/+7
| * | | | | | | | | | describe: do not use cmd_*() as a subroutineJunio C Hamano2017-10-111-4/+11
* | | | | | | | | | | Merge branch 'ma/lockfile-fixes'Junio C Hamano2017-11-0621-131/+123
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | read_cache: roll back lock in `update_index_if_able()`ma/lockfile-fixesMartin Ågren2017-10-072-3/+6
| * | | | | | | | | | read-cache: leave lock in right state in `write_locked_index()`Martin Ågren2017-10-075-11/+13
| * | | | | | | | | | read-cache: drop explicit `CLOSE_LOCK`-flagMartin Ågren2017-10-073-14/+15
| * | | | | | | | | | cache.h: document `write_locked_index()`Martin Ågren2017-10-061-0/+16
View Lorry Controller Status