summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'bk/refresh-missing-ok-in-merge-recursive' into maintJunio C Hamano2014-03-181-0/+47
|\
| * merge-recursive.c: tolerate missing files while refreshing indexbk/refresh-missing-ok-in-merge-recursiveBrad King2014-02-241-1/+1
| * t3030-merge-recursive: test known breakage with empty work treeBrad King2014-02-241-0/+47
* | Merge branch 'nd/diff-quiet-stat-dirty' into maintJunio C Hamano2014-03-181-0/+6
|\ \
| * | diff: do not quit early on stat-dirty filesnd/diff-quiet-stat-dirtyNguyễn Thái Ngọc Duy2014-02-241-0/+6
| |/
* | Merge branch 'nd/http-fetch-shallow-fix' into maintJunio C Hamano2014-03-189-35/+83
|\ \
| * | t5537: move http tests out to t5539nd/http-fetch-shallow-fixNguyễn Thái Ngọc Duy2014-02-132-57/+82
| * | fetch-pack: fix deepen shallow over smart http with no-done capNguyễn Thái Ngọc Duy2014-02-101-0/+30
| * | test: rename http fetch and push test filesNguyễn Thái Ngọc Duy2014-02-104-0/+0
| * | tests: auto-set LIB_HTTPD_PORT from test nameJeff King2014-02-108-8/+1
* | | Merge branch 'nd/submodule-pathspec-ending-with-slash' into maintJunio C Hamano2014-03-182-3/+9
|\ \ \
| * | | pathspec: pass directory indicator to match_pathspec_item()Nguyễn Thái Ngọc Duy2014-02-241-0/+6
| * | | pathspec: rename match_pathspec_depth() to match_pathspec()Nguyễn Thái Ngọc Duy2014-02-241-3/+3
* | | | Merge branch 'aj/ada-diff-word-pattern'Junio C Hamano2014-02-071-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | userdiff: update Ada patternsaj/ada-diff-word-patternAdrian Johnson2014-02-051-1/+1
| | |/ | |/|
* | | Merge branch 'jn/pager-lv-default-env'Junio C Hamano2014-01-311-1/+1
|\ \ \
| * | | pager test: make fake pager consume all its inputjn/pager-lv-default-envJonathan Nieder2014-01-311-1/+1
* | | | Merge branch 'as/tree-walk-fix-aggressive-short-cut'Junio C Hamano2014-01-271-0/+13
|\ \ \ \
| * | | | tree_entry_interesting: match against all pathspecsas/tree-walk-fix-aggressive-short-cutAndy Spencer2014-01-271-0/+13
| | |/ / | |/| |
* | | | Merge branch 'jk/test-fixes'Junio C Hamano2014-01-272-1/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | t7700: do not use "touch" unnecessarilyjk/test-fixesJeff King2014-01-231-1/+1
| * | | t7501: fix "empty commit" test with NO_PERLJeff King2014-01-231-0/+1
* | | | Merge branch 'nd/negative-pathspec'Junio C Hamano2014-01-271-0/+17
|\ \ \ \
| * | | | tree-walk.c: ignore trailing slash on submodule in tree_entry_interesting()nd/negative-pathspecNguyễn Thái Ngọc Duy2014-01-231-0/+17
* | | | | Merge branch 'pw/git-p4'Junio C Hamano2014-01-278-37/+326
|\ \ \ \ \
| * | | | | git p4 test: examine behavior with locked (+l) filesPete Wyckoff2014-01-221-0/+145
| * | | | | git p4: handle files with wildcards when doing RCS scrubbingPete Wyckoff2014-01-221-0/+23
| * | | | | git p4 test: do not pollute /tmpPete Wyckoff2014-01-222-3/+11
| * | | | | git p4 test: run as user "author"Pete Wyckoff2014-01-222-25/+28
| * | | | | git p4 test: is_cli_file_writeable succeedsPete Wyckoff2014-01-221-1/+1
| * | | | | git p4 test: explicitly check p4 wildcard deletePete Wyckoff2014-01-221-0/+27
| * | | | | git p4: work around p4 bug that causes empty symlinksPete Wyckoff2014-01-221-0/+66
| * | | | | git p4 test: ensure p4 symlink parsing worksPete Wyckoff2014-01-211-0/+17
| * | | | | git p4 test: wildcards are supportedPete Wyckoff2014-01-211-8/+8
* | | | | | Merge branch 'jk/mark-edges-uninteresting'Junio C Hamano2014-01-271-0/+12
|\ \ \ \ \ \
| * | | | | | t/perf: time rev-list with UNINTERESTING commitsJeff King2014-01-211-0/+12
| | |_|_|/ / | |/| | | |
* | | | | | Merge branch 'jk/interpret-branch-name-fix'Junio C Hamano2014-01-272-1/+51
|\ \ \ \ \ \
| * | | | | | interpret_branch_name: find all possible @-marksjk/interpret-branch-name-fixJeff King2014-01-151-0/+21
| * | | | | | interpret_branch_name: avoid @{upstream} past colonJeff King2014-01-151-0/+16
| * | | | | | interpret_branch_name: always respect "namelen" parameterJeff King2014-01-151-1/+14
| | |_|_|/ / | |/| | | |
| * | | | | Merge branch 'mm/mv-file-to-no-such-dir-with-slash' into maintJunio C Hamano2014-01-131-0/+29
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'jk/rev-parse-double-dashes' into maintJunio C Hamano2014-01-131-0/+24
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'jk/cat-file-regression-fix' into maintJunio C Hamano2014-01-131-0/+22
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ Merge branch 'jk/allow-fetch-onelevel-refname'Junio C Hamano2014-01-271-0/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | fetch-pack: do not filter out one-level refsjk/allow-fetch-onelevel-refnameJeff King2014-01-151-0/+11
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge branch 'jc/revision-range-unpeel'Junio C Hamano2014-01-271-0/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | revision: propagate flag bits from tags to pointeesjc/revision-range-unpeelJunio C Hamano2014-01-151-0/+11
| * | | | | | | | | revision: mark contents of an uninteresting tree uninterestingJunio C Hamano2014-01-151-0/+6
* | | | | | | | | | Merge branch 'nd/shallow-clone'Junio C Hamano2014-01-174-0/+404
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | t5537: fix incorrect expectation in test case 10nd/shallow-cloneNguyễn Thái Ngọc Duy2014-01-091-1/+2
View Lorry Controller Status