| commit | fc12aa7bfd50fd175a0760b446de1e4514a69d46 | |
| author | René Scharfe <l.s.r@web.de> | |
| Thu, 21 May 2020 09:52:28 +0000 (21 11:52 +0200) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 21 May 2020 18:03:10 +0000 (21 11:03 -0700) | ||
| tree | f0cfcd1999e74c3a6355957275534d6f9beae241 | treesnapshot (tar.gz zip) |
| parent | 86715592fd319a6e04cbb9c84415c0a052ca4344 | commitdiff |
t1450: increase test coverage of in-tree d/f detection
Exercise the case of putting a conflict candidate file name back on the
stack because a matching directory might yet come up later.
Do that by factoring out the test code into a function to allow for more
concise notation in the form of parameters indicating names of trees
(with trailing slash) and blobs (without trailing slash) in no
particular order (they are sorted by git mktree). Then add the new test
case as a second function call.
Fix a typo in the test title while at it ("dublicate").
Reported-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Exercise the case of putting a conflict candidate file name back on the
stack because a matching directory might yet come up later.
Do that by factoring out the test code into a function to allow for more
concise notation in the form of parameters indicating names of trees
(with trailing slash) and blobs (without trailing slash) in no
particular order (they are sorted by git mktree). Then add the new test
case as a second function call.
Fix a typo in the test title while at it ("dublicate").
Reported-by: Derrick Stolee <stolee@gmail.com>
Signed-off-by: René Scharfe <l.s.r@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| t/t1450-fsck.sh | diffblobblamehistory |