X-Recipient:	archive-cygwin AT delorie DOT com
X-Original-To:	cygwin AT cygwin DOT com
Delivered-To:	cygwin AT cygwin DOT com
DMARC-Filter:	OpenDMARC Filter v1.3.2 sourceware.org 798D9385BF83
Authentication-Results:	sourceware.org;
	dmarc=none (p=none dis=none) header.from=sbcglobal.net
Authentication-Results:	sourceware.org;
	spf=none smtp.mailfrom=zmajeed AT sbcglobal DOT net
DKIM-Signature:	v=1; a=rsa-sha256; c=relaxed/relaxed; d=sbcglobal.net; s=s2048;
	t=1586712468; bh=dZBZY/1fNnASm8NpW384uU9HJ385QoO+hM957ETFPfI=;
	h=Date:From:To:In-Reply-To:References:Subject:From:Subject;
	b=snJidnnSyy5eL1HVlUzdbIQV/qRh7+nKaM5mPMU+lMoxt899pZtHcTq/tCP/5FxnJ1Gk7CuccFCfgQgvJoUUHmIWlWrz7jPRiIIUxql6d5eT4/nuYCkCtlhNV+8A15z11rNoaNbCuOBVKyUPd3fzsz4//q88J3IlmwyaA3bKp8ZNYHoBJ+cqxtUr9bbrAn/ZLImEe43a9cic+BXRVp1Hyptj4eSS33uSd+ji5kk7ZAfHM5Xih19wYYhOnnU6eOFk8sYZcmDljLlIzggP3qZicS12mq8noEoZWjfgYJbYiE/3YMpI0OsZ5+3CX3A6Ae3AY27EAiW77ED9upXZzBQkNw==
X-YMail-OSG:	2_sreqYVM1nhYimb4BwYsbDKaz7srfPDgBWpjk61C.ngtu1eKmkAWJ57_HVwn5R
	25mdh9neHuzPq088c0HXyPcngBTukHam9z8GRGc4P8TYd21gQDptIZtScNv7Ax33wnZQaOIRCzCD
	JqfvgySMLODOkf_SpKWUwGK6WmD_3Ovo_wWKa2FoNTaKMvRYVYqr5Y0LfQ_maC9U6AMEzjHyc6zU
	G4rEaR1pWUA1QPZ4rZiUhTVd4As6C3K49OXq5RTyDH1JzTREQhGu8oLEq_RKn5TMkBS0CFvxFpDb
	zHAJ2tanUHBF3DF8WdiWsdL8lN_o7jjqFMInvs3oWqt_uShyp0J51E_8AWrZHI0f2m.H_0SE4nsn
	LjZpX9wia47.cs_mlMy6Y9HW3C9KOUnFZryl8BM4zpUdUE_iXC07krhASsI698GNsWlG3WwWvTuD
	CXhe7FGG7bmvi8VuSS234wa.xH4OW0yH1hG6dTOWVvuAMqIAV4ieg1_R_63AXE4OBZL8OC5bQAtl
	tuvZN8zQ7wsTzLXLlu401n6OU7HzvRpq7bT86cdAj7YSpoH0a.ZnkD6RduhmF.gp_aqh58rPYHPI
	SYgXDUsICbA2gZumNSQ0qZVmV9djtXtOsX.6hWfHpc2nD.z7IdfntXqohrRiTRQd1IZ_IAL_gVQt
	pY6wOLIn9oQnWBZau74EdNfPEB9LK2AXbcPRKJbjcZji5OJJPa3IjWzexwQC3WzAPL8Uzv6ChjKj
	131JHFRB7kDtUZ5nNk4xsuh56OxXrz8OEJTLPlT7OE_EqyvCOOIT4fwVEfa5Tkq0riaTkISp91HL
	NMuM4jyf0nDayeDHAnZotYExWkzwCTtUfsg22B6T0g5ebD30Yn.wJNNFNe52_oocEbD7ZS4AhmaU
	BIs0MktBHfwZhBFQ1NqP.qEDRLdv9Y1Sxon7RFqIpahor0n452uED_dMTkJ4FMicodQ_caD3aSWk
	hMsRoMxOlV6VCtKfcKqRT1_iVjuW9jtxi4VQpbJrPmAo9yXP.1CdZX51yv49HnP3763yV6TXaV6A
	YYFiz3eB8wMZBApUswgxJU9MKAd3YWZIfQYV23LKjKa2xGDak6tUoffV_kkFLsTQjzxxclLcAk_4
	PeOWzA5vtBM8U.b_vAP8iz_wAxMWQeA5oidcG8Fv57l2n9_jeRg4ASbqHQTpjlU0DEkgyG3ElKZ8
	Dg8Sm3tgQX3eeYh4GYdCTfOn9Yf6sCh47BEo7qAkoD77ZRDI1O0oVWU5YlGMoHfeysJde8.DeeDW
	L0Zj5y65I548JNswls3gWsZsLm8wU6D9A1Oz0Dn2Irqa6SeNfjsFAOsumH8y8mYerOFLyOaEGYJc
	Nh7HQ7MBekIeNORhjyD0jXEZ.9Yw-
Date:	Sun, 12 Apr 2020 17:27:47 +0000 (UTC)
From:	"Z. Majeed" <zmajeed AT sbcglobal DOT net>
To:	"cygwin AT cygwin DOT com" <cygwin AT cygwin DOT com>
Message-ID:	<911300906.3019559.1586712467594@mail.yahoo.com>
In-Reply-To:	<CAAXzdLUZuXfGRXEvJZ5QyD6SBBOgLDzEO-NNaib1agdAejPpTA@mail.gmail.com>
References:	<CAAXzdLUZuXfGRXEvJZ5QyD6SBBOgLDzEO-NNaib1agdAejPpTA AT mail DOT gmail DOT com>
Subject:	Re: Request package updates for Poppler, Subversion and Git
MIME-Version:	1.0
X-Mailer:	WebService/1.1.15620 YMailNorrin Mozilla/5.0 (Windows NT 10.0; Win64;
	x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/80.0.3987.149
	Safari/537.36
X-Spam-Status:	No, score=-4.4 required=5.0 tests=BAYES_50, DKIM_SIGNED,
	DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_1, RCVD_IN_DNSWL_NONE,
	RCVD_IN_MSPIKE_H2, SPF_HELO_NONE,
	SPF_NONE autolearn=ham autolearn_force=no version=3.4.2
X-Spam-Checker-Version:	SpamAssassin 3.4.2 (2018-09-13) on
	server2.sourceware.org
X-BeenThere:	cygwin AT cygwin DOT com
X-Mailman-Version:	2.1.29
List-Id:	General Cygwin discussions and problem reports <cygwin.cygwin.com>
List-Unsubscribe:	<http://cygwin.com/mailman/options/cygwin>,
	<mailto:cygwin-request AT cygwin DOT com?subject=unsubscribe>
List-Archive:	<https://cygwin.com/pipermail/cygwin/>
List-Post:	<mailto:cygwin AT cygwin DOT com>
List-Help:	<mailto:cygwin-request AT cygwin DOT com?subject=help>
List-Subscribe:	<http://cygwin.com/mailman/listinfo/cygwin>,
	<mailto:cygwin-request AT cygwin DOT com?subject=subscribe>
Errors-To:	cygwin-bounces AT cygwin DOT com
Sender:	"Cygwin" <cygwin-bounces AT cygwin DOT com>
X-MIME-Autoconverted:	from base64 to 8bit by delorie.com id 03CHSFoE020592

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 AT gmail DOT 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

- Raw text -