git/list[1] front-page[2] threads[3] people[4] search[5] about
 

omitted test scripts?

From
CLChuck Lever <cel@citi.umich.edu>
Date
Sep 19, 2005, 15:50 UTC
Message-ID
<432EDE3F.7070407@citi.umich.edu>
In-Reply-To
<1126949517.6941.19.camel@localhost.localdomain>
Catalin Marinas wrote:
Show 21 quoted lines
> On Fri, 2005-09-16 at 12:59 -0700, Junio C Hamano wrote:
> 
>>Catalin Marinas <catalin.marinas@gmail.com> 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

Previous: Catalin MarinasNext: Junio C Hamano
Message 11 of 14 in “git-merge-cache / StGIT - gitmergeonefile.py: merging one tree into another rather than two trees into merge base”
  1. BlaisorbladeSep 10, 2005
  2. Catalin MarinasSep 11, 2005
  3. Chuck LeverSep 12, 2005
  4. BlaisorbladeSep 14, 2005
  5. BlaisorbladeSep 14, 2005
  6. BlaisorbladeSep 14, 2005
  7. Catalin MarinasSep 15, 2005
  8. BlaisorbladeSep 16, 2005
  9. Junio C HamanoSep 16, 2005
  10. Catalin MarinasSep 17, 2005
  11. omitted test scripts?Chuck Lever, Sep 19, 2005
  12. Junio C HamanoSep 19, 2005
  13. Daniel BarkalowSep 19, 2005
  14. Matthias UrlichsSep 19, 2005

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.