Skip to main content
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] Quick question about WorkingTreeIterator::contentCheck
  • From: "Halstrick, Christian" <christian.halstrick@xxxxxxx>
  • Date: Wed, 11 Mar 2020 09:56:06 +0000
  • Accept-language: de-DE, en-US
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=sap.com; dmarc=pass action=none header.from=sap.com; dkim=pass header.d=sap.com; arc=none
  • Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hIifPPEaMMEwcR8aQV97zMv1uWafkqHlEzhUf9S3er8=; b=RWCtU8EBJHQ+8ojXNZUUPlivtHi4djV91LohBQphUOv8nLpMVmBnhVGhUX1YngTp7COZ7uDKVqXqUnRWpI8RbQLZl8XTZS+4m03cWVeDR/0eEdMwAN+DSvdWiG7eG1WpwyPeAV9S4nV3FEz3yLqIIBPefiP0tuNc9QrRbKb1Td9Z2PtWQXs1idjDHFU+J6+/QY2va3fCh6EOpXmdFRXHU2UgLW0Nb++7IzGG7iKSr72e12PCV2nEbjiwXguOs6C6vZ8Hwe91vkeycRoPKT64rqIvXESogKIoLfK3HziNKarYSsAkllS8edbVyv0ZyGTjQBddVr89d+zWMjm8raTqUQ==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=E6W7Zm6BuSYqsN/Z8wVg4ON5uPpSz3xFfEP8u2vJMaS8y0IRE+MNy3GVDNttB0DbXfvDEUZv+PbmK3bIAz1xOGcCcnoVwKj1qDdtXIggwMvhiG9MdKC8FSQcGXq1mabvpvPVyukPr4Om+dao0tm/xPtx/Nl4CbJKeQo2J4I0VPEDfDoab8aV96ZmqcSksd/vAHeJ7OY9Z/9ihZEznBJbGVUn0T6VeuMBzC8d00bVqU61mkHgAMPYpyTQvqqfNgzM3/eD/10RxJW96O+X50MdQwIpQ/uSDsE56exAZs58hn5DLpwXfBU0zTxb+Uci4yeRxKat2+N+Ja2sgT/P/7imlA==
  • Delivered-to: jgit-dev@xxxxxxxxxxx
  • Ironport-sdr: 6ntU634vpdS6B4DsRcEebeW8DY7COBIcPewlQC5uqGjXKcDLdL9ZNibtdgWTi3KCahWaa3kllG 3LyLMlI7QJpm/wJWGntMaA5weM83FgRHvm6KlzgjdO0NBCx++E+2Xx5P506vVA8KhjVJnqU6p1 NKQERHzm+jg7XCGLNLO4O6HOrF0bMVJ6Q5eMDbBqS6R6+Ryl4dC0nTfndA+niDwQHe4e67i1BK yXWLd3XY9iIJ7ZsP37j5M5r+TD4GoP6o5+J3TuUr1vEyTIO1jvcPY4PQumQh5jlVCQUFUJn3Hz zYM9VDF37z14492GpHyBg5+Z
  • List-archive: <https://www.eclipse.org/mailman/private/jgit-dev>
  • List-help: <mailto:jgit-dev-request@eclipse.org?subject=help>
  • List-subscribe: <https://www.eclipse.org/mailman/listinfo/jgit-dev>, <mailto:jgit-dev-request@eclipse.org?subject=subscribe>
  • List-unsubscribe: <https://www.eclipse.org/mailman/options/jgit-dev>, <mailto:jgit-dev-request@eclipse.org?subject=unsubscribe>
  • Thread-index: AQHV9vBe4JLnpDPBhUWM1beZnX6QYahB9M8AgAAVo4CAAA16gIAASPIAgACvSQCAABh/lg==
  • Thread-topic: [jgit-dev] Quick question about WorkingTreeIterator::contentCheck
that rings a bell. Could it be that you have files which paths differ only in case. Like 'd/f' and 'd/F'. That works well on case sensitive filesystems (often on linux) but when checking out on windows (but also on MacOS) that causes problems. Writing the two files d/f and d/F will not create two different files. Check with 'git ls-files' whether you have such a case.
Von: jgit-dev-bounces@xxxxxxxxxxx <jgit-dev-bounces@xxxxxxxxxxx> im Auftrag von Peter Hull <peterhull90@xxxxxxxxx>
Gesendet: Mittwoch, 11. März 2020 09:28
An: JGit Developers list <jgit-dev@xxxxxxxxxxx>
Betreff: Re: [jgit-dev] Quick question about WorkingTreeIterator::contentCheck
 
On Tue, 10 Mar 2020 at 22:01, Thomas Wolf <thomas.wolf@xxxxxxxxxx> wrote:
>
> On 10 Mar 2020, at 18:39 , Matthias Sohn <matthias.sohn@xxxxxxxxx> wrote:
> > this should not happen, JGit first compares file meta data to detect modification (since that's faster),
> > if this fails it compares the actual file content by comparing objectIDs (hash over the object's content).
> > I guess you meant WorkingTreeIterator#isModified
I did, sorry for the confusion.
>
> Which JGit version?
In a checkout of NB's git I have two copies of
org.eclipse.jgit-3.6.2.201501210735-r.jar (with different sizes) and
one of org.eclipse.jgit-5.5.0.201909110433-r.jar! However in the
combined binary there is just
org-eclipse-jgit.jar and it is identical to the 5.5.0 version.
I assume that replacing 5.5.0 -> 5.5.1 would not require any changes
to the calling code?

However, this should be a performance change shouldn't it, files
should still be marked correctly even if jgit has to go through the
slower route of checking file contents?

>
> Otherwise, perhaps it's line endings. Check that the files do not use mixed line endings,
> and double-check your autoCrlf and other git config settings and .gitattributes related
> to line endings.
I'll check this, because I did the original clones from 'git for
Windows' (git bash) and then saw the spurious changes in Netbeans
using jgit.
Also I tried the same on MacOS and it worked perfectly.

I will report back if I figure it out; in the meantime thanks again
for your patience, there's quite a lot of new information to digest
for me.
_______________________________________________
jgit-dev mailing list
jgit-dev@xxxxxxxxxxx
To unsubscribe from this list, visit https://www.eclipse.org/mailman/listinfo/jgit-dev

Back to the top