From: Chuck Lever <cel@citi.umich.edu>
To: Junio C Hamano <junkio@cox.net>
Cc: git@vger.kernel.org
Subject: omitted test scripts?
Date: Mon, 19 Sep 2005 11:50:23 -0400 [thread overview]
Message-ID: <432EDE3F.7070407@citi.umich.edu> (raw)
In-Reply-To: <1126949517.6941.19.camel@localhost.localdomain>
[-- Attachment #1: Type: text/plain, Size: 1103 bytes --]
Catalin Marinas wrote:
> 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.
[-- Attachment #2: cel.vcf --]
[-- Type: text/x-vcard, Size: 439 bytes --]
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
next prev parent reply other threads:[~2005-09-19 15:50 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-09-10 18:27 git-merge-cache / StGIT - gitmergeonefile.py: merging one tree into another rather than two trees into merge base Blaisorblade
2005-09-11 8:24 ` Catalin Marinas
2005-09-12 12:59 ` Chuck Lever
2005-09-14 17:46 ` Blaisorblade
2005-09-14 18:16 ` Blaisorblade
2005-09-14 18:19 ` Blaisorblade
2005-09-15 10:06 ` Catalin Marinas
2005-09-16 18:45 ` Blaisorblade
2005-09-16 19:59 ` Junio C Hamano
2005-09-17 9:31 ` Catalin Marinas
2005-09-19 15:50 ` Chuck Lever [this message]
2005-09-19 16:19 ` omitted test scripts? Junio C Hamano
2005-09-19 17:01 ` Daniel Barkalow
2005-09-19 18:54 ` Matthias Urlichs
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=432EDE3F.7070407@citi.umich.edu \
--to=cel@citi.umich.edu \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).