зеркало из https://github.com/microsoft/git.git
c64432aacd
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> |
||
|---|---|---|
| .. | ||
| .gitignore | ||
| api-error-handling.txt | ||
| api-index-skel.txt | ||
| api-index.sh | ||
| api-merge.txt | ||
| api-parse-options.txt | ||
| api-trace2.txt | ||
| bitmap-format.txt | ||
| bundle-format.txt | ||
| commit-graph-format.txt | ||
| commit-graph.txt | ||
| directory-rename-detection.txt | ||
| hash-function-transition.txt | ||
| http-protocol.txt | ||
| index-format.txt | ||
| long-running-process-protocol.txt | ||
| multi-pack-index.txt | ||
| pack-format.txt | ||
| pack-heuristics.txt | ||
| pack-protocol.txt | ||
| packfile-uri.txt | ||
| partial-clone.txt | ||
| protocol-capabilities.txt | ||
| protocol-common.txt | ||
| protocol-v2.txt | ||
| racy-git.txt | ||
| reftable.txt | ||
| repository-version.txt | ||
| rerere.txt | ||
| send-pack-pipeline.txt | ||
| shallow.txt | ||
| signature-format.txt | ||
| trivial-merge.txt | ||