From: Pete Wyckoff <pw@padd.com>
To: Duane Murphy <duanemurphy@mac.com>
Cc: git@vger.kernel.org, Luke Diamand <luke@diamand.org>
Subject: Re: git p4 diff-tree ambiguous argument error
Date: Sat, 12 Jul 2014 14:10:34 -0400 [thread overview]
Message-ID: <20140712181034.GB26857@padd.com> (raw)
In-Reply-To: <BEE93DDF-7F3E-423D-AA3F-0D72E8FD08B3@mac.com>
duanemurphy@mac.com wrote on Thu, 10 Jul 2014 12:19 -0700:
> Some additional investigation.
>
> I am working in a copy of a repository that was originally used to pull the data
> from Perforce. As part of my experiments to figure out this problem, I deleted
> the contents of .git/git-p4-tmp/.
>
> I noticed that git-p4 would continue if those files were present. I have now
> copied the files that were in .git/git-p4-tmp/ from the other repository.
>
> git-p4 is not crashing now, but I also noticed that none of the dates on these files
> have changed. These files should have been touched each time that a branch is taken,
> but these files have not changed while the sync is running.
>
> That seems significant.
>
> I expect git-p4 to crash again on a new commit that is not in .git/git-p4-tmp/.
> Then I have to start the 8-12 hour process over again (did I mention 70k commits?).
Bizarre. That directory is really supposed to be temporary, and
live only during a single git p4 invocation. It's just a bunch
of branch heads for the temporary commits. I don't know why
those branches, and the git-p4-tmp directory, hang around after
you run git p4. Might be worth your investigation.
The second weirdness is why a new run doesn't create the branch.
This maybe points to self.checkpoint() not really checkpointing.
It does send a "checkpoint" down the git fast-import stream,
which is supposed to make it write the branches out. You might
consider grabbing the fast-import process in a debugger and see
why it's not writing out the branch head.
There's lots of changes since v1.7.12.4, but nothing obvious I
can see that would cause this. Sorry,
-- Pete
next prev parent reply other threads:[~2014-07-12 18:10 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-10 17:30 git p4 diff-tree ambiguous argument error Bill Door
2014-07-10 18:07 ` Luke Diamand
2014-07-10 18:08 ` Duane Murphy
2014-07-10 19:19 ` Duane Murphy
2014-07-12 18:10 ` Pete Wyckoff [this message]
2014-07-12 19:19 ` Duane Murphy
2014-07-11 17:40 ` Bill Door
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=20140712181034.GB26857@padd.com \
--to=pw@padd.com \
--cc=duanemurphy@mac.com \
--cc=git@vger.kernel.org \
--cc=luke@diamand.org \
/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).