From: Chuck Lever Date: Mon, 19 Sep 2005 15:50:23 GMT Subject: omitted test scripts? Message-ID: <432EDE3F.7070407@citi.umich.edu> In-Reply-To: <1126949517.6941.19.camel@localhost.localdomain> Catalin Marinas wrote: > On Fri, 2005-09-16 at 12:59 -0700, Junio C Hamano wrote: > >>Catalin Marinas writes: >> >> >>>git-read-tree -m doesn't handle the case when a file is removed from >>>one branch and unmodified in the other, which is what happens in your >>>test. For each of these removed files, git-merge-cache will call >>>gitmergeonefile.py which calls 'git-update-cache --remove'. >>> >>>An improvement would be to make git-read-tree smarter... >> >>I think this was once discussed but the primary reason for the >>behaviour is that Linus wanted to leave as much merge policy >>decision to be scriptable without hardcoding it in read-tree. > > > This could be OK for git-read-tree but maybe git-merge-index could have > a --smart option to deal with trivial cases like below (or a separate > tool). Whoever wants to write a more interactive script would not pass > this option. i noticed while testing the new cache API that there are no tests under t/ for git-merge-index. there is also no test script that covers the prune_cache() function in ls-files.c. begin:vcard fn:Chuck Lever n:Lever;Charles org:Network Appliance, Incorporated;Linux NFS Client Development adr:535 West William Street, Suite 3100;;Center for Information Technology Integration;Ann Arbor;MI;48103-4943;USA email;internet:cel@citi.umich.edu title:Member of Technical Staff tel;work:+1 734 763 4415 tel;fax:+1 734 763 4434 tel;home:+1 734 668 1089 x-mozilla-html:FALSE url:http://www.monkey.org/~cel/ version:2.1 end:vcard