summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'jk/pack-idx-corruption-safety' into maintJunio C Hamano2016-03-101-0/+179
|\
| * use_pack: handle signed off_t overflowJeff King2016-02-251-1/+1
| * nth_packed_object_offset: bounds-check extended offsetJeff King2016-02-251-1/+1
| * t5313: test bounds-checks of corrupted/malicious pack/idx filesJeff King2016-02-251-0/+179
* | Merge branch 'js/config-set-in-non-repository' into maintJunio C Hamano2016-03-101-0/+11
|\ \
| * | git config: report when trying to modify a non-existing repo configjs/config-set-in-non-repositoryJohannes Schindelin2016-02-251-0/+11
* | | Merge branch 'sb/submodule-module-list-fix' into maintJunio C Hamano2016-03-101-0/+25
|\ \ \
| * | | submodule helper list: respect correct path prefixsb/submodule-module-list-fixStefan Beller2016-02-241-0/+25
* | | | Merge branch 'jk/grep-binary-workaround-in-test' into maintJunio C Hamano2016-03-102-13/+17
|\ \ \ \
| * | | | t9200: avoid grep on non-ASCII datajk/grep-binary-workaround-in-testJohn Keeping2016-02-231-1/+1
| * | | | t8005: avoid grep on non-ASCII dataJohn Keeping2016-02-231-12/+16
| | |_|/ | |/| |
* | | | Merge branch 'nd/git-common-dir-fix' into maintJunio C Hamano2016-03-101-0/+10
|\ \ \ \
| * | | | rev-parse: take prefix into account in --git-common-dirnd/git-common-dir-fixNguyễn Thái Ngọc Duy2016-02-121-0/+10
| | |/ / | |/| |
* | | | Merge branch 'nd/dwim-wildcards-as-pathspecs' into maintJunio C Hamano2016-03-102-26/+48
|\ \ \ \
| * | | | get_sha1: don't die() on bogus search stringsnd/dwim-wildcards-as-pathspecsJeff King2016-02-101-0/+10
| * | | | check_filename: tighten dwim-wildcard ambiguityJeff King2016-02-102-26/+38
* | | | | Merge branch 'jk/epipe-in-async' into maintJunio C Hamano2016-03-102-2/+5
|\ \ \ \ \
| * | | | | t5504: handle expected output from SIGPIPE deathjk/epipe-in-asyncJeff King2016-02-251-1/+4
| * | | | | test_must_fail: report number of unexpected signalJeff King2016-02-251-1/+1
| | |_|_|/ | |/| | |
* | | | | Merge branch 'ps/config-error' into maintJunio C Hamano2016-03-102-1/+24
|\ \ \ \ \
| * | | | | remote: die on config error when setting URLPatrick Steinhardt2016-02-221-0/+9
| * | | | | branch: die on config error when unsetting upstreamPatrick Steinhardt2016-02-221-0/+7
| * | | | | branch: report errors in tracking branch setupPatrick Steinhardt2016-02-221-1/+8
* | | | | | Merge branch 'mg/work-tree-tests' into maintJunio C Hamano2016-03-103-0/+0
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | tests: rename work-tree tests to *work-tree*mg/work-tree-testsMichael J Gruber2016-02-203-0/+0
* | | | | | Merge branch 'js/test-lib-windows-emulated-yes' into maintJunio C Hamano2016-02-171-2/+4
|\ \ \ \ \ \
| * | | | | | test-lib: limit the output of the yes utilityjs/test-lib-windows-emulated-yesJohannes Schindelin2016-02-021-2/+4
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'aw/push-force-with-lease-reporting' into maintJunio C Hamano2016-02-171-5/+10
|\ \ \ \ \ \
| * | | | | | push: fix ref status reporting for --force-with-leaseaw/push-force-with-lease-reportingAndrew Wheeler2016-02-011-5/+10
| |/ / / / /
* | | | | | Merge branch 'js/xmerge-marker-eol' into maintJunio C Hamano2016-02-171-0/+13
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | |
| * | | | | merge-file: ensure that conflict sections match eol stylejs/xmerge-marker-eolJohannes Schindelin2016-01-271-1/+2
| * | | | | merge-file: let conflict markers match end-of-line style of the contextJohannes Schindelin2016-01-271-0/+12
* | | | | | Merge branch 'sg/t6050-failing-editor-test-fix' into maintJunio C Hamano2016-02-051-3/+7
|\ \ \ \ \ \
| * | | | | | t6050-replace: make failing editor test more robustsg/t6050-failing-editor-test-fixSZEDER Gábor2016-01-051-3/+7
* | | | | | | Merge branch 'jk/ref-cache-non-repository-optim' into maintJunio C Hamano2016-02-052-0/+11
|\ \ \ \ \ \ \
| * | | | | | | resolve_gitlink_ref: ignore non-repository pathsjk/ref-cache-non-repository-optimJeff King2016-01-252-0/+11
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'js/dirname-basename' into maintJunio C Hamano2016-02-051-0/+3
|\ \ \ \ \ \ \
| * | | | | | | t0060: verify that basename() and dirname() work as expectedJohannes Schindelin2016-01-121-0/+3
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'nd/diff-with-path-params' into maintJunio C Hamano2016-02-051-0/+6
|\ \ \ \ \ \ \
| * | | | | | | diff: make -O and --output work in subdirectorynd/diff-with-path-paramsDuy Nguyen2016-01-211-0/+6
| |/ / / / / /
| * | | | | | Merge branch 'jk/pending-keep-tag-name' into maintJunio C Hamano2016-01-041-0/+29
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/symbolic-ref-maint' into maintJunio C Hamano2016-01-041-0/+22
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jk/list-tag-2.7-regression' into maintJunio C Hamano2016-02-053-52/+38
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | tag: do not show ambiguous tag names as "tags/foo"jk/list-tag-2.7-regressionJeff King2016-01-263-0/+28
| * | | | | | | | | t6300: use test_atom for some un-modern testsJeff King2016-01-251-52/+10
| | |_|_|/ / / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jk/sanity' into maintJunio C Hamano2016-02-051-5/+13
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | test-lib: clarify and tighten SANITYjk/sanityJunio C Hamano2016-01-191-5/+13
* | | | | | | | | | Merge branch 'jk/filter-branch-no-index' into maintJunio C Hamano2016-02-051-0/+8
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | filter-branch: resolve $commit^{tree} in no-index casejk/filter-branch-no-indexJeff King2016-01-191-0/+8
* | | | | | | | | | | Merge branch 'js/close-packs-before-gc' into maintJunio C Hamano2016-02-051-0/+13
|\ \ \ \ \ \ \ \ \ \ \
View Lorry Controller Status