Skip to main content

Browse the archive

Revision 2a6f08ac1f6949ed0072aed3240bc04d80051851 authored by Jeff King on 16 August 2011, 00:13:07 UTC, committed by Junio C Hamano on 16 August 2011, 18:15:41 UTC 
am: refresh the index at start and --resolved
 
If a file is unchanged but stat-dirty, we may erroneously
fail to apply patches, thinking that they conflict with a
dirty working tree.

This patch adds a call to "update-index --refresh". It comes
as late as possible, so that we don't bother with it for
thinks like "git rebase --abort", or when mbox-splitting
fails. However, it does come before we actually start
applying patches, meaning we will only call it once when we
start applying patches (or any time we return to "am" after
having resolved conflicts), and not once per patch.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 0906f6e
History
File Mode Size
lib-httpd
t1509
t3900
t4013
t4020
t4034
t4100
t4101
t4109
t4110
t4135
t4252
t5100
t5515
t7004
t7500
t8005
t9110
t9111
t9115
t9121
t9126
t9135
t9136
t9150
t9151
t9153
t9154
t9601
t9602
t9603
t9700
valgrind
.gitattributes -rw-r--r-- 36 bytes
.gitignore -rw-r--r-- 40 bytes
Makefile -rw-r--r-- 2.8 KB
README -rw-r--r-- 24.4 KB
aggregate-results.sh -rwxr-xr-x 787 bytes
annotate-tests.sh -rw-r--r-- 3.9 KB
diff-lib.sh -rw-r--r-- 1.3 KB
gitweb-lib.sh -rw-r--r-- 2.8 KB
harness -rwxr-xr-x 508 bytes
lib-cvs.sh -rw-r--r-- 1.6 KB
lib-git-svn.sh -rw-r--r-- 4.0 KB
lib-httpd.sh -rw-r--r-- 3.6 KB
lib-pager.sh -rw-r--r-- 270 bytes
lib-patch-mode.sh -rw-r--r-- 656 bytes
lib-prereq-FILEMODE.sh -rw-r--r-- 198 bytes
lib-read-tree-m-3way.sh -rw-r--r-- 4.1 KB
lib-read-tree.sh -rw-r--r-- 1.3 KB
lib-rebase.sh -rw-r--r-- 1.9 KB
lib-t6000.sh -rw-r--r-- 2.6 KB
lib-terminal.sh -rw-r--r-- 777 bytes
t0000-basic.sh -rwxr-xr-x 15.4 KB
t0001-init.sh -rwxr-xr-x 9.2 KB
t0002-gitfile.sh -rwxr-xr-x 1.9 KB
t0003-attributes.sh -rwxr-xr-x 2.6 KB
t0004-unwritable.sh -rwxr-xr-x 1.2 KB
t0005-signals.sh -rwxr-xr-x 341 bytes
t0006-date.sh -rwxr-xr-x 2.5 KB
t0010-racy-git.sh -rwxr-xr-x 609 bytes
t0020-crlf.sh -rwxr-xr-x 10.5 KB
t0021-conversion.sh -rwxr-xr-x 3.9 KB
t0022-crlf-rename.sh -rwxr-xr-x 584 bytes
t0023-crlf-am.sh -rwxr-xr-x 776 bytes
t0024-crlf-archive.sh -rwxr-xr-x 776 bytes
t0025-crlf-auto.sh -rwxr-xr-x 3.7 KB
t0026-eol-config.sh -rwxr-xr-x 1.7 KB
t0030-stripspace.sh -rwxr-xr-x 12.5 KB
t0040-parse-options.sh -rwxr-xr-x 6.7 KB
t0050-filesystem.sh -rwxr-xr-x 3.0 KB
t0055-beyond-symlinks.sh -rwxr-xr-x 487 bytes
t0060-path-utils.sh -rwxr-xr-x 3.7 KB
t0061-run-command.sh -rwxr-xr-x 744 bytes
t0070-fundamental.sh -rwxr-xr-x 660 bytes
t0080-vcs-svn.sh -rwxr-xr-x 1.8 KB
t0081-line-buffer.sh -rwxr-xr-x 1.6 KB
t0100-previous.sh -rwxr-xr-x 1.2 KB
t0101-at-syntax.sh -rwxr-xr-x 874 bytes
t0201-gettext-fallbacks.sh -rwxr-xr-x 1.7 KB
t1000-read-tree-m-3way.sh -rwxr-xr-x 16.6 KB
t1001-read-tree-m-2way.sh -rwxr-xr-x 12.1 KB
t1002-read-tree-m-u-2way.sh -rwxr-xr-x 11.5 KB
t1003-read-tree-prefix.sh -rwxr-xr-x 412 bytes
t1004-read-tree-m-u-wf.sh -rwxr-xr-x 5.6 KB
t1005-read-tree-reset.sh -rwxr-xr-x 2.0 KB
t1006-cat-file.sh -rwxr-xr-x 6.2 KB
t1007-hash-object.sh -rwxr-xr-x 5.3 KB
t1008-read-tree-overlay.sh -rwxr-xr-x 584 bytes
t1009-read-tree-new-index.sh -rwxr-xr-x 427 bytes
t1010-mktree.sh -rwxr-xr-x 1.7 KB
t1011-read-tree-sparse-checkout.sh -rwxr-xr-x 5.7 KB
t1012-read-tree-df.sh -rwxr-xr-x 1.9 KB
t1020-subdirectory.sh -rwxr-xr-x 3.4 KB
t1021-rerere-in-workdir.sh -rwxr-xr-x 1.3 KB
t1050-large.sh -rwxr-xr-x 678 bytes
t1100-commit-tree-options.sh -rwxr-xr-x 1.1 KB
t1200-tutorial.sh -rwxr-xr-x 6.3 KB
t1300-repo-config.sh -rwxr-xr-x 18.4 KB
t1301-shared-repo.sh -rwxr-xr-x 3.4 KB
t1302-repo-version.sh -rwxr-xr-x 1.3 KB
t1303-wacky-config.sh -rwxr-xr-x 1012 bytes
t1304-default-acl.sh -rwxr-xr-x 1.6 KB
t1400-update-ref.sh -rwxr-xr-x 9.0 KB
t1401-symbolic-ref.sh -rwxr-xr-x 930 bytes
t1402-check-ref-format.sh -rwxr-xr-x 2.0 KB
t1410-reflog.sh -rwxr-xr-x 4.9 KB
t1411-reflog-show.sh -rwxr-xr-x 2.2 KB
t1412-reflog-loop.sh -rwxr-xr-x 775 bytes
t1420-lost-found.sh -rwxr-xr-x 749 bytes
t1450-fsck.sh -rwxr-xr-x 4.1 KB
t1500-rev-parse.sh -rwxr-xr-x 2.1 KB
t1501-worktree.sh -rwxr-xr-x 8.0 KB
t1502-rev-parse-parseopt.sh -rwxr-xr-x 2.6 KB
t1503-rev-parse-verify.sh -rwxr-xr-x 3.6 KB
t1504-ceiling-dirs.sh -rwxr-xr-x 3.6 KB
t1505-rev-parse-last.sh -rwxr-xr-x 1.0 KB
t1506-rev-parse-diagnosis.sh -rwxr-xr-x 5.3 KB
t1507-rev-parse-upstream.sh -rwxr-xr-x 3.3 KB
t1508-at-combinations.sh -rwxr-xr-x 1.1 KB
t1509-root-worktree.sh -rwxr-xr-x 5.8 KB
t1510-repo-setup.sh -rwxr-xr-x 24.6 KB
t1511-rev-parse-caret.sh -rwxr-xr-x 1.8 KB
t2000-checkout-cache-clash.sh -rwxr-xr-x 1.4 KB
t2001-checkout-cache-clash.sh -rwxr-xr-x 2.4 KB
t2002-checkout-cache-u.sh -rwxr-xr-x 741 bytes
t2003-checkout-cache-mkdir.sh -rwxr-xr-x 2.6 KB
t2004-checkout-cache-temp.sh -rwxr-xr-x 5.5 KB
t2005-checkout-index-symlinks.sh -rwxr-xr-x 680 bytes
t2006-checkout-index-basic.sh -rwxr-xr-x 454 bytes
t2007-checkout-symlink.sh -rwxr-xr-x 973 bytes
t2008-checkout-subdir.sh -rwxr-xr-x 1.9 KB
t2009-checkout-statinfo.sh -rwxr-xr-x 921 bytes
t2010-checkout-ambiguous.sh -rwxr-xr-x 1.1 KB
t2011-checkout-invalid-head.sh -rwxr-xr-x 440 bytes
t2012-checkout-last.sh -rwxr-xr-x 2.7 KB
t2013-checkout-submodule.sh -rwxr-xr-x 1.8 KB
t2014-switch.sh -rwxr-xr-x 445 bytes
t2015-checkout-unborn.sh -rwxr-xr-x 881 bytes
t2016-checkout-patch.sh -rwxr-xr-x 3.3 KB
t2017-checkout-orphan.sh -rwxr-xr-x 3.5 KB
t2018-checkout-branch.sh -rwxr-xr-x 4.3 KB
t2019-checkout-ambiguous-ref.sh -rwxr-xr-x 1.5 KB
t2020-checkout-detach.sh -rwxr-xr-x 3.2 KB
t2021-checkout-overwrite.sh -rwxr-xr-x 1.0 KB
t2030-unresolve-info.sh -rwxr-xr-x 4.3 KB
t2050-git-dir-relative.sh -rwxr-xr-x 1.3 KB
t2100-update-cache-badpath.sh -rwxr-xr-x 1.2 KB
t2101-update-index-reupdate.sh -rwxr-xr-x 2.1 KB
t2102-update-index-symlinks.sh -rwxr-xr-x 804 bytes
t2103-update-index-ignore-missing.sh -rwxr-xr-x 2.0 KB
t2104-update-index-skip-worktree.sh -rwxr-xr-x 1.1 KB
t2105-update-index-gitfile.sh -rwxr-xr-x 700 bytes
t2106-update-index-assume-unchanged.sh -rwxr-xr-x 496 bytes
t2107-update-index-basic.sh -rwxr-xr-x 670 bytes
t2200-add-update.sh -rwxr-xr-x 3.6 KB
t2201-add-update-typechange.sh -rwxr-xr-x 2.9 KB
t2202-add-addremove.sh -rwxr-xr-x 749 bytes
t2203-add-intent.sh -rwxr-xr-x 1.3 KB
t2204-add-ignored.sh -rwxr-xr-x 1.7 KB
t2300-cd-to-toplevel.sh -rwxr-xr-x 754 bytes
t3000-ls-files-others.sh -rwxr-xr-x 1.4 KB
t3001-ls-files-others-exclude.sh -rwxr-xr-x 3.7 KB
t3002-ls-files-dashpath.sh -rwxr-xr-x 1.2 KB
t3003-ls-files-exclude.sh -rwxr-xr-x 830 bytes
t3004-ls-files-basic.sh -rwxr-xr-x 780 bytes
t3010-ls-files-killed-modified.sh -rwxr-xr-x 2.2 KB
t3020-ls-files-error-unmatch.sh -rwxr-xr-x 704 bytes
t3030-merge-recursive.sh -rwxr-xr-x 12.8 KB
t3031-merge-criscross.sh -rwxr-xr-x 1.7 KB
t3032-merge-recursive-options.sh -rwxr-xr-x 6.1 KB
t3040-subprojects-basic.sh -rwxr-xr-x 2.4 KB
t3050-subprojects-fetch.sh -rwxr-xr-x 1.0 KB
t3060-ls-files-with-tree.sh -rwxr-xr-x 1.6 KB
t3100-ls-tree-restrict.sh -rwxr-xr-x 3.9 KB
t3101-ls-tree-dirname.sh -rwxr-xr-x 5.0 KB
t3102-ls-tree-wildcards.sh -rwxr-xr-x 446 bytes
t3200-branch.sh -rwxr-xr-x 20.3 KB
t3201-branch-contains.sh -rwxr-xr-x 1.5 KB
t3202-show-branch-octopus.sh -rwxr-xr-x 1.3 KB
t3203-branch-output.sh -rwxr-xr-x 1.6 KB
t3210-pack-refs.sh -rwxr-xr-x 3.1 KB
t3300-funny-names.sh -rwxr-xr-x 5.2 KB
t3301-notes.sh -rwxr-xr-x 30.1 KB
t3302-notes-index-expensive.sh -rwxr-xr-x 2.2 KB
t3303-notes-subtrees.sh -rwxr-xr-x 5.0 KB
t3304-notes-mixed.sh -rwxr-xr-x 4.2 KB
t3305-notes-fanout.sh -rwxr-xr-x 1.8 KB
t3306-notes-prune.sh -rwxr-xr-x 2.9 KB
t3307-notes-man.sh -rwxr-xr-x 821 bytes
t3308-notes-merge.sh -rwxr-xr-x 9.1 KB
t3309-notes-merge-auto-resolve.sh -rwxr-xr-x 15.6 KB
t3310-notes-merge-manual-resolve.sh -rwxr-xr-x 15.2 KB
t3311-notes-merge-fanout.sh -rwxr-xr-x 10.0 KB
t3400-rebase.sh -rwxr-xr-x 5.7 KB
t3401-rebase-partial.sh -rwxr-xr-x 1.5 KB
t3402-rebase-merge.sh -rwxr-xr-x 2.9 KB
t3403-rebase-skip.sh -rwxr-xr-x 1.9 KB
t3404-rebase-interactive.sh -rwxr-xr-x 19.8 KB
t3405-rebase-malformed.sh -rwxr-xr-x 844 bytes
t3406-rebase-message.sh -rwxr-xr-x 1.2 KB
t3407-rebase-abort.sh -rwxr-xr-x 2.6 KB
t3408-rebase-multi-line.sh -rwxr-xr-x 725 bytes
t3409-rebase-preserve-merges.sh -rwxr-xr-x 2.8 KB
t3410-rebase-preserve-dropped-merges.sh -rwxr-xr-x 2.0 KB
t3411-rebase-preserve-around-merges.sh -rwxr-xr-x 1.5 KB
t3412-rebase-root.sh -rwxr-xr-x 6.1 KB
t3413-rebase-hook.sh -rwxr-xr-x 3.5 KB
t3414-rebase-preserve-onto.sh -rwxr-xr-x 1.9 KB
t3415-rebase-autosquash.sh -rwxr-xr-x 5.1 KB
t3416-rebase-onto-threedots.sh -rwxr-xr-x 2.3 KB
t3417-rebase-whitespace-fix.sh -rwxr-xr-x 1.9 KB
t3418-rebase-continue.sh -rwxr-xr-x 2.4 KB
t3419-rebase-patch-id.sh -rwxr-xr-x 1.9 KB
t3500-cherry.sh -rwxr-xr-x 1.5 KB
t3501-revert-cherry-pick.sh -rwxr-xr-x 2.1 KB
t3502-cherry-pick-merge.sh -rwxr-xr-x 2.1 KB
t3503-cherry-pick-root.sh -rwxr-xr-x 917 bytes
t3504-cherry-pick-rerere.sh -rwxr-xr-x 988 bytes
t3505-cherry-pick-empty.sh -rwxr-xr-x 837 bytes
t3506-cherry-pick-ff.sh -rwxr-xr-x 2.6 KB
t3507-cherry-pick-conflict.sh -rwxr-xr-x 5.9 KB
t3508-cherry-pick-many-commits.sh -rwxr-xr-x 3.9 KB
t3509-cherry-pick-merge-df.sh -rwxr-xr-x 2.4 KB
t3600-rm.sh -rwxr-xr-x 6.8 KB
t3700-add.sh -rwxr-xr-x 7.9 KB
t3701-add-interactive.sh -rwxr-xr-x 6.7 KB
t3702-add-edit.sh -rwxr-xr-x 3.1 KB
t3703-add-magic-pathspec.sh -rwxr-xr-x 1.1 KB
t3800-mktag.sh -rwxr-xr-x 7.8 KB
t3900-i18n-commit.sh -rwxr-xr-x 3.6 KB
t3901-8859-1.txt -rwxr-xr-x 153 bytes
t3901-i18n-patch.sh -rwxr-xr-x 6.3 KB
t3901-utf8.txt -rwxr-xr-x 155 bytes
t3902-quoted.sh -rwxr-xr-x 3.0 KB
t3903-stash.sh -rwxr-xr-x 14.4 KB
t3904-stash-patch.sh -rwxr-xr-x 1.7 KB
t4000-diff-format.sh -rwxr-xr-x 1.0 KB
t4001-diff-rename.sh -rwxr-xr-x 2.1 KB
t4002-diff-basic.sh -rwxr-xr-x 15.1 KB
t4003-diff-rename-1.sh -rwxr-xr-x 4.1 KB
t4004-diff-rename-symlink.sh -rwxr-xr-x 1.6 KB
t4005-diff-rename-2.sh -rwxr-xr-x 2.9 KB
t4006-diff-mode.sh -rwxr-xr-x 561 bytes
t4007-rename-3.sh -rwxr-xr-x 2.9 KB
t4008-diff-break-rewrite.sh -rwxr-xr-x 6.1 KB
t4009-diff-rename-4.sh -rwxr-xr-x 2.9 KB
t4010-diff-pathspec.sh -rwxr-xr-x 2.9 KB
t4011-diff-symlink.sh -rwxr-xr-x 2.6 KB
t4012-diff-binary.sh -rwxr-xr-x 2.5 KB
t4013-diff-various.sh -rwxr-xr-x 9.1 KB
t4014-format-patch.sh -rwxr-xr-x 22.9 KB
t4015-diff-whitespace.sh -rwxr-xr-x 11.8 KB
t4016-diff-quote.sh -rwxr-xr-x 2.0 KB
t4017-diff-retval.sh -rwxr-xr-x 3.5 KB
t4018-diff-funcname.sh -rwxr-xr-x 4.1 KB
t4019-diff-wserror.sh -rwxr-xr-x 6.6 KB
t4020-diff-external.sh -rwxr-xr-x 3.6 KB
t4021-format-patch-numbered.sh -rwxr-xr-x 2.3 KB
t4022-diff-rewrite.sh -rwxr-xr-x 1.3 KB
t4023-diff-rename-typechange.sh -rwxr-xr-x 1.7 KB
t4024-diff-optimize-common.sh -rwxr-xr-x 2.7 KB
t4025-hunk-header.sh -rwxr-xr-x 665 bytes
t4026-color.sh -rwxr-xr-x 1.8 KB
t4027-diff-submodule.sh -rwxr-xr-x 10.7 KB
t4028-format-patch-mime-headers.sh -rwxr-xr-x 727 bytes
t4029-diff-trailing-space.sh -rwxr-xr-x 792 bytes
t4030-diff-textconv.sh -rwxr-xr-x 2.7 KB
t4031-diff-rewrite-binary.sh -rwxr-xr-x 1.5 KB
t4032-diff-inter-hunk-context.sh -rwxr-xr-x 1.2 KB
t4033-diff-patience.sh -rwxr-xr-x 2.0 KB
t4034-diff-words.sh -rwxr-xr-x 7.0 KB
t4035-diff-quiet.sh -rwxr-xr-x 2.1 KB
t4036-format-patch-signer-mime.sh -rwxr-xr-x 935 bytes
t4037-diff-r-t-dirs.sh -rwxr-xr-x 658 bytes
t4038-diff-combined.sh -rwxr-xr-x 1.7 KB
t4039-diff-assume-unchanged.sh -rwxr-xr-x 724 bytes
t4040-whitespace-status.sh -rwxr-xr-x 1.8 KB
t4041-diff-submodule-option.sh -rwxr-xr-x 11.3 KB
t4042-diff-textconv-caching.sh -rwxr-xr-x 2.3 KB
t4043-diff-rename-binary.sh -rwxr-xr-x 878 bytes
t4044-diff-index-unique-abbrev.sh -rwxr-xr-x 767 bytes
t4045-diff-relative.sh -rwxr-xr-x 1.2 KB
t4046-diff-unmerged.sh -rwxr-xr-x 2.1 KB
t4047-diff-dirstat.sh -rwxr-xr-x 32.3 KB
t4100-apply-stat.sh -rwxr-xr-x 797 bytes
t4101-apply-nonl.sh -rwxr-xr-x 562 bytes
t4102-apply-rename.sh -rwxr-xr-x 1.1 KB
t4103-apply-binary.sh -rwxr-xr-x 3.8 KB
t4104-apply-boundary.sh -rwxr-xr-x 2.9 KB
t4105-apply-fuzz.sh -rwxr-xr-x 1.1 KB
t4106-apply-stdin.sh -rwxr-xr-x 532 bytes
t4107-apply-ignore-whitespace.sh -rwxr-xr-x 3.7 KB
t4109-apply-multifrag.sh -rwxr-xr-x 808 bytes
t4110-apply-scan.sh -rwxr-xr-x 522 bytes
t4111-apply-subdir.sh -rwxr-xr-x 2.9 KB
t4112-apply-renames.sh -rwxr-xr-x 3.2 KB
t4113-apply-ending.sh -rwxr-xr-x 691 bytes
t4114-apply-typechange.sh -rwxr-xr-x 3.1 KB
t4115-apply-symlink.sh -rwxr-xr-x 800 bytes
t4116-apply-reverse.sh -rwxr-xr-x 1.7 KB
t4117-apply-reject.sh -rwxr-xr-x 2.5 KB
t4118-apply-empty-context.sh -rwxr-xr-x 960 bytes
t4119-apply-config.sh -rwxr-xr-x 3.0 KB
t4120-apply-popt.sh -rwxr-xr-x 1.9 KB
t4121-apply-diffs.sh -rwxr-xr-x 556 bytes
t4122-apply-symlink-inside.sh -rwxr-xr-x 1.0 KB
t4123-apply-shrink.sh -rwxr-xr-x 617 bytes
t4124-apply-ws-rule.sh -rwxr-xr-x 11.6 KB
t4125-apply-ws-fuzz.sh -rwxr-xr-x 2.2 KB
t4126-apply-empty.sh -rwxr-xr-x 1.0 KB
t4127-apply-same-fn.sh -rwxr-xr-x 2.0 KB
t4128-apply-root.sh -rwxr-xr-x 2.4 KB
t4129-apply-samemode.sh -rwxr-xr-x 1.3 KB
t4130-apply-criss-cross-rename.sh -rwxr-xr-x 1.2 KB
t4131-apply-fake-ancestor.sh -rwxr-xr-x 838 bytes
t4132-apply-removal.sh -rwxr-xr-x 2.5 KB
t4133-apply-filenames.sh -rwxr-xr-x 696 bytes
t4134-apply-submodule.sh -rwxr-xr-x 780 bytes
t4135-apply-weird-filenames.sh -rwxr-xr-x 2.3 KB
t4150-am.sh -rwxr-xr-x 12.8 KB
t4151-am-abort.sh -rwxr-xr-x 1.6 KB
t4152-am-subjects.sh -rwxr-xr-x 2.0 KB
t4200-rerere.sh -rwxr-xr-x 9.6 KB
t4201-shortlog.sh -rwxr-xr-x 3.8 KB
t4202-log.sh -rwxr-xr-x 10.8 KB
t4203-mailmap.sh -rwxr-xr-x 6.3 KB
t4204-patch-id.sh -rwxr-xr-x 2.2 KB
t4205-log-pretty-formats.sh -rwxr-xr-x 1.9 KB
t4206-log-follow-harder-copies.sh -rwxr-xr-x 960 bytes
t4207-log-decoration-colors.sh -rwxr-xr-x 1.8 KB
t4208-log-magic-pathspec.sh -rwxr-xr-x 680 bytes
t4252-am-options.sh -rwxr-xr-x 1.9 KB
t4253-am-keep-cr-dos.sh -rwxr-xr-x 2.3 KB
t4300-merge-tree.sh -rwxr-xr-x 6.4 KB
t5000-tar-tree.sh -rwxr-xr-x 6.9 KB
t5001-archive-attr.sh -rwxr-xr-x 2.6 KB
t5100-mailinfo.sh -rwxr-xr-x 2.3 KB
t5150-request-pull.sh -rwxr-xr-x 4.8 KB
t5300-pack-object.sh -rwxr-xr-x 10.8 KB
t5301-sliding-window.sh -rwxr-xr-x 1.7 KB
t5302-pack-index.sh -rwxr-xr-x 8.0 KB
t5303-pack-corruption-resilience.sh -rwxr-xr-x 9.9 KB
t5304-prune.sh -rwxr-xr-x 4.0 KB
t5305-include-tag.sh -rwxr-xr-x 1.8 KB
t5306-pack-nobase.sh -rwxr-xr-x 2.0 KB
t5307-pack-missing-commit.sh -rwxr-xr-x 809 bytes
t5400-send-pack.sh -rwxr-xr-x 5.7 KB
t5401-update-hooks.sh -rwxr-xr-x 3.7 KB
t5402-post-merge-hook.sh -rwxr-xr-x 1.5 KB
t5403-post-checkout-hook.sh -rwxr-xr-x 2.9 KB
t5404-tracking-branches.sh -rwxr-xr-x 1.4 KB
t5405-send-pack-rewind.sh -rwxr-xr-x 656 bytes
t5406-remote-rejects.sh -rwxr-xr-x 522 bytes
t5407-post-rewrite-hook.sh -rwxr-xr-x 4.9 KB
t5500-fetch-pack.sh -rwxr-xr-x 4.5 KB
t5501-fetch-push-alternates.sh -rwxr-xr-x 1.3 KB
t5502-quickfetch.sh -rwxr-xr-x 2.5 KB
t5503-tagfollow.sh -rwxr-xr-x 3.2 KB
t5505-remote.sh -rwxr-xr-x 25.4 KB
t5506-remote-groups.sh -rwxr-xr-x 2.0 KB
t5510-fetch.sh -rwxr-xr-x 9.2 KB
t5511-refspec.sh -rwxr-xr-x 3.0 KB
t5512-ls-remote.sh -rwxr-xr-x 3.2 KB
t5513-fetch-track.sh -rwxr-xr-x 555 bytes
t5514-fetch-multiple.sh -rwxr-xr-x 3.0 KB
t5515-fetch-merge-logic.sh -rwxr-xr-x 4.5 KB
t5516-fetch-push.sh -rwxr-xr-x 18.4 KB
t5517-push-mirror.sh -rwxr-xr-x 6.3 KB
t5518-fetch-exit-status.sh -rwxr-xr-x 508 bytes
t5519-push-alternates.sh -rwxr-xr-x 3.3 KB
t5520-pull.sh -rwxr-xr-x 5.5 KB
t5521-pull-options.sh -rwxr-xr-x 1.8 KB
t5522-pull-symlink.sh -rwxr-xr-x 2.1 KB
t5523-push-upstream.sh -rwxr-xr-x 2.7 KB
t5524-pull-msg.sh -rwxr-xr-x 571 bytes
t5525-fetch-tagopt.sh -rwxr-xr-x 944 bytes
t5526-fetch-submodules.sh -rwxr-xr-x 12.6 KB
t5530-upload-pack-error.sh -rwxr-xr-x 2.2 KB
t5531-deep-submodule-push.sh -rwxr-xr-x 531 bytes
t5532-fetch-proxy.sh -rwxr-xr-x 838 bytes
t5540-http-push.sh -rwxr-xr-x 3.7 KB
t5541-http-push.sh -rwxr-xr-x 4.7 KB
t5550-http-fetch.sh -rwxr-xr-x 3.4 KB
t5551-http-fetch.sh -rwxr-xr-x 2.6 KB
t5560-http-backend-noserver.sh -rwxr-xr-x 1.5 KB
t5561-http-backend.sh -rwxr-xr-x 4.3 KB
t556x_common -rwxr-xr-x 3.3 KB
t5600-clone-fail-cleanup.sh -rwxr-xr-x 1.1 KB
t5601-clone.sh -rwxr-xr-x 4.5 KB
t5602-clone-remote-exec.sh -rwxr-xr-x 861 bytes
t5700-clone-reference.sh -rwxr-xr-x 3.1 KB
t5701-clone-local.sh -rwxr-xr-x 3.4 KB
t5702-clone-options.sh -rwxr-xr-x 627 bytes
t5704-bundle.sh -rwxr-xr-x 1.0 KB
t5705-clone-2gb.sh -rwxr-xr-x 1.2 KB
t5706-clone-branch.sh -rwxr-xr-x 1.4 KB
t5710-info-alternate.sh -rwxr-xr-x 2.3 KB
t5800-remote-helpers.sh -rwxr-xr-x 1.8 KB
t6000-rev-list-misc.sh -rwxr-xr-x 1.1 KB
t6001-rev-list-graft.sh -rwxr-xr-x 2.3 KB
t6002-rev-list-bisect.sh -rwxr-xr-x 8.2 KB
t6003-rev-list-topo-order.sh -rwxr-xr-x 8.5 KB
t6004-rev-list-path-optim.sh -rwxr-xr-x 2.2 KB
t6005-rev-list-count.sh -rwxr-xr-x 1.7 KB
t6006-rev-list-format.sh -rwxr-xr-x 7.5 KB
t6007-rev-list-cherry-pick-file.sh -rwxr-xr-x 4.4 KB
t6008-rev-list-submodule.sh -rwxr-xr-x 812 bytes
t6009-rev-list-parent.sh -rwxr-xr-x 3.4 KB
t6010-merge-base.sh -rwxr-xr-x 5.2 KB
t6011-rev-list-with-bad-commit.sh -rwxr-xr-x 1.3 KB
t6012-rev-list-simplify.sh -rwxr-xr-x 1.8 KB
t6013-rev-list-reverse-parents.sh -rwxr-xr-x 958 bytes
t6014-rev-list-all.sh -rwxr-xr-x 498 bytes
t6015-rev-list-show-all-parents.sh -rwxr-xr-x 862 bytes
t6016-rev-list-graph-simplify-history.sh -rwxr-xr-x 7.6 KB
t6017-rev-list-stdin.sh -rwxr-xr-x 1.3 KB
t6018-rev-list-glob.sh -rwxr-xr-x 5.8 KB
t6019-rev-list-ancestry-path.sh -rwxr-xr-x 1.5 KB
t6020-merge-df.sh -rwxr-xr-x 2.0 KB
t6021-merge-criss-cross.sh -rwxr-xr-x 1.3 KB
t6022-merge-rename.sh -rwxr-xr-x 15.6 KB
t6023-merge-file.sh -rwxr-xr-x 6.5 KB
t6024-recursive-merge.sh -rwxr-xr-x 2.9 KB
t6025-merge-symlinks.sh -rwxr-xr-x 1.5 KB
t6026-merge-attr.sh -rwxr-xr-x 3.4 KB
t6027-merge-binary.sh -rwxr-xr-x 1.1 KB
t6028-merge-up-to-date.sh -rwxr-xr-x 1.4 KB
t6029-merge-subtree.sh -rwxr-xr-x 2.8 KB
t6030-bisect-porcelain.sh -rwxr-xr-x 17.9 KB
t6031-merge-recursive.sh -rwxr-xr-x 1.8 KB
t6032-merge-large-rename.sh -rwxr-xr-x 2.0 KB
t6033-merge-crlf.sh -rwxr-xr-x 903 bytes
t6034-merge-rename-nocruft.sh -rwxr-xr-x 3.6 KB
t6035-merge-dir-to-symlink.sh -rwxr-xr-x 3.7 KB
t6036-recursive-corner-cases.sh -rwxr-xr-x 5.3 KB
t6037-merge-ours-theirs.sh -rwxr-xr-x 1.5 KB
t6038-merge-text-auto.sh -rwxr-xr-x 3.8 KB
t6040-tracking-info.sh -rwxr-xr-x 2.6 KB
t6050-replace.sh -rwxr-xr-x 7.5 KB
t6060-merge-index.sh -rwxr-xr-x 2.2 KB
t6101-rev-parse-parents.sh -rwxr-xr-x 2.2 KB
t6110-rev-list-sparse.sh -rwxr-xr-x 384 bytes
t6120-describe.sh -rwxr-xr-x 3.7 KB
t6200-fmt-merge-msg.sh -rwxr-xr-x 8.9 KB
t6300-for-each-ref.sh -rwxr-xr-x 10.9 KB
t6500-gc.sh -rwxr-xr-x 499 bytes
t7001-mv.sh -rwxr-xr-x 6.0 KB
t7003-filter-branch.sh -rwxr-xr-x 9.7 KB
t7004-tag.sh -rwxr-xr-x 34.5 KB
t7005-editor.sh -rwxr-xr-x 2.4 KB
t7006-pager.sh -rwxr-xr-x 10.1 KB
t7007-show.sh -rwxr-xr-x 405 bytes
t7008-grep-binary.sh -rwxr-xr-x 1.9 KB
t7010-setup.sh -rwxr-xr-x 2.7 KB
t7011-skip-worktree-reading.sh -rwxr-xr-x 3.2 KB
t7012-skip-worktree-writing.sh -rwxr-xr-x 3.3 KB
t7060-wtstatus.sh -rwxr-xr-x 2.5 KB
t7101-reset.sh -rwxr-xr-x 1.5 KB
t7102-reset.sh -rwxr-xr-x 11.2 KB
t7103-reset-bare.sh -rwxr-xr-x 1.5 KB
t7104-reset.sh -rwxr-xr-x 825 bytes
t7105-reset-patch.sh -rwxr-xr-x 1.7 KB
t7110-reset-merge.sh -rwxr-xr-x 9.8 KB
t7111-reset-table.sh -rwxr-xr-x 2.5 KB
t7201-co.sh -rwxr-xr-x 14.9 KB
t7300-clean.sh -rwxr-xr-x 9.2 KB
t7400-submodule-basic.sh -rwxr-xr-x 10.7 KB
t7401-submodule-summary.sh -rwxr-xr-x 4.8 KB
t7402-submodule-rebase.sh -rwxr-xr-x 2.0 KB
t7403-submodule-sync.sh -rwxr-xr-x 1.6 KB
t7405-submodule-merge.sh -rwxr-xr-x 5.0 KB
t7406-submodule-update.sh -rwxr-xr-x 6.5 KB
t7407-submodule-foreach.sh -rwxr-xr-x 7.2 KB
t7408-submodule-reference.sh -rwxr-xr-x 1.8 KB
t7500-commit.sh -rwxr-xr-x 8.5 KB
t7501-commit.sh -rwxr-xr-x 10.3 KB
t7502-commit.sh -rwxr-xr-x 10.4 KB
t7503-pre-commit-hook.sh -rwxr-xr-x 1.4 KB
t7504-commit-msg-hook.sh -rwxr-xr-x 4.2 KB
t7505-prepare-commit-msg-hook.sh -rwxr-xr-x 3.4 KB
t7506-status-submodule.sh -rwxr-xr-x 7.0 KB
t7507-commit-verbose.sh -rwxr-xr-x 1.3 KB
t7508-status.sh -rwxr-xr-x 27.6 KB
t7509-commit.sh -rwxr-xr-x 5.1 KB
t7600-merge.sh -rwxr-xr-x 15.7 KB
t7601-merge-pull-config.sh -rwxr-xr-x 3.6 KB
t7602-merge-octopus-many.sh -rwxr-xr-x 2.0 KB
t7603-merge-reduce-heads.sh -rwxr-xr-x 2.3 KB
t7604-merge-custom-message.sh -rwxr-xr-x 1021 bytes
t7605-merge-resolve.sh -rwxr-xr-x 1002 bytes
t7606-merge-custom.sh -rwxr-xr-x 2.0 KB
t7607-merge-overwrite.sh -rwxr-xr-x 4.3 KB
t7608-merge-messages.sh -rwxr-xr-x 1.5 KB
t7609-merge-co-error-msgs.sh -rwxr-xr-x 3.0 KB
t7610-mergetool.sh -rwxr-xr-x 14.8 KB
t7611-merge-abort.sh -rwxr-xr-x 9.4 KB
t7700-repack.sh -rwxr-xr-x 5.2 KB
t7701-repack-unpack-unreachable.sh -rwxr-xr-x 2.7 KB
t7800-difftool.sh -rwxr-xr-x 6.8 KB
t7810-grep.sh -rwxr-xr-x 15.6 KB
t7811-grep-open.sh -rwxr-xr-x 3.2 KB
t8001-annotate.sh -rwxr-xr-x 345 bytes
t8002-blame.sh -rwxr-xr-x 370 bytes
t8003-blame-corner-cases.sh -rwxr-xr-x 3.5 KB
t8004-blame-with-conflicts.sh -rwxr-xr-x 1.5 KB
t8005-blame-i18n.sh -rwxr-xr-x 2.0 KB
t8006-blame-textconv.sh -rwxr-xr-x 4.0 KB
t8007-cat-file-textconv.sh -rwxr-xr-x 2.3 KB
t8008-blame-formats.sh -rwxr-xr-x 1.6 KB
t9001-send-email.sh -rwxr-xr-x 32.9 KB
t9010-svn-fe.sh -rwxr-xr-x 16.5 KB
t9100-git-svn-basic.sh -rwxr-xr-x 8.7 KB
t9101-git-svn-props.sh -rwxr-xr-x 5.8 KB
t9102-git-svn-deep-rmdir.sh -rwxr-xr-x 800 bytes
t9103-git-svn-tracked-directory-removed.sh -rwxr-xr-x 923 bytes
t9104-git-svn-follow-parent.sh -rwxr-xr-x 7.7 KB
t9105-git-svn-commit-diff.sh -rwxr-xr-x 1.2 KB
t9106-git-svn-commit-diff-clobber.sh -rwxr-xr-x 2.6 KB
t9107-git-svn-migrate.sh -rwxr-xr-x 4.8 KB
t9108-git-svn-glob.sh -rwxr-xr-x 3.8 KB
t9109-git-svn-multi-glob.sh -rwxr-xr-x 5.5 KB
t9110-git-svn-use-svm-props.sh -rwxr-xr-x 1.8 KB
t9111-git-svn-use-svnsync-props.sh -rwxr-xr-x 1.6 KB
t9112-git-svn-md5less-file.sh -rwxr-xr-x 922 bytes
t9113-git-svn-dcommit-new-file.sh -rwxr-xr-x 940 bytes
t9114-git-svn-dcommit-merge.sh -rwxr-xr-x 2.7 KB
t9115-git-svn-dcommit-funky-renames.sh -rwxr-xr-x 2.1 KB
t9116-git-svn-log.sh -rwxr-xr-x 4.5 KB
t9117-git-svn-init-clone.sh -rwxr-xr-x 1.2 KB
t9118-git-svn-funky-branch-names.sh -rwxr-xr-x 2.4 KB
t9119-git-svn-info.sh -rwxr-xr-x 10.4 KB
t9120-git-svn-clone-with-percent-escapes.sh -rwxr-xr-x 1.9 KB
t9121-git-svn-fetch-renamed-dir.sh -rwxr-xr-x 391 bytes
t9122-git-svn-author.sh -rwxr-xr-x 1.9 KB
t9123-git-svn-rebuild-with-rewriteroot.sh -rwxr-xr-x 597 bytes
t9124-git-svn-dcommit-auto-props.sh -rwxr-xr-x 2.5 KB
t9125-git-svn-multi-glob-branch-names.sh -rwxr-xr-x 1.1 KB
t9126-git-svn-follow-deleted-readded-directory.sh -rwxr-xr-x 500 bytes
t9127-git-svn-partial-rebuild.sh -rwxr-xr-x 1.2 KB
t9128-git-svn-cmd-branch.sh -rwxr-xr-x 2.0 KB
t9129-git-svn-i18n-commitencoding.sh -rwxr-xr-x 2.1 KB
t9130-git-svn-authors-file.sh -rwxr-xr-x 3.0 KB
t9131-git-svn-empty-symlink.sh -rwxr-xr-x 2.3 KB
t9132-git-svn-broken-symlink.sh -rwxr-xr-x 1.5 KB
t9133-git-svn-nested-git-repo.sh -rwxr-xr-x 1.9 KB
t9134-git-svn-ignore-paths.sh -rwxr-xr-x 3.5 KB
t9135-git-svn-moved-branch-empty-file.sh -rwxr-xr-x 434 bytes
t9136-git-svn-recreated-branch-empty-file.sh -rwxr-xr-x 291 bytes
t9137-git-svn-dcommit-clobber-series.sh -rwxr-xr-x 1.7 KB
t9138-git-svn-authors-prog.sh -rwxr-xr-x 2.0 KB
t9139-git-svn-non-utf8-commitencoding.sh -rwxr-xr-x 904 bytes
t9140-git-svn-reset.sh -rwxr-xr-x 1.5 KB
t9141-git-svn-multiple-branches.sh -rwxr-xr-x 3.9 KB
t9142-git-svn-shallow-clone.sh -rwxr-xr-x 645 bytes
t9143-git-svn-gc.sh -rwxr-xr-x 1.4 KB
t9144-git-svn-old-rev_map.sh -rwxr-xr-x 687 bytes
t9145-git-svn-master-branch.sh -rwxr-xr-x 600 bytes
t9146-git-svn-empty-dirs.sh -rwxr-xr-x 2.9 KB
t9150-svk-mergetickets.sh -rwxr-xr-x 561 bytes
t9151-svn-mergeinfo.sh -rwxr-xr-x 1.8 KB
t9152-svn-empty-dirs-after-gc.sh -rwxr-xr-x 739 bytes
t9153-git-svn-rewrite-uuid.sh -rwxr-xr-x 579 bytes
t9154-git-svn-fancy-glob.sh -rwxr-xr-x 1.2 KB
t9155-git-svn-fetch-deleted-tag.sh -rwxr-xr-x 1.3 KB
t9156-git-svn-fetch-deleted-tag-2.sh -rwxr-xr-x 1.4 KB
t9157-git-svn-fetch-merge.sh -rwxr-xr-x 1.4 KB
t9158-git-svn-mergeinfo.sh -rwxr-xr-x 833 bytes
t9159-git-svn-no-parent-mergeinfo.sh -rwxr-xr-x 1.1 KB
t9200-git-cvsexportcommit.sh -rwxr-xr-x 10.5 KB
t9300-fast-import.sh -rwxr-xr-x 50.1 KB
t9301-fast-import-notes.sh -rwxr-xr-x 12.1 KB
t9350-fast-export.sh -rwxr-xr-x 9.3 KB
t9400-git-cvsserver-server.sh -rwxr-xr-x 14.5 KB
t9401-git-cvsserver-crlf.sh -rwxr-xr-x 11.5 KB
t9500-gitweb-standalone-no-errors.sh -rwxr-xr-x 18.2 KB
t9501-gitweb-standalone-http-status.sh -rwxr-xr-x 3.9 KB
t9502-gitweb-standalone-parse-output.sh -rwxr-xr-x 5.5 KB
t9600-cvsimport.sh -rwxr-xr-x 3.1 KB
t9601-cvsimport-vendor-branch.sh -rwxr-xr-x 2.0 KB
t9602-cvsimport-branches-tags.sh -rwxr-xr-x 1.2 KB
t9603-cvsimport-patchsets.sh -rwxr-xr-x 1.1 KB
t9700-perl-git.sh -rwxr-xr-x 1.4 KB
t9800-git-p4.sh -rwxr-xr-x 7.4 KB
test-lib.sh -rw-r--r-- 26.0 KB
test-terminal.perl -rwxr-xr-x 1.6 KB
test4012.png -rw-r--r-- 5.5 KB
test9200a.png -rw-r--r-- 5.5 KB
test9200b.png -rw-r--r-- 275 bytes

README

back to top