Hello,
On Friday 18 July 2008 21:36:26 Johannes Schindelin wrote:
> > What I'm unsure of is, should fast-export try to reuse commit
> > marks for gitlinks where it happened to recognize the object,
> > or always output the SHA as it is stored in the tree?
> Are they commit marks? No. So they should be handled as marks, just as
> those for blobs and trees.
>
> (They are commit marks in the _submodule_, but that does not matter here.)
Well, I was thinking of that unlikely case when the master module and the submodule
are in the same repository and are exported together. But probably it is best to just
output the SHA after all.
> > for (i = 0; i < diff_queued_diff.nr; i++)
> > - handle_object(diff_queued_diff.queue[i]->two->sha1);
> > + if (!S_ISGITLINK(diff_queued_diff.queue[i]->two->mode))
> > + handle_object(diff_queued_diff.queue[i]->two->sha1);
>
> Why? You do not want to export changes in the submodules?
handle_object opens the sha as a blob and outputs it. As gitlinks aren't blobs, it won't work.
And if the submodule is in a separate repository, there is nothing to open anyway.
Simultaneously reading commits from the submodule repository is a whole different level
of complexity. I'm afraid I'm not up to it yet.
> > diff --git a/builtin-fast-export.c b/builtin-fast-export.c
> > index d0a462f..14b1549 100644
> > --- a/builtin-fast-export.c
> > +++ b/builtin-fast-export.c
> > @@ -123,8 +123,19 @@ static void show_filemodify(struct diff_queue_struct *q,
> > printf("D %s\n", spec->path);
> > else {
> > struct object *object = lookup_object(spec->sha1);
> > - printf("M %06o :%d %s\n", spec->mode,
> > - get_object_mark(object), spec->path);
> > + int mark = object ? get_object_mark(object) : 0;
>
> As I said, that looks wrong. Maybe we have to fake objects for the
> gitlinks.
I tried to avoid faking blobs and stick to the interface of the M command itself.
> > @@ -1900,7 +1901,16 @@ static void file_change_m(struct branch *b)
> > p = uq.buf;
> > }
> >
> > - if (inline_data) {
> > + if (S_ISGITLINK(mode)) {
> > + if (inline_data)
> > + die("Git links cannot be specified 'inline': %s",
> > + command_buf.buf);
> > + else if (oe) {
> > + if (oe->type != OBJ_COMMIT)
> > + die("Not a commit (actually a %s): %s",
> > + typename(oe->type), command_buf.buf);
>
> How is that supposed to work? Do I understand correctly that you require
> the user to construct a commit object for the gitlink? That would be
> actively wrong.
There are three forms of the M command:
M mode inline some/path
...some data...
M mode :mark some/path
M mode SHA some/path
For usual files the mark must be created by the 'blob' command,
and the SHA must refer to an existing blob. This hunk makes fast-import
require for gitlinks a commit mark instead, and accept the SHA without
checking (as it is expected to be in another repository).
> Oh, and your patch lacks test cases that demonstrate how you envisage the
> whole thing to work.
Ok, I'll make some tests tomorrow. For now, this is an example of output from
my test repository:
...
blob
mark :16
data 41
[submodule "sub"]
path = sub
url = sub
commit refs/heads/master
mark :17
author Alexander Gavrilov <angavrilov@xxxxxxxxx> 1216360728 +0400
committer Alexander Gavrilov <angavrilov@xxxxxxxxx> 1216360728 +0400
data 4
sub
from :15
M 100644 :16 .gitmodules
M 160000 d6317bc6e2597bf74ae199514a54e25775b0d20d sub
Alexander
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
