summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* unpack-trees: don't update files with CE_WT_REMOVE setas/sparse-checkout-removalDavid Turner2015-07-211-0/+52
* Merge branch 'maint-1.9' into maint-2.0maint-2.0Junio C Hamano2015-01-071-0/+15
|\
| * Merge branch 'maint-1.8.5' into maint-1.9maint-1.9Junio C Hamano2015-01-071-0/+15
| |\
| | * Merge branch 'jk/dotgit-case-maint-1.8.5' into maint-1.8.5maint-1.8.5Junio C Hamano2015-01-071-0/+15
| | |\
| | | * is_hfs_dotgit: loosen over-eager match of \u{..47}jk/dotgit-case-maint-1.8.5dotgit-case-maint-1.8.5Jeff King2014-12-291-0/+15
* | | | Sync with v1.9.5Junio C Hamano2014-12-173-31/+102
|\ \ \ \ | |/ / /
| * | | Sync with v1.8.5.6Junio C Hamano2014-12-173-31/+102
| |\ \ \ | | |/ /
| | * | Merge branch 'dotgit-case-maint-1.8.5' into maint-1.8.5Junio C Hamano2014-12-173-31/+102
| | |\ \ | | | |/
| | | * fsck: complain about NTFS ".git" aliases in treesJohannes Schindelin2014-12-171-2/+7
| | | * read-cache: optionally disallow NTFS .git variantsJohannes Schindelin2014-12-171-0/+13
| | | * fsck: complain about HFS+ ".git" aliases in treesJeff King2014-12-171-3/+5
| | | * read-cache: optionally disallow HFS+ .git variantsJeff King2014-12-172-5/+25
| | | * fsck: notice .git case-insensitivelyJeff King2014-12-171-0/+1
| | | * t1450: refactor ".", "..", and ".git" fsck testsJeff King2014-12-171-30/+27
| | | * verify_dotfile(): reject .git case-insensitivelyJeff King2014-12-171-0/+1
| | | * read-tree: add tests for confusing paths like ".." and ".git"Jeff King2014-12-171-0/+32
| * | | Merge branch 'maint-1.8.5' into maint-1.9Junio C Hamano2014-07-161-2/+2
| |\ \ \ | | |/ /
* | | | commit --amend: test specifies authorship but forgets to checkFabian Ruch2014-07-301-0/+1
* | | | t4013: test diff-tree's --stdin commit formattingJeff King2014-07-281-0/+10
* | | | Merge branch 'zk/log-graph-showsig' into maintJunio C Hamano2014-07-221-0/+31
|\ \ \ \
| * | | | log: fix indentation for --graph --show-signaturezk/log-graph-showsigZoltan Klinger2014-07-091-0/+31
| | |/ / | |/| |
* | | | Merge branch 'cb/filter-branch-prune-empty-degenerate-merges' into maintJunio C Hamano2014-07-221-0/+11
|\ \ \ \
| * | | | filter-branch: eliminate duplicate mapped parentscb/filter-branch-prune-empty-degenerate-mergesCharles Bailey2014-07-011-0/+11
* | | | | Merge branch 'jm/dedup-test-config' into maintJunio C Hamano2014-07-221-5/+0
|\ \ \ \ \
| * | | | | t/t7810-grep.sh: remove duplicate test_config()jm/dedup-test-configJeremiah Mahler2014-06-051-5/+0
* | | | | | Merge branch 'sk/test-cmp-bin' into maintJunio C Hamano2014-07-225-22/+28
|\ \ \ \ \ \
| * | | | | | t5000, t5003: do not use test_cmp to compare binary filessk/test-cmp-binStepan Kasal2014-06-045-22/+28
* | | | | | | Merge branch 'lt/request-pull' into maintJunio C Hamano2014-07-221-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix brown paper bag breakage in t5150-request-pull.shlt/request-pullJohannes Sixt2014-06-021-1/+1
* | | | | | | | Merge branch 'ep/shell-assign-and-export-vars' into maintJunio C Hamano2014-07-222-2/+10
|\ \ \ \ \ \ \ \
| * | | | | | | | scripts: more "export VAR=VALUE" fixesep/shell-assign-and-export-varsJunio C Hamano2014-05-232-2/+10
* | | | | | | | | Merge branch 'jk/pretty-G-format-fixes' into maintJunio C Hamano2014-07-162-9/+68
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | move "%G" format test from t7510 to t6006jk/pretty-G-format-fixesJeff King2014-06-252-6/+6
| * | | | | | | | | pretty: avoid reading past end-of-string with "%G"Jeff King2014-06-171-0/+6
| * | | | | | | | | t7510: check %G* pretty-format outputJeff King2014-06-171-0/+40
| * | | | | | | | | t7510: test a commit signed by an unknown keyJeff King2014-06-171-0/+13
| * | | | | | | | | t7510: use consistent &&-chains in loopMichael J Gruber2014-06-171-6/+6
| * | | | | | | | | t7510: stop referring to master in later testsJeff King2014-06-171-3/+3
* | | | | | | | | | Merge branch 'bc/fix-rebase-merge-skip' into maintJunio C Hamano2014-07-161-0/+15
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | rebase--merge: fix --skip with two conflicts in a rowbc/fix-rebase-merge-skipbrian m. carlson2014-06-161-0/+15
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-281-3/+3
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-282-0/+38
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-081-22/+22
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'km/avoid-cp-a' into maintJunio C Hamano2014-05-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'pb/trim-trailing-spaces' into maintJunio C Hamano2014-07-101-0/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | t0008: do not depend on 'echo' handling backslashes speciallypb/trim-trailing-spacesJunio C Hamano2014-06-131-6/+8
| * | | | | | | | | | | | | | | dir.c:trim_trailing_spaces(): fix for " \ " sequencePasha Bolokhov2014-06-021-0/+23
| | |_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge branch 'jk/repack-pack-keep-objects' into maintJunio C Hamano2014-07-101-2/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | repack: respect pack.writebitmapsJeff King2014-06-101-1/+17