Elijah Newren c64432aacd t6423: more involved rules for renaming directories into each other ... Testcases 12b and 12c were both slightly weird; they were marked as having a weird resolution, but with the note that even straightforward simple rules can give weird results when the input is bizarre. However, during optimization work for merge-ort, I discovered a significant speedup that is possible if we add one more fairly straightforward rule: we don't bother doing directory rename detection if there are no new files added to the directory on the other side of the history to be affected by the directory rename. This seems like an obvious and straightforward rule, but there was one funny corner case where directory rename detection could affect only existing files: the funny corner case where two directories are renamed into each other on opposite sides of history. In other words, it only results in a different output for testcases 12b and 12c. Since we already thought testcases 12b and 12c were weird anyway, and because the optimization often has a significant effect on common cases (but is entirely prevented if we can't change how 12b and 12c function), let's add the additional rule and tweak how 12b and 12c work. Split both testcases into two (one where we add no new files, and one where the side that doesn't rename a given directory will add files to it), and mark them with the new expectation. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		2020-10-16 12:29:28 -07:00
..
config	Merge branch 'jk/format-auto-base-when-able'	2020-10-05 14:01:55 -07:00
howto	Merge branch 'js/pu-to-seen'	2020-07-06 22:09:16 -07:00
RelNotes	Git 2.29-rc1	2020-10-08 21:53:26 -07:00
technical	t6423: more involved rules for renaming directories into each other	2020-10-16 12:29:28 -07:00
.gitattributes
.gitignore
asciidoc.conf	Doc: drop support for docbook-xsl before 1.72.0	2020-03-29 09:25:38 -07:00
asciidoctor-extensions.rb
blame-options.txt	blame-options.txt: document --first-parent option	2020-08-06 14:08:10 -07:00
build-docdep.perl
cat-texi.perl
cmd-list.perl	git.txt: add list of guides	2020-08-04 18:34:02 -07:00
CodingGuidelines	Merge branch 'dl/python-2.7-is-the-floor-version'	2020-06-17 21:54:05 -07:00
config.txt	Merge branch 'tb/bloom-improvements'	2020-09-29 14:01:20 -07:00
date-formats.txt	date-formats.txt: fix list continuation	2020-05-18 13:18:56 -07:00
diff-format.txt
diff-generate-patch.txt	git.txt: correct stale 'GIT_EXTERNAL_DIFF' description	2020-09-01 12:17:05 -07:00
diff-options.txt	Merge branch 'dd/diff-customize-index-line-abbrev'	2020-08-31 15:49:46 -07:00
doc-diff
docbook-xsl.css
docbook.xsl
everyday.txto
fetch-options.txt	Merge branch 'ds/maintenance-part-1'	2020-09-25 15:25:38 -07:00
fix-texi.perl
git-add.txt
git-am.txt	Documentation: document am --no-gpg-sign	2020-04-03 11:37:22 -07:00
git-annotate.txt
git-apply.txt	git-apply.txt: update descriptions of --cached, --index	2020-08-20 16:34:37 -07:00
git-archimport.txt
git-archive.txt	archive: add --add-file	2020-09-19 15:56:06 -07:00
git-bisect-lk2009.txt	git-bisect-lk2009: make continuation of list indented	2020-10-08 14:01:15 -07:00
git-bisect.txt	bisect: swap command-line options in documentation	2020-08-28 14:06:06 -07:00
git-blame.txt
git-branch.txt	Doc: prefer more specific file name	2020-09-18 15:41:56 -07:00
git-bugreport.txt	Merge branch 'es/bugreport-shell'	2020-06-08 18:06:28 -07:00
git-bundle.txt	bundle: add new version for use with SHA-256	2020-07-30 09:16:48 -07:00
git-cat-file.txt	cat-file: add missing [=<format>] to usage/synopsis	2020-07-01 15:54:05 -07:00
git-check-attr.txt
git-check-ignore.txt	Merge branch 'en/check-ignore' into maint	2020-03-17 15:02:23 -07:00
git-check-mailmap.txt
git-check-ref-format.txt
git-checkout-index.txt
git-checkout.txt	git-checkout.txt: document -d short option for --detach	2020-09-06 18:53:56 -07:00
git-cherry-pick.txt	cherry-pick/revert: honour --no-gpg-sign in all case	2020-04-03 11:37:22 -07:00
git-cherry.txt
git-citool.txt
git-clean.txt
git-clone.txt	maintenance: replace run_auto_gc()	2020-09-17 11:30:05 -07:00
git-column.txt
git-commit-graph.txt	commit-graph: introduce 'commitGraph.maxNewFilters'	2020-09-18 10:39:22 -07:00
git-commit-tree.txt	Documentation: merge commit-tree --[no-]gpg-sign	2020-04-03 11:37:22 -07:00
git-commit.txt	Documentation: reword commit --no-gpg-sign	2020-04-03 11:37:22 -07:00
git-config.txt
git-count-objects.txt
git-credential-cache--daemon.txt
git-credential-cache.txt
git-credential-store.txt	Merge branch 'cb/credential-store-ignore-bogus-lines'	2020-05-08 14:25:01 -07:00
git-credential.txt	git-credential.txt: use list continuation	2020-05-18 13:19:33 -07:00
git-cvsexportcommit.txt
git-cvsimport.txt
git-cvsserver.txt
git-daemon.txt
git-describe.txt
git-diff-files.txt
git-diff-index.txt
git-diff-tree.txt
git-diff.txt	git-diff.txt: reorder possible usages	2020-07-13 12:47:38 -07:00
git-difftool.txt
git-fast-export.txt	fast-export: allow seeding the anonymized mapping	2020-06-25 14:19:23 -07:00
git-fast-import.txt	fast-import: fix typo in documentation	2020-10-04 12:56:29 -07:00
git-fetch-pack.txt
git-fetch.txt	fetch: allow refspecs specified through stdin	2020-08-18 13:25:05 -07:00
git-filter-branch.txt
git-fmt-merge-msg.txt
git-for-each-ref.txt	Doc: prefer more specific file name	2020-09-18 15:41:56 -07:00
git-format-patch.txt	format-patch: teach --no-encode-email-headers	2020-04-07 22:37:18 -07:00
git-fsck-objects.txt
git-fsck.txt
git-gc.txt
git-get-tar-commit-id.txt
git-grep.txt	doc: use linkgit macro where needed.	2020-10-08 14:01:18 -07:00
git-gui.txt
git-hash-object.txt
git-help.txt	help: drop usage of 'common' and 'useful' for guides	2020-08-04 18:34:01 -07:00
git-http-backend.txt
git-http-fetch.txt	http-fetch: support fetching packfiles by URL	2020-06-10 18:06:34 -07:00
git-http-push.txt
git-imap-send.txt	git-imap-send.txt: add note about localized Gmail folders	2020-08-31 11:44:33 -07:00
git-index-pack.txt	Documentation: mark --object-format=sha256 as experimental	2020-08-17 10:50:14 -07:00
git-init-db.txt
git-init.txt	doc: fix the bnf like style of some commands	2020-10-08 14:01:19 -07:00
git-instaweb.txt
git-interpret-trailers.txt
git-log.txt	Merge branch 'so/log-diff-merges-opt'	2020-08-17 17:02:50 -07:00
git-ls-files.txt	doc: --recurse-submodules mostly applies to active submodules	2020-04-06 13:42:43 -07:00
git-ls-remote.txt	docs: adjust for the recent rename of pu to seen	2020-06-25 09:18:53 -07:00
git-ls-tree.txt
git-mailinfo.txt	Doc: show example scissors line	2020-09-28 16:09:04 -07:00
git-mailsplit.txt
git-maintenance.txt	maintenance: create maintenance.<task>.enabled config	2020-09-17 11:30:05 -07:00
git-merge-base.txt
git-merge-file.txt
git-merge-index.txt
git-merge-one-file.txt
git-merge-tree.txt
git-merge.txt	Doc: reference the "stash list" in autostash docs	2020-05-05 16:07:30 -07:00
git-mergetool--lib.txt
git-mergetool.txt
git-mktag.txt
git-mktree.txt
git-multi-pack-index.txt	multi-pack-index: repack batches below --batch-size	2020-08-11 14:05:26 -07:00
git-mv.txt
git-name-rev.txt
git-notes.txt	docs: improve the example that illustrates git-notes path names	2020-08-03 12:40:09 -07:00
git-p4.txt
git-pack-objects.txt	pack-objects: no fetch when allow-{any,promisor}	2020-08-06 13:01:03 -07:00
git-pack-redundant.txt
git-pack-refs.txt
git-parse-remote.txt
git-patch-id.txt
git-prune-packed.txt
git-prune.txt
git-pull.txt	Merge branch 'dl/merge-autostash'	2020-04-29 16:15:27 -07:00
git-push.txt
git-quiltimport.txt
git-range-diff.txt
git-read-tree.txt	doc: --recurse-submodules mostly applies to active submodules	2020-04-06 13:42:43 -07:00
git-rebase.txt	Merge branch 'pb/doc-sequence-editor-configuration'	2020-09-03 12:37:06 -07:00
git-receive-pack.txt
git-reflog.txt
git-remote-ext.txt
git-remote-fd.txt
git-remote-helpers.txto
git-remote.txt	doc: git-remote fix ups	2020-10-08 14:01:18 -07:00
git-repack.txt
git-replace.txt
git-request-pull.txt
git-rerere.txt
git-reset.txt	doc: document --recurse-submodules for reset and restore	2020-04-06 13:42:43 -07:00
git-restore.txt	Merge branch 'es/restore-staged-from-head-by-default'	2020-05-08 14:25:08 -07:00
git-rev-list.txt	git-log.txt: include rev-list-description.txt	2020-07-08 22:08:54 -07:00
git-rev-parse.txt
git-revert.txt	cherry-pick/revert: honour --no-gpg-sign in all case	2020-04-03 11:37:22 -07:00
git-rm.txt
git-send-email.txt
git-send-pack.txt
git-sh-i18n--envsubst.txt
git-sh-i18n.txt
git-sh-setup.txt
git-shell.txt
git-shortlog.txt	shortlog: allow multiple groups to be specified	2020-09-27 12:21:05 -07:00
git-show-branch.txt
git-show-index.txt	Documentation: mark --object-format=sha256 as experimental	2020-08-17 10:50:14 -07:00
git-show-ref.txt
git-show.txt
git-sparse-checkout.txt	Merge branch 'en/sparse-with-submodule-doc'	2020-06-22 15:55:03 -07:00
git-stage.txt
git-stash.txt	stash push: support the --pathspec-from-file option	2020-02-19 10:56:49 -08:00
git-status.txt
git-stripspace.txt
git-submodule.txt	submodule: fall back to remote's HEAD for missing remote.<name>.branch	2020-06-24 09:14:21 -07:00
git-svn.txt
git-switch.txt	doc: --recurse-submodules mostly applies to active submodules	2020-04-06 13:42:43 -07:00
git-symbolic-ref.txt
git-tag.txt	Doc: prefer more specific file name	2020-09-18 15:41:56 -07:00
git-tools.txt
git-unpack-file.txt
git-unpack-objects.txt
git-update-index.txt
git-update-ref.txt	Modify pseudo refs through ref backend storage	2020-07-27 10:06:49 -07:00
git-update-server-info.txt
git-upload-archive.txt
git-upload-pack.txt
git-var.txt
git-verify-commit.txt
git-verify-pack.txt
git-verify-tag.txt
git-web--browse.txt
git-whatchanged.txt
git-worktree.txt	Merge branch 'es/wt-add-detach'	2020-09-18 17:58:04 -07:00
git-write-tree.txt
git.txt	refs: add GIT_TRACE_REFS debugging mechanism	2020-09-09 12:58:37 -07:00
gitattributes.txt	userdiff: support Markdown	2020-05-02 18:04:12 -07:00
gitcli.txt	Merge branch 'jc/doc-single-h-is-for-help' into maint	2020-03-17 15:02:24 -07:00
gitcore-tutorial.txt
gitcredentials.txt	command-list.txt: add missing 'gitcredentials' and 'gitremote-helpers'	2020-08-04 18:34:01 -07:00
gitcvs-migration.txt
gitdiffcore.txt
giteveryday.txt	docs: adjust for the recent rename of pu to seen	2020-06-25 09:18:53 -07:00
gitfaq.txt	docs: explain how to deal with files that are always modified	2020-09-20 21:29:02 -07:00
gitglossary.txt
githooks.txt	Merge branch 'jx/proc-receive-hook'	2020-09-25 15:25:39 -07:00
gitignore.txt
gitk.txt
gitmodules.txt	submodule: fall back to remote's HEAD for missing remote.<name>.branch	2020-06-24 09:14:21 -07:00
gitnamespaces.txt
gitremote-helpers.txt	Merge branch 'bc/sha-256-part-2'	2020-07-06 22:09:13 -07:00
gitrepository-layout.txt
gitrevisions.txt
gitsubmodules.txt	gitsubmodules doc: invoke 'ls-files' with '--recurse-submodules'	2020-10-04 12:54:07 -07:00
gittutorial-2.txt
gittutorial.txt
gitweb.conf.txt
gitweb.txt
gitworkflows.txt	gitworkflows.txt: fix broken subsection underline	2020-07-18 13:43:34 -07:00
glossary-content.txt
howto-index.sh
i18n.txt
install-doc-quick.sh
install-webdoc.sh
line-range-format.txt
lint-gitlink.perl
mailmap.txt
Makefile	git.txt: add list of guides	2020-08-04 18:34:02 -07:00
manpage-base-url.xsl.in
manpage-bold-literal.xsl	manpage-bold-literal.xsl: stop using git.docbook.backslash	2020-03-29 09:25:38 -07:00
manpage-normal.xsl	manpage-normal.xsl: fold in manpage-base.xsl	2020-03-29 09:25:38 -07:00
manpage-quote-apos.xsl
manpage.xsl
merge-options.txt	Merge branch 'dl/merge-autostash'	2020-04-29 16:15:27 -07:00
merge-strategies.txt
MyFirstContribution.txt	config: drop git_config_get_string_const()	2020-08-17 15:35:47 -07:00
MyFirstObjectWalk.txt	MyFirstObjectWalk: remove unnecessary conditional statement	2020-03-30 11:16:41 -07:00
object-format-disclaimer.txt	Documentation: mark --object-format=sha256 as experimental	2020-08-17 10:50:14 -07:00
pretty-formats.txt	Merge branch 'mk/pb-pretty-email-without-domain-part-fix'	2020-07-06 22:09:15 -07:00
pretty-options.txt	pretty-options.txt: fix --no-abbrev-commit description	2020-08-27 08:37:09 -07:00
pull-fetch-param.txt	refspec: add support for negative refspecs	2020-09-30 14:52:00 -07:00
ref-reachability-filters.txt	Doc: prefer more specific file name	2020-09-18 15:41:56 -07:00
rev-list-description.txt	git-log.txt: include rev-list-description.txt	2020-07-08 22:08:54 -07:00
rev-list-options.txt	Merge branch 'jk/log-fp-implies-m'	2020-08-17 17:02:49 -07:00
revisions.txt	revisions.txt: describe 'rev1 rev2 ...' meaning for ranges	2020-07-08 22:08:53 -07:00
sequencer.txt
SubmittingPatches	Merge branch 'js/pu-to-seen'	2020-07-06 22:09:16 -07:00
texi.xsl
trace2-target-values.txt
transfer-data-leaks.txt
urls-remotes.txt
urls.txt
user-manual.conf	user-manual.conf: don't specify [listingblock]	2020-03-31 16:08:02 -07:00
user-manual.txt	docs: adjust for the recent rename of pu to seen	2020-06-25 09:18:53 -07:00