summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/test-parse-options-expect'Junio C Hamano2016-05-232-60/+93
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040: convert a few tests to use test-parse-options --expectjc/test-parse-options-expectJunio C Hamano2016-05-101-18/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040: remove unused test helpersJunio C Hamano2016-05-101-24/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: --expect=<string> option to simplify testsJunio C Hamano2016-05-101-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: fix output when callback option failsJunio C Hamano2016-05-101-3/+1
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'pb/commit-verbose-config'Junio C Hamano2016-05-233-71/+244
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit: add a commit.verbose config variablepb/commit-verbose-configPranit Bauva2016-05-101-0/+51
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t7507-commit-verbose: improve test coverage by testing number of diffsPranit Bauva2016-05-051-7/+9
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parse-options.c: make OPTION_COUNTUP respect "unspecified" valuesPranit Bauva2016-05-051-14/+14
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t/t7507: improve test coveragePranit Bauva2016-05-051-0/+5
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040-parse-options: improve test coveragePranit Bauva2016-05-051-0/+114
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-parse-options: print quiet as integerPranit Bauva2016-04-191-13/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0040-test-parse-options.sh: fix style issuesPranit Bauva2016-04-191-38/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'xy/format-patch-base'Junio C Hamano2016-05-231-0/+105
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce format.useAutoBase configurationXiaolong Ye2016-04-261-0/+19
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: introduce --base=auto optionXiaolong Ye2016-04-261-0/+39
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | format-patch: add '--base' option to record base tree infoXiaolong Ye2016-04-261-0/+47
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/core-eol-fix'Junio C Hamano2016-05-231-170/+131
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | convert.c: ident + core.autocrlf didn't worktb/core-eol-fixTorsten Bögershausen2016-04-251-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: test cases for combined attributesTorsten Bögershausen2016-04-251-169/+129
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t0027: make commit_chk_wrnNNO() reliableTorsten Bögershausen2016-04-251-1/+2
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'nd/worktree-various-heads'Junio C Hamano2016-05-231-0/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | branch: do not rename a branch under bisect or rebasend/worktree-various-headsNguyễn Thái Ngọc Duy2016-04-221-0/+8
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: check whether branch is bisected in another worktreeNguyễn Thái Ngọc Duy2016-04-221-0/+13
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | worktree.c: check whether branch is rebased in another worktreeNguyễn Thái Ngọc Duy2016-04-221-0/+38
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ss/commit-dry-run-resolve-merge-to-no-op'Junio C Hamano2016-05-231-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wt-status.c: set commitable bit if there is a meaningful merge.ss/commit-dry-run-resolve-merge-to-no-opStephen P. Smith2016-02-171-0/+20
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/windows-dotgit'Junio C Hamano2016-05-172-0/+50
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mingw: introduce the 'core.hideDotFiles' settingJohannes Schindelin2016-05-112-0/+50
| | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/test-send-sh-x-trace-elsewhere'Junio C Hamano2016-05-172-3/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib: set BASH_XTRACEFD automaticallyjk/test-send-sh-x-trace-elsewhereJeff King2016-05-112-3/+16
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'js/http-custom-headers'Junio C Hamano2016-05-172-6/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | submodule: ensure that -c http.extraheader is heededjs/http-custom-headersJohannes Schindelin2016-05-101-1/+10
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jk/submodule-c-credential' into js/http-custom-headersJunio C Hamano2016-05-102-0/+63
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5551: make the test for extra HTTP headers more robustJohannes Schindelin2016-05-101-1/+2
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | tests: adjust the configuration for Apache 2.2Johannes Schindelin2016-05-101-4/+12
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/fsck-nul-in-commit'Junio C Hamano2016-05-171-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fsck: detect and warn a commit with embedded NULjc/fsck-nul-in-commitJunio C Hamano2016-05-101-0/+18
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/ll-merge-internal'Junio C Hamano2016-05-172-85/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6036: remove pointless test that expects failurejc/ll-merge-internalJunio C Hamano2016-05-091-83/+0
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ll-merge: use a longer conflict marker for internal mergeJunio C Hamano2016-05-092-2/+3
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'tb/t5601-sed-fix'Junio C Hamano2016-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t5601: Remove trailing space in sed expressiontb/t5601-sed-fixTorsten Bögershausen2016-05-091-1/+1
| | |_|_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'jc/test-seq'Junio C Hamano2016-05-171-15/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib-functions.sh: rewrite test_seq without Perljc/test-seqJunio C Hamano2016-05-091-1/+6
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test-lib-functions.sh: remove misleading comment on test_seqJunio C Hamano2016-05-091-14/+7
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'es/test-gpg-tags'Junio C Hamano2016-05-171-23/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t6302: simplify non-gpg caseses/test-gpg-tagsJeff King2016-05-091-23/+22
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'ak/t4151-ls-files-could-be-empty'Junio C Hamano2016-05-171-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | t4151: make sure argument to 'test -z' is givenak/t4151-ls-files-could-be-emptyArmin Kunaschik2016-05-091-1/+1
| | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |