summaryrefslogtreecommitdiff
path: root/t
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ | |/ /
| * | t7300: repair filesystem permissions with test_when_finishedJeff King2014-07-021-2/+2
* | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-281-3/+3
|\ \ \
| * | | git-prompt.sh: don't assume the shell expands the value of PS1rh/prompt-pcmode-avoid-eval-on-refnameRichard Hansen2014-05-191-3/+3
* | | | Merge branch 'mw/symlinks' into maintJunio C Hamano2014-05-282-0/+38
|\ \ \ \
| * | | | setup: don't dereference in-tree symlinks for absolute pathsMartin Erik Werner2014-02-042-2/+2
| * | | | t0060: add tests for prefix_path when path begins with work treeMartin Erik Werner2014-02-041-0/+10
| * | | | t0060: add test for prefix_path when path == work treeMartin Erik Werner2014-02-041-0/+6
| * | | | t0060: add test for prefix_path on symlinks via absolute pathsMartin Erik Werner2014-02-041-0/+5
| * | | | t3004: add test for ls-files on symlinks via absolute pathsJunio C Hamano2014-02-041-0/+17
* | | | | Merge branch 'rh/prompt-pcmode-avoid-eval-on-refname' into maintJunio C Hamano2014-05-081-22/+22
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | git-prompt.sh: don't put unsanitized branch names in $PS1Richard Hansen2014-04-221-22/+22
| | |/ / | |/| |
* | | | Merge branch 'km/avoid-bs-in-shell-glob' into maintJunio C Hamano2014-05-081-2/+2
|\ \ \ \
| * | | | test: fix t5560 on FreeBSDkm/avoid-bs-in-shell-globKyle J. McKay2014-04-111-2/+2
| |/ / /
* | | | Merge branch 'km/avoid-cp-a' into maintJunio C Hamano2014-05-081-2/+2
|\ \ \ \
| * | | | test: fix t7001 cp to use POSIX optionskm/avoid-cp-aKyle J. McKay2014-04-111-2/+2
| |/ / /
* | | | Merge branch 'jl/nor-or-nand-and' into maintJunio C Hamano2014-04-097-7/+7
|\ \ \ \
| * | | | code and test: fix misuses of "nor"jl/nor-or-nand-andJustin Lebar2014-03-317-7/+7
* | | | | Merge branch 'cn/fetch-prune-overlapping-destination' into maintJunio C Hamano2014-04-091-0/+20
|\ \ \ \ \
| * | | | | fetch: handle overlaping refspecs on --prunecn/fetch-prune-overlapping-destinationCarlos Martín Nieto2014-03-261-1/+1
| * | | | | fetch: add a failing test for prunning with overlapping refspecsCarlos Martín Nieto2014-02-281-0/+20
| | |/ / / | |/| | |
* | | | | Merge branch 'mh/update-ref-batch-create-fix' into maintJunio C Hamano2014-04-091-0/+11
|\ \ \ \ \
| * | | | | update-ref: fail create operation over stdin if ref already existsmh/update-ref-batch-create-fixAman Gupta2014-04-021-0/+11
* | | | | | Merge branch 'jk/commit-dates-parsing-fix' into maintJunio C Hamano2014-04-091-4/+2
|\ \ \ \ \ \
| * | | | | | t4212: loosen far-in-future test for AIXjk/commit-dates-parsing-fixJeff King2014-04-011-4/+2
* | | | | | | Merge branch 'bp/commit-p-editor' into maintJunio C Hamano2014-04-082-9/+58
|\ \ \ \ \ \ \
| * | | | | | | merge hook tests: fix and update testsBenoit Pierre2014-03-181-6/+21
| * | | | | | | commit: fix patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-2/+2
| * | | | | | | test patch hunk editing with "commit -p -m"Benoit Pierre2014-03-181-0/+34
| * | | | | | | merge hook tests: use 'test_must_fail' instead of '!'Benoit Pierre2014-03-111-2/+2
| * | | | | | | merge hook tests: fix missing '&&' in testBenoit Pierre2014-03-111-1/+1
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jk/mv-submodules-fix' into maintJunio C Hamano2014-04-031-1/+12
|\ \ \ \ \ \ \
| * | | | | | | mv: prevent mismatched data when ignoring errors.jk/mv-submodules-fixbrian m. carlson2014-03-171-1/+12
| | |_|/ / / / | |/| | | | |
* | | | | | | Merge branch 'jk/lib-terminal-lazy' into maintJunio C Hamano2014-04-031-18/+19
|\ \ \ \ \ \ \
| * | | | | | | t/lib-terminal: make TTY a lazy prerequisitejk/lib-terminal-lazyJeff King2014-03-141-18/+19
| |/ / / / / /
* | | | | | | Merge branch 'us/printf-not-echo' into maintJunio C Hamano2014-04-031-2/+2
|\ \ \ \ \ \ \
| * | | | | | | test-lib.sh: do not "echo" caller-supplied stringsus/printf-not-echoUwe Storbeck2014-03-181-2/+2
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'jn/wt-status' into maintJunio C Hamano2014-04-032-13/+13
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | wt-status: lift the artificual "at least 20 columns" floorjn/wt-statusJunio C Hamano2014-03-122-13/+13
| |/ / / / /
* | | | | | Merge branch 'jk/clean-d-pathspec' into maintJunio C Hamano2014-03-181-0/+16
|\ \ \ \ \ \