Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: Ævar Arnfjörð Bjarmason <avarab@xxxxxxxxx> writes: > Change various tests that use an idiom of the form: > > >expect && > test_cmp expect actual > > To instead use: > > test_must_be_empty actual I trust that you eyeballed the result to make sure steps after these converted parts do *not* depend on (or expect) the presence of an empty 'expect' file (e.g. ".gitignore" has 'expect' listed, or the expected output from "status" has expected in the untracked section)? I'd imagine that kind of sanity checking the result would have taken 10x more time than the actual conversion itself. Very much appreciated. > This patch is on top of "next" since one of the things being fixed up > is a test in my in-flight ab/checkout-default-remote series. It also > applies cleanly to "pu", and the only conflicts with "master" are due > to that series of mine. A patch that truly depends on all of 'next' won't have a chance to graduate, but it seems you only need one topic out of it. If I were you in such a situation I would have prepared two patches, i.e. one to apply on 'master', and the remainder to apply on tip of ab/checkout-default-remote, and made sure that applying the former on 'master' and merging the updated ab/checkout-default-remote would match the tree you would get by merging ab/checkout-default-remote to 'master' and applying _this_ patch. Let's see if I can tease them apart myself first. Thanks.
