DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 798D9385BF83
Date: Sun, 12 Apr 2020 17:27:47 +0000 (UTC)
From: "Z. Majeed" <zmajeed@sbcglobal.net>
To: "cygwin@cygwin.com" <cygwin@cygwin.com>
Message-ID: <911300906.3019559.1586712467594@mail.yahoo.com>
In-Reply-To: <CAAXzdLUZuXfGRXEvJZ5QyD6SBBOgLDzEO-NNaib1agdAejPpTA@mail.gmail.com>
References: <CAAXzdLUZuXfGRXEvJZ5QyD6SBBOgLDzEO-NNaib1agdAejPpTA@mail.gmail.com>
Subject: Re: Request package updates for Poppler, Subversion and Git
MIME-Version: 1.0
Precedence: list
Content-Type: text/plain; charset="utf-8"
Errors-To: cygwin-bounces@cygwin.com
Sender: "Cygwin" <cygwin-bounces@cygwin.com>
Content-Transfer-Encoding: 8bit

I made do with windows git 2.26 - unfortunately it does not play well with cygwin git

My first attempt at windows git worktree add produced: "Working tree has modifications.  Cannot add."

Very surprising since it was a fresh clone - but using cygwin git

Turns out the error is from a git diff-index HEAD at https://github.com/git/git/blob/master/contrib/subtree/git-subtree.sh#L617

windows git diff-index showed two kinds of false positives

1. new files:

:100644 100644 b5ae85651031085a9dc89f584d235e48f0502837 000000000000000000000000
0000000000000000 M      LICENSE

this is fixed with windows git update-index LICENSE

2. file permissions change

:100755 100644 ae8fb75816f99be89c0171fb5b287149f52c19be ae8fb75816f99be89c0171fb
5b287149f52c19be M      googletest/ci/build-linux-bazel.sh

this is fixed with windows git config core.filemode false

Bit easier is insuring the repo was cloned with windows git in the first place - but it's good to know where the two versions don't agree

I can't say which version is at fault for the inconsistency


On Sunday, April 12, 2020, 09:17:32 AM EDT, Steven Penny <svnpenn@gmail.com> wrote: 


> Will git contrib/subtree be in the next release? It's not in the latest version 2.21.0-1.

https://stackoverflow.com/questions/27109525/install-git-subtree-with-cygwin
--
Problem reports:      https://cygwin.com/problems.html
FAQ:                  https://cygwin.com/faq/
Documentation:        https://cygwin.com/docs.html
Unsubscribe info:     https://cygwin.com/ml/#unsubscribe-simple