criss cross rename failure workaround
[git/dscho.git] / t / 
tree2434ffa30b20d97de635a28fa49e291dabe3c9f4
drwxr-xr-x   ..
-rw-r--r-- 36 .gitattributes
-rw-r--r-- 40 .gitignore
-rw-r--r-- 2145 Makefile
-rw-r--r-- 23520 README
-rwxr-xr-x 552 aggregate-results.sh
-rw-r--r-- 3408 annotate-tests.sh
-rw-r--r-- 1341 diff-lib.sh
-rw-r--r-- 2195 gitweb-lib.sh
-rwxr-xr-x 508 harness
-rw-r--r-- 1641 lib-cvs.sh
-rw-r--r-- 3671 lib-git-svn.sh
-rw-r--r-- 3533 lib-httpd.sh
drwxr-xr-x - lib-httpd
-rw-r--r-- 270 lib-pager.sh
-rw-r--r-- 656 lib-patch-mode.sh
-rw-r--r-- 198 lib-prereq-FILEMODE.sh
-rw-r--r-- 4207 lib-read-tree-m-3way.sh
-rw-r--r-- 1913 lib-rebase.sh
-rw-r--r-- 2684 lib-t6000.sh
-rwxr-xr-x 14767 t0000-basic.sh
-rwxr-xr-x 6811 t0001-init.sh
-rwxr-xr-x 1941 t0002-gitfile.sh
-rwxr-xr-x 2204 t0003-attributes.sh
-rwxr-xr-x 1188 t0004-unwritable.sh
-rwxr-xr-x 341 t0005-signals.sh
-rwxr-xr-x 2507 t0006-date.sh
-rwxr-xr-x 609 t0010-racy-git.sh
-rwxr-xr-x 10698 t0020-crlf.sh
-rwxr-xr-x 2509 t0021-conversion.sh
-rwxr-xr-x 584 t0022-crlf-rename.sh
-rwxr-xr-x 776 t0023-crlf-am.sh
-rwxr-xr-x 770 t0024-crlf-archive.sh
-rwxr-xr-x 3785 t0025-crlf-auto.sh
-rwxr-xr-x 1694 t0026-eol-config.sh
-rwxr-xr-x 12799 t0030-stripspace.sh
-rwxr-xr-x 6877 t0040-parse-options.sh
-rwxr-xr-x 3071 t0050-filesystem.sh
-rwxr-xr-x 487 t0055-beyond-symlinks.sh
-rwxr-xr-x 3750 t0060-path-utils.sh
-rwxr-xr-x 228 t0061-run-command.sh
-rwxr-xr-x 228 t0070-fundamental.sh
-rwxr-xr-x 2615 t0080-vcs-svn.sh
-rwxr-xr-x 1189 t0100-previous.sh
-rwxr-xr-x 874 t0101-at-syntax.sh
-rwxr-xr-x 16914 t1000-read-tree-m-3way.sh
-rwxr-xr-x 12146 t1001-read-tree-m-2way.sh
-rwxr-xr-x 11251 t1002-read-tree-m-u-2way.sh
-rwxr-xr-x 412 t1003-read-tree-prefix.sh
-rwxr-xr-x 5598 t1004-read-tree-m-u-wf.sh
-rwxr-xr-x 1982 t1005-read-tree-reset.sh
-rwxr-xr-x 6324 t1006-cat-file.sh
-rwxr-xr-x 5063 t1007-hash-object.sh
-rwxr-xr-x 538 t1008-read-tree-overlay.sh
-rwxr-xr-x 427 t1009-read-tree-new-index.sh
-rwxr-xr-x 1724 t1010-mktree.sh
-rwxr-xr-x 4440 t1011-read-tree-sparse-checkout.sh
-rwxr-xr-x 1844 t1012-read-tree-df.sh
-rwxr-xr-x 2935 t1020-subdirectory.sh
-rwxr-xr-x 1108 t1100-commit-tree-options.sh
-rwxr-xr-x 6428 t1200-tutorial.sh
-rwxr-xr-x 17515 t1300-repo-config.sh
-rwxr-xr-x 3529 t1301-shared-repo.sh
-rwxr-xr-x 1353 t1302-repo-version.sh
-rwxr-xr-x 1045 t1303-wacky-config.sh
-rwxr-xr-x 1638 t1304-default-acl.sh
-rwxr-xr-x 9243 t1400-update-ref.sh
-rwxr-xr-x 927 t1401-symbolic-ref.sh
-rwxr-xr-x 2072 t1402-check-ref-format.sh
-rwxr-xr-x 5044 t1410-reflog.sh
-rwxr-xr-x 1833 t1411-reflog-show.sh
-rwxr-xr-x 749 t1420-lost-found.sh
-rwxr-xr-x 4214 t1450-fsck.sh
-rwxr-xr-x 2189 t1500-rev-parse.sh
-rwxr-xr-x 8003 t1501-worktree.sh
-rwxr-xr-x 2608 t1502-rev-parse-parseopt.sh
-rwxr-xr-x 3724 t1503-rev-parse-verify.sh
-rwxr-xr-x 3637 t1504-ceiling-dirs.sh
-rwxr-xr-x 1039 t1505-rev-parse-last.sh
-rwxr-xr-x 2914 t1506-rev-parse-diagnosis.sh
-rwxr-xr-x 3373 t1507-rev-parse-upstream.sh
-rwxr-xr-x 1156 t1508-at-combinations.sh
-rwxr-xr-x 5955 t1509-root-worktree.sh
drwxr-xr-x - t1509
-rwxr-xr-x 1476 t2000-checkout-cache-clash.sh
-rwxr-xr-x 2503 t2001-checkout-cache-clash.sh
-rwxr-xr-x 741 t2002-checkout-cache-u.sh
-rwxr-xr-x 2615 t2003-checkout-cache-mkdir.sh
-rwxr-xr-x 5670 t2004-checkout-cache-temp.sh
-rwxr-xr-x 680 t2005-checkout-index-symlinks.sh
-rwxr-xr-x 970 t2007-checkout-symlink.sh
-rwxr-xr-x 1913 t2008-checkout-subdir.sh
-rwxr-xr-x 921 t2009-checkout-statinfo.sh
-rwxr-xr-x 1097 t2010-checkout-ambiguous.sh
-rwxr-xr-x 475 t2011-checkout-invalid-head.sh
-rwxr-xr-x 2778 t2012-checkout-last.sh
-rwxr-xr-x 1813 t2013-checkout-submodule.sh
-rwxr-xr-x 445 t2014-switch.sh
-rwxr-xr-x 881 t2015-checkout-unborn.sh
-rwxr-xr-x 3382 t2016-checkout-patch.sh
-rwxr-xr-x 3578 t2017-checkout-orphan.sh
-rwxr-xr-x 4086 t2018-checkout-branch.sh
-rwxr-xr-x 4427 t2030-unresolve-info.sh
-rwxr-xr-x 1335 t2050-git-dir-relative.sh
-rwxr-xr-x 1182 t2100-update-cache-badpath.sh
-rwxr-xr-x 2189 t2101-update-index-reupdate.sh
-rwxr-xr-x 804 t2102-update-index-symlinks.sh
-rwxr-xr-x 2061 t2103-update-index-ignore-missing.sh
-rwxr-xr-x 1126 t2104-update-index-skip-worktree.sh
-rwxr-xr-x 700 t2105-update-index-gitfile.sh
-rwxr-xr-x 496 t2106-update-index-assume-unchanged.sh
-rwxr-xr-x 3859 t2200-add-update.sh
-rwxr-xr-x 3024 t2201-add-update-typechange.sh
-rwxr-xr-x 749 t2202-add-addremove.sh
-rwxr-xr-x 1380 t2203-add-intent.sh
-rwxr-xr-x 1477 t2204-add-ignored.sh
-rwxr-xr-x 754 t2300-cd-to-toplevel.sh
-rwxr-xr-x 1402 t3000-ls-files-others.sh
-rwxr-xr-x 3775 t3001-ls-files-others-exclude.sh
-rwxr-xr-x 1217 t3002-ls-files-dashpath.sh
-rwxr-xr-x 830 t3003-ls-files-exclude.sh
-rwxr-xr-x 2227 t3010-ls-files-killed-modified.sh
-rwxr-xr-x 704 t3020-ls-files-error-unmatch.sh
-rwxr-xr-x 12347 t3030-merge-recursive.sh
-rwxr-xr-x 1732 t3031-merge-criscross.sh
-rwxr-xr-x 2498 t3040-subprojects-basic.sh
-rwxr-xr-x 1036 t3050-subprojects-fetch.sh
-rwxr-xr-x 1599 t3060-ls-files-with-tree.sh
-rwxr-xr-x 4044 t3100-ls-tree-restrict.sh
-rwxr-xr-x 5081 t3101-ls-tree-dirname.sh
-rwxr-xr-x 20159 t3200-branch.sh
-rwxr-xr-x 1507 t3201-branch-contains.sh
-rwxr-xr-x 1336 t3202-show-branch-octopus.sh
-rwxr-xr-x 1613 t3203-branch-output.sh
-rwxr-xr-x 3179 t3210-pack-refs.sh
-rwxr-xr-x 5262 t3300-funny-names.sh
-rwxr-xr-x 25550 t3301-notes.sh
-rwxr-xr-x 2211 t3302-notes-index-expensive.sh
-rwxr-xr-x 5150 t3303-notes-subtrees.sh
-rwxr-xr-x 4256 t3304-notes-mixed.sh
-rwxr-xr-x 1889 t3305-notes-fanout.sh
-rwxr-xr-x 2875 t3306-notes-prune.sh
-rwxr-xr-x 818 t3307-notes-man.sh
-rwxr-xr-x 5569 t3400-rebase.sh
-rwxr-xr-x 1584 t3401-rebase-partial.sh
-rwxr-xr-x 2512 t3402-rebase-merge.sh
-rwxr-xr-x 1771 t3403-rebase-skip.sh
-rwxr-xr-x 20367 t3404-rebase-interactive.sh
-rwxr-xr-x 844 t3405-rebase-malformed.sh
-rwxr-xr-x 1286 t3406-rebase-message.sh
-rwxr-xr-x 1975 t3407-rebase-abort.sh
-rwxr-xr-x 722 t3408-rebase-multi-line.sh
-rwxr-xr-x 2240 t3409-rebase-preserve-merges.sh
-rwxr-xr-x 2076 t3410-rebase-preserve-dropped-merges.sh
-rwxr-xr-x 1515 t3411-rebase-preserve-around-merges.sh
-rwxr-xr-x 6283 t3412-rebase-root.sh
-rwxr-xr-x 3597 t3413-rebase-hook.sh
-rwxr-xr-x 1981 t3414-rebase-preserve-onto.sh
-rwxr-xr-x 2328 t3415-rebase-autosquash.sh
-rwxr-xr-x 2320 t3416-rebase-onto-threedots.sh
-rwxr-xr-x 1948 t3417-rebase-whitespace-fix.sh
-rwxr-xr-x 913 t3418-rebase-continue.sh
-rwxr-xr-x 1567 t3500-cherry.sh
-rwxr-xr-x 1916 t3501-revert-cherry-pick.sh
-rwxr-xr-x 2113 t3502-cherry-pick-merge.sh
-rwxr-xr-x 464 t3503-cherry-pick-root.sh
-rwxr-xr-x 982 t3504-cherry-pick-rerere.sh
-rwxr-xr-x 837 t3505-cherry-pick-empty.sh
-rwxr-xr-x 2332 t3506-cherry-pick-ff.sh
-rwxr-xr-x 4844 t3507-cherry-pick-conflict.sh
-rwxr-xr-x 4015 t3508-cherry-pick-many-commits.sh
-rwxr-xr-x 620 t3509-cherry-pick-merge-df.sh
-rwxr-xr-x 7050 t3600-rm.sh
-rwxr-xr-x 7927 t3700-add.sh
-rwxr-xr-x 6052 t3701-add-interactive.sh
-rwxr-xr-x 3170 t3702-add-edit.sh
-rwxr-xr-x 7951 t3800-mktag.sh
-rwxr-xr-x 2945 t3900-i18n-commit.sh
drwxr-xr-x - t3900
-rwxr-xr-x 153 t3901-8859-1.txt
-rwxr-xr-x 6490 t3901-i18n-patch.sh
-rwxr-xr-x 155 t3901-utf8.txt
-rwxr-xr-x 3097 t3902-quoted.sh
-rwxr-xr-x 13660 t3903-stash.sh
-rwxr-xr-x 1367 t3904-stash-patch.sh
-rwxr-xr-x 1067 t4000-diff-format.sh
-rwxr-xr-x 1506 t4001-diff-rename.sh
-rwxr-xr-x 15649 t4002-diff-basic.sh
-rwxr-xr-x 4167 t4003-diff-rename-1.sh
-rwxr-xr-x 1676 t4004-diff-rename-symlink.sh
-rwxr-xr-x 2937 t4005-diff-rename-2.sh
-rwxr-xr-x 561 t4006-diff-mode.sh
-rwxr-xr-x 2942 t4007-rename-3.sh
-rwxr-xr-x 6230 t4008-diff-break-rewrite.sh
-rwxr-xr-x 2955 t4009-diff-rename-4.sh
-rwxr-xr-x 2014 t4010-diff-pathspec.sh
-rwxr-xr-x 2029 t4011-diff-symlink.sh
-rwxr-xr-x 2645 t4012-diff-binary.sh
-rwxr-xr-x 8267 t4013-diff-various.sh
drwxr-xr-x - t4013
-rwxr-xr-x 16636 t4014-format-patch.sh
-rwxr-xr-x 10423 t4015-diff-whitespace.sh
-rwxr-xr-x 2072 t4016-diff-quote.sh
-rwxr-xr-x 3597 t4017-diff-retval.sh
-rwxr-xr-x 2250 t4018-diff-funcname.sh
-rwxr-xr-x 4332 t4019-diff-wserror.sh
-rwxr-xr-x 3750 t4020-diff-external.sh
drwxr-xr-x - t4020
-rwxr-xr-x 2364 t4021-format-patch-numbered.sh
-rwxr-xr-x 507 t4022-diff-rewrite.sh
-rwxr-xr-x 1709 t4023-diff-rename-typechange.sh
-rwxr-xr-x 2774 t4024-diff-optimize-common.sh
-rwxr-xr-x 665 t4025-hunk-header.sh
-rwxr-xr-x 1924 t4026-color.sh
-rwxr-xr-x 11029 t4027-diff-submodule.sh
-rwxr-xr-x 727 t4028-format-patch-mime-headers.sh
-rwxr-xr-x 792 t4029-diff-trailing-space.sh
-rwxr-xr-x 2768 t4030-diff-textconv.sh
-rwxr-xr-x 1366 t4031-diff-rewrite-binary.sh
-rwxr-xr-x 1256 t4032-diff-inter-hunk-context.sh
-rwxr-xr-x 2023 t4033-diff-patience.sh
-rwxr-xr-x 5790 t4034-diff-words.sh
-rwxr-xr-x 2198 t4035-diff-quiet.sh
-rwxr-xr-x 935 t4036-format-patch-signer-mime.sh
-rwxr-xr-x 658 t4037-diff-r-t-dirs.sh
-rwxr-xr-x 1703 t4038-diff-combined.sh
-rwxr-xr-x 724 t4039-diff-assume-unchanged.sh
-rwxr-xr-x 1518 t4040-whitespace-status.sh
-rwxr-xr-x 10651 t4041-diff-submodule-option.sh
-rwxr-xr-x 2397 t4042-diff-textconv-caching.sh
-rwxr-xr-x 878 t4043-diff-rename-binary.sh
-rwxr-xr-x 767 t4044-diff-index-unique-abbrev.sh
-rwxr-xr-x 1192 t4045-diff-relative.sh
-rwxr-xr-x 797 t4100-apply-stat.sh
drwxr-xr-x - t4100
-rwxr-xr-x 562 t4101-apply-nonl.sh
drwxr-xr-x - t4101
-rwxr-xr-x 1102 t4102-apply-rename.sh
-rwxr-xr-x 3269 t4103-apply-binary.sh
-rwxr-xr-x 2940 t4104-apply-boundary.sh
-rwxr-xr-x 1147 t4105-apply-fuzz.sh
-rwxr-xr-x 532 t4106-apply-stdin.sh
-rwxr-xr-x 3827 t4107-apply-ignore-whitespace.sh
-rwxr-xr-x 808 t4109-apply-multifrag.sh
drwxr-xr-x - t4109
-rwxr-xr-x 522 t4110-apply-scan.sh
drwxr-xr-x - t4110
-rwxr-xr-x 2969 t4111-apply-subdir.sh
-rwxr-xr-x 3304 t4112-apply-renames.sh
-rwxr-xr-x 691 t4113-apply-ending.sh
-rwxr-xr-x 3189 t4114-apply-typechange.sh
-rwxr-xr-x 800 t4115-apply-symlink.sh
-rwxr-xr-x 1770 t4116-apply-reverse.sh
-rwxr-xr-x 2595 t4117-apply-reject.sh
-rwxr-xr-x 960 t4118-apply-empty-context.sh
-rwxr-xr-x 3095 t4119-apply-config.sh
-rwxr-xr-x 1210 t4120-apply-popt.sh
-rwxr-xr-x 556 t4121-apply-diffs.sh
-rwxr-xr-x 1038 t4122-apply-symlink-inside.sh
-rwxr-xr-x 617 t4123-apply-shrink.sh
-rwxr-xr-x 10693 t4124-apply-ws-rule.sh
-rwxr-xr-x 2275 t4125-apply-ws-fuzz.sh
-rwxr-xr-x 1036 t4126-apply-empty.sh
-rwxr-xr-x 2015 t4127-apply-same-fn.sh
-rwxr-xr-x 2424 t4128-apply-root.sh
-rwxr-xr-x 1318 t4129-apply-samemode.sh
-rwxr-xr-x 1207 t4130-apply-criss-cross-rename.sh
-rwxr-xr-x 838 t4131-apply-fake-ancestor.sh
-rwxr-xr-x 2406 t4132-apply-removal.sh
-rwxr-xr-x 684 t4133-apply-filenames.sh
-rwxr-xr-x 777 t4134-apply-submodule.sh
-rwxr-xr-x 1890 t4135-apply-weird-filenames.sh
drwxr-xr-x - t4135
-rwxr-xr-x 13154 t4150-am.sh
-rwxr-xr-x 1401 t4151-am-abort.sh
-rwxr-xr-x 9881 t4200-rerere.sh
-rwxr-xr-x 3916 t4201-shortlog.sh
-rwxr-xr-x 9127 t4202-log.sh
-rwxr-xr-x 5576 t4203-mailmap.sh
-rwxr-xr-x 1632 t4204-patch-id.sh
-rwxr-xr-x 1913 t4205-log-pretty-formats.sh
-rwxr-xr-x 960 t4206-log-follow-harder-copies.sh
-rwxr-xr-x 1821 t4207-log-decoration-colors.sh
-rwxr-xr-x 1925 t4252-am-options.sh
drwxr-xr-x - t4252
-rwxr-xr-x 2345 t4253-am-keep-cr-dos.sh
-rwxr-xr-x 6527 t4300-merge-tree.sh
-rwxr-xr-x 7105 t5000-tar-tree.sh
-rwxr-xr-x 2707 t5001-archive-attr.sh
-rwxr-xr-x 2402 t5100-mailinfo.sh
drwxr-xr-x - t5100
-rwxr-xr-x 4907 t5150-request-pull.sh
-rwxr-xr-x 11076 t5300-pack-object.sh
-rwxr-xr-x 1775 t5301-sliding-window.sh
-rwxr-xr-x 8197 t5302-pack-index.sh
-rwxr-xr-x 10183 t5303-pack-corruption-resilience.sh
-rwxr-xr-x 4024 t5304-prune.sh
-rwxr-xr-x 1867 t5305-include-tag.sh
-rwxr-xr-x 2044 t5306-pack-nobase.sh
-rwxr-xr-x 809 t5307-pack-missing-commit.sh
-rwxr-xr-x 5828 t5400-send-pack.sh
-rwxr-xr-x 3825 t5401-update-hooks.sh
-rwxr-xr-x 1546 t5402-post-merge-hook.sh
-rwxr-xr-x 2945 t5403-post-checkout-hook.sh
-rwxr-xr-x 1469 t5404-tracking-branches.sh
-rwxr-xr-x 656 t5405-send-pack-rewind.sh
-rwxr-xr-x 522 t5406-remote-rejects.sh
-rwxr-xr-x 4659 t5407-post-rewrite-hook.sh
-rwxr-xr-x 4571 t5500-fetch-pack.sh
-rwxr-xr-x 2524 t5502-quickfetch.sh
-rwxr-xr-x 3295 t5503-tagfollow.sh
-rwxr-xr-x 23342 t5505-remote.sh
-rwxr-xr-x 2023 t5506-remote-groups.sh
-rwxr-xr-x 9463 t5510-fetch.sh
-rwxr-xr-x 3065 t5511-refspec.sh
-rwxr-xr-x 2558 t5512-ls-remote.sh
-rwxr-xr-x 555 t5513-fetch-track.sh
-rwxr-xr-x 3024 t5514-fetch-multiple.sh
-rwxr-xr-x 4592 t5515-fetch-merge-logic.sh
drwxr-xr-x - t5515
-rwxr-xr-x 18805 t5516-fetch-push.sh
-rwxr-xr-x 6430 t5517-push-mirror.sh
-rwxr-xr-x 508 t5518-fetch-exit-status.sh
-rwxr-xr-x 3424 t5519-push-alternates.sh
-rwxr-xr-x 5201 t5520-pull.sh
-rwxr-xr-x 1809 t5521-pull-options.sh
-rwxr-xr-x 2169 t5522-pull-symlink.sh
-rwxr-xr-x 1649 t5523-push-upstream.sh
-rwxr-xr-x 571 t5524-pull-msg.sh
-rwxr-xr-x 944 t5525-fetch-tagopt.sh
-rwxr-xr-x 2266 t5530-upload-pack-error.sh
-rwxr-xr-x 528 t5531-deep-submodule-push.sh
-rwxr-xr-x 3778 t5540-http-push.sh
-rwxr-xr-x 4011 t5541-http-push.sh
-rwxr-xr-x 2799 t5550-http-fetch.sh
-rwxr-xr-x 2465 t5551-http-fetch.sh
-rwxr-xr-x 1566 t5560-http-backend-noserver.sh
-rwxr-xr-x 4355 t5561-http-backend.sh
-rwxr-xr-x 3342 t556x_common
-rwxr-xr-x 1153 t5600-clone-fail-cleanup.sh
-rwxr-xr-x 4181 t5601-clone.sh
-rwxr-xr-x 746 t5602-clone-remote-exec.sh
-rwxr-xr-x 3176 t5700-clone-reference.sh
-rwxr-xr-x 3096 t5701-clone-local.sh
-rwxr-xr-x 627 t5702-clone-options.sh
-rwxr-xr-x 1042 t5704-bundle.sh
-rwxr-xr-x 1233 t5705-clone-2gb.sh
-rwxr-xr-x 1415 t5706-clone-branch.sh
-rwxr-xr-x 2320 t5710-info-alternate.sh
-rwxr-xr-x 1885 t5800-remote-helpers.sh
-rwxr-xr-x 2362 t6001-rev-list-graft.sh
-rwxr-xr-x 8383 t6002-rev-list-bisect.sh
-rwxr-xr-x 8731 t6003-rev-list-topo-order.sh
-rwxr-xr-x 1275 t6004-rev-list-path-optim.sh
-rwxr-xr-x 1693 t6005-rev-list-count.sh
-rwxr-xr-x 7458 t6006-rev-list-format.sh
-rwxr-xr-x 1849 t6007-rev-list-cherry-pick-file.sh
-rwxr-xr-x 812 t6008-rev-list-submodule.sh
-rwxr-xr-x 531 t6009-rev-list-parent.sh
-rwxr-xr-x 5384 t6010-merge-base.sh
-rwxr-xr-x 1370 t6011-rev-list-with-bad-commit.sh
-rwxr-xr-x 1871 t6012-rev-list-simplify.sh
-rwxr-xr-x 958 t6013-rev-list-reverse-parents.sh
-rwxr-xr-x 498 t6014-rev-list-all.sh
-rwxr-xr-x 862 t6015-rev-list-show-all-parents.sh
-rwxr-xr-x 7910 t6016-rev-list-graph-simplify-history.sh
-rwxr-xr-x 1055 t6017-rev-list-stdin.sh
-rwxr-xr-x 4610 t6018-rev-list-glob.sh
-rwxr-xr-x 1549 t6019-rev-list-ancestry-path.sh
-rwxr-xr-x 928 t6020-merge-df.sh
-rwxr-xr-x 1372 t6021-merge-criss-cross.sh
-rwxr-xr-x 8148 t6022-merge-rename.sh
-rwxr-xr-x 6493 t6023-merge-file.sh
-rwxr-xr-x 2971 t6024-recursive-merge.sh
-rwxr-xr-x 1552 t6025-merge-symlinks.sh
-rwxr-xr-x 3484 t6026-merge-attr.sh
-rwxr-xr-x 1147 t6027-merge-binary.sh
-rwxr-xr-x 1415 t6028-merge-up-to-date.sh
-rwxr-xr-x 2873 t6029-merge-subtree.sh
-rwxr-xr-x 18273 t6030-bisect-porcelain.sh
-rwxr-xr-x 1848 t6031-merge-recursive.sh
-rwxr-xr-x 1274 t6032-merge-large-rename.sh
-rwxr-xr-x 903 t6033-merge-crlf.sh
-rwxr-xr-x 3713 t6034-merge-rename-nocruft.sh
-rwxr-xr-x 3562 t6035-merge-dir-to-symlink.sh
-rwxr-xr-x 860 t6036-recursive-corner-cases.sh
-rwxr-xr-x 1492 t6037-merge-ours-theirs.sh
-rwxr-xr-x 3848 t6038-merge-text-auto.sh
-rwxr-xr-x 2584 t6040-tracking-info.sh
-rwxr-xr-x 7322 t6050-replace.sh
-rwxr-xr-x 2207 t6101-rev-parse-parents.sh
-rwxr-xr-x 3754 t6120-describe.sh
-rwxr-xr-x 7183 t6200-fmt-merge-msg.sh
-rwxr-xr-x 11118 t6300-for-each-ref.sh
-rwxr-xr-x 6164 t7001-mv.sh
-rwxr-xr-x 9978 t7003-filter-branch.sh
-rwxr-xr-x 33228 t7004-tag.sh
drwxr-xr-x - t7004
-rwxr-xr-x 2505 t7005-editor.sh
-rwxr-xr-x 10131 t7006-pager.sh
drwxr-xr-x - t7006
-rwxr-xr-x 405 t7007-show.sh
-rwxr-xr-x 1982 t7008-grep-binary.sh
-rwxr-xr-x 2767 t7010-setup.sh
-rwxr-xr-x 3371 t7011-skip-worktree-reading.sh
-rwxr-xr-x 3412 t7012-skip-worktree-writing.sh
-rwxr-xr-x 1281 t7060-wtstatus.sh
-rwxr-xr-x 1542 t7101-reset.sh
-rwxr-xr-x 11419 t7102-reset.sh
-rwxr-xr-x 1520 t7103-reset-bare.sh
-rwxr-xr-x 825 t7104-reset.sh
-rwxr-xr-x 1768 t7105-reset-patch.sh
-rwxr-xr-x 9964 t7110-reset-merge.sh
-rwxr-xr-x 2558 t7111-reset-table.sh
-rwxr-xr-x 15210 t7201-co.sh
-rwxr-xr-x 9216 t7300-clean.sh
-rwxr-xr-x 9535 t7400-submodule-basic.sh
-rwxr-xr-x 4440 t7401-submodule-summary.sh
-rwxr-xr-x 2077 t7402-submodule-rebase.sh
-rwxr-xr-x 1365 t7403-submodule-sync.sh
-rwxr-xr-x 3730 t7405-submodule-merge.sh
-rwxr-xr-x 4142 t7406-submodule-update.sh
-rwxr-xr-x 5896 t7407-submodule-foreach.sh
-rwxr-xr-x 1798 t7408-submodule-reference.sh
-rwxr-xr-x 5463 t7500-commit.sh
drwxr-xr-x - t7500
-rwxr-xr-x 9964 t7501-commit.sh
-rwxr-xr-x 10389 t7502-commit.sh
-rwxr-xr-x 1403 t7503-pre-commit-hook.sh
-rwxr-xr-x 4297 t7504-commit-msg-hook.sh
-rwxr-xr-x 3228 t7505-prepare-commit-msg-hook.sh
-rwxr-xr-x 5146 t7506-status-submodule.sh
-rwxr-xr-x 1353 t7507-commit-verbose.sh
-rwxr-xr-x 26753 t7508-status.sh
-rwxr-xr-x 4250 t7509-commit.sh
-rwxr-xr-x 13700 t7600-merge.sh
-rwxr-xr-x 3617 t7601-merge-pull-config.sh
-rwxr-xr-x 2035 t7602-merge-octopus-many.sh
-rwxr-xr-x 2386 t7603-merge-reduce-heads.sh
-rwxr-xr-x 1021 t7604-merge-custom-message.sh
-rwxr-xr-x 1002 t7605-merge-resolve.sh
-rwxr-xr-x 2020 t7606-merge-custom.sh
-rwxr-xr-x 1798 t7607-merge-overwrite.sh
-rwxr-xr-x 1468 t7608-merge-messages.sh
-rwxr-xr-x 3022 t7609-merge-co-error-msgs.sh
-rwxr-xr-x 3628 t7610-mergetool.sh
-rwxr-xr-x 5362 t7700-repack.sh
-rwxr-xr-x 2787 t7701-repack-unpack-unreachable.sh
-rwxr-xr-x 6948 t7800-difftool.sh
-rwxr-xr-x 11026 t7810-grep.sh
-rwxr-xr-x 3314 t7811-grep-open.sh
-rwxr-xr-x 358 t8001-annotate.sh
-rwxr-xr-x 126 t8002-blame.sh
-rwxr-xr-x 3556 t8003-blame.sh
-rwxr-xr-x 1556 t8004-blame.sh
-rwxr-xr-x 2019 t8005-blame-i18n.sh
drwxr-xr-x - t8005
-rwxr-xr-x 1962 t8006-blame-textconv.sh
-rwxr-xr-x 1512 t8007-cat-file-textconv.sh
-rwxr-xr-x 29205 t9001-send-email.sh
-rwxr-xr-x 631 t9010-svn-fe.sh
-rwxr-xr-x 8892 t9100-git-svn-basic.sh
-rwxr-xr-x 5977 t9101-git-svn-props.sh
-rwxr-xr-x 800 t9102-git-svn-deep-rmdir.sh
-rwxr-xr-x 923 t9103-git-svn-tracked-directory-removed.sh
-rwxr-xr-x 7834 t9104-git-svn-follow-parent.sh
-rwxr-xr-x 1200 t9105-git-svn-commit-diff.sh
-rwxr-xr-x 2674 t9106-git-svn-commit-diff-clobber.sh
-rwxr-xr-x 4906 t9107-git-svn-migrate.sh
-rwxr-xr-x 3841 t9108-git-svn-glob.sh
-rwxr-xr-x 5673 t9109-git-svn-multi-glob.sh
-rwxr-xr-x 1849 t9110-git-svn-use-svm-props.sh
drwxr-xr-x - t9110
-rwxr-xr-x 1642 t9111-git-svn-use-svnsync-props.sh
drwxr-xr-x - t9111
-rwxr-xr-x 922 t9112-git-svn-md5less-file.sh
-rwxr-xr-x 940 t9113-git-svn-dcommit-new-file.sh
-rwxr-xr-x 2717 t9114-git-svn-dcommit-merge.sh
-rwxr-xr-x 2120 t9115-git-svn-dcommit-funky-renames.sh
drwxr-xr-x - t9115
-rwxr-xr-x 4016 t9116-git-svn-log.sh
-rwxr-xr-x 1192 t9117-git-svn-init-clone.sh
-rwxr-xr-x 2446 t9118-git-svn-funky-branch-names.sh
-rwxr-xr-x 11990 t9119-git-svn-info.sh
-rwxr-xr-x 1994 t9120-git-svn-clone-with-percent-escapes.sh
-rwxr-xr-x 391 t9121-git-svn-fetch-renamed-dir.sh
drwxr-xr-x - t9121
-rwxr-xr-x 1921 t9122-git-svn-author.sh
-rwxr-xr-x 594 t9123-git-svn-rebuild-with-rewriteroot.sh
-rwxr-xr-x 2607 t9124-git-svn-dcommit-auto-props.sh
-rwxr-xr-x 1091 t9125-git-svn-multi-glob-branch-names.sh
-rwxr-xr-x 500 t9126-git-svn-follow-deleted-readded-directory.sh
drwxr-xr-x - t9126
-rwxr-xr-x 1231 t9127-git-svn-partial-rebuild.sh
-rwxr-xr-x 2086 t9128-git-svn-cmd-branch.sh
-rwxr-xr-x 2142 t9129-git-svn-i18n-commitencoding.sh
-rwxr-xr-x 3130 t9130-git-svn-authors-file.sh
-rwxr-xr-x 2338 t9131-git-svn-empty-symlink.sh
-rwxr-xr-x 1582 t9132-git-svn-broken-symlink.sh
-rwxr-xr-x 1955 t9133-git-svn-nested-git-repo.sh
-rwxr-xr-x 3548 t9134-git-svn-ignore-paths.sh
-rwxr-xr-x 434 t9135-git-svn-moved-branch-empty-file.sh
drwxr-xr-x - t9135
-rwxr-xr-x 291 t9136-git-svn-recreated-branch-empty-file.sh
drwxr-xr-x - t9136
-rwxr-xr-x 1728 t9137-git-svn-dcommit-clobber-series.sh
-rwxr-xr-x 2076 t9138-git-svn-authors-prog.sh
-rwxr-xr-x 904 t9139-git-svn-non-utf8-commitencoding.sh
-rwxr-xr-x 1507 t9140-git-svn-reset.sh
-rwxr-xr-x 4006 t9141-git-svn-multiple-branches.sh
-rwxr-xr-x 642 t9142-git-svn-shallow-clone.sh
-rwxr-xr-x 1461 t9143-git-svn-gc.sh
-rwxr-xr-x 687 t9144-git-svn-old-rev_map.sh
-rwxr-xr-x 600 t9145-git-svn-master-branch.sh
-rwxr-xr-x 2638 t9146-git-svn-empty-dirs.sh
-rwxr-xr-x 561 t9150-svk-mergetickets.sh
drwxr-xr-x - t9150
-rwxr-xr-x 1834 t9151-svn-mergeinfo.sh
drwxr-xr-x - t9151
-rwxr-xr-x 739 t9152-svn-empty-dirs-after-gc.sh
-rwxr-xr-x 579 t9153-git-svn-rewrite-uuid.sh
drwxr-xr-x - t9153
-rwxr-xr-x 1231 t9154-git-svn-fancy-glob.sh
drwxr-xr-x - t9154
-rwxr-xr-x 1375 t9155-git-svn-fetch-deleted-tag.sh
-rwxr-xr-x 1432 t9156-git-svn-fetch-deleted-tag-2.sh
-rw-r--r-- 1279 t9157-git-svn-fetch-merge.sh
-rwxr-xr-x 10775 t9200-git-cvsexportcommit.sh
-rwxr-xr-x 38423 t9300-fast-import.sh
-rwxr-xr-x 12280 t9301-fast-import-notes.sh
-rwxr-xr-x 9565 t9350-fast-export.sh
-rwxr-xr-x 14825 t9400-git-cvsserver-server.sh
-rwxr-xr-x 11726 t9401-git-cvsserver-crlf.sh
-rwxr-xr-x 18926 t9500-gitweb-standalone-no-errors.sh
-rwxr-xr-x 4004 t9501-gitweb-standalone-http-status.sh
-rwxr-xr-x 3360 t9502-gitweb-standalone-parse-output.sh
-rwxr-xr-x 3061 t9600-cvsimport.sh
-rwxr-xr-x 2068 t9601-cvsimport-vendor-branch.sh
drwxr-xr-x - t9601
-rwxr-xr-x 1256 t9602-cvsimport-branches-tags.sh
drwxr-xr-x - t9602
-rwxr-xr-x 1117 t9603-cvsimport-patchsets.sh
drwxr-xr-x - t9603
-rwxr-xr-x 1424 t9700-perl-git.sh
drwxr-xr-x - t9700
-rw-r--r-- 23462 test-lib.sh
-rw-r--r-- 5660 test4012.png
-rw-r--r-- 5660 test9200a.png
-rw-r--r-- 275 test9200b.png
drwxr-xr-x - valgrind