Re: [PATCH v4] fast-import: treat filemodify with empty tree as delete
On Thu, Jan 27, 2011 at 09:46:50PM +0100, Peter Baumann wrote:
Show 32 quoted lines
> On Thu, Jan 27, 2011 at 01:48:45PM -0600, Jonathan Nieder wrote:
> > Peter Baumann wrote:
> > > On Thu, Jan 27, 2011 at 12:07:49AM -0600, Jonathan Nieder wrote:
> >
> > >> +++ b/t/t9300-fast-import.sh
> > >> @@ -818,6 +818,48 @@ test_expect_success \
> > >> compare_diff_raw expect actual'
> > >>
> > >> +test_expect_success \
> > >> + 'N: delete directory by copying' \
> > >> + 'cat >expect <<-\EOF &&
> > >> + OBJID
> > >> + :100644 000000 OBJID OBJID D foo/bar/qux
> > >> + OBJID
> > >> + :000000 100644 OBJID OBJID A foo/bar/baz
> > >> + :000000 100644 OBJID OBJID A foo/bar/qux
> > >> + EOF
> > >> + empty_tree=$(git mktree </dev/null) &&
> > >
> > > [ Feel free to ignore me ... ]
> > >
> > > Just a (stupid?) suggestion: Why not put a $EMPTY_TREE definiton in test-lib.sh
> > > (or any other global file sourced in the tests) so if another caller needs this
> > > definition it won't waste cpu cycles doing the calculation via mktree < /dev/null
> > > again?
> >
> > Might be a good idea. Note, though, that that would mean more cpu
> > cycles used rather than less, unless we hardcode the object name
> > (which I prefer not to do).
> >
>
> Wny not? It *is* already hardcoded in the GIT source code (see grep -a1 cache.h
Show 12 quoted lines
> output).
>
> > One possibility would be a lib-object-names.sh defining EMPTY_BLOB and
> > EMPTY_TREE to be sourced by tests that need it.
>
> Hm. Might be a possibility, but if this file only contains 2 hardcoded variables
> I would prefer putting it into test-list.sh instead of an extra file.
> --
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>