From: "Z. Majeed" <zmajeed@sbcglobal.net>
To: "cygwin@cygwin.com" <cygwin@cygwin.com>
Subject: Re: Request package updates for Poppler, Subversion and Git
Date: Sun, 12 Apr 2020 17:27:47 +0000 (UTC) [thread overview]
Message-ID: <911300906.3019559.1586712467594@mail.yahoo.com> (raw)
In-Reply-To: <CAAXzdLUZuXfGRXEvJZ5QyD6SBBOgLDzEO-NNaib1agdAejPpTA@mail.gmail.com>
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
next prev parent reply other threads:[~2020-04-12 17:27 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-12 13:17 Steven Penny
2020-04-12 17:27 ` Z. Majeed [this message]
-- strict thread matches above, loose matches on Subject: below --
2019-12-20 16:26 Kptain
2019-12-20 16:29 ` Marco Atzeri
2019-12-21 2:45 ` Steven Penny
2019-12-22 14:05 ` Adam Dinwoodie
2019-12-22 21:20 ` Achim Gratz
2019-12-23 3:17 ` Steven Penny
2020-01-10 19:55 ` Adam Dinwoodie
2020-01-10 20:33 ` Achim Gratz
2020-01-13 10:36 ` Kptain
2020-04-11 19:43 ` majeed
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=911300906.3019559.1586712467594@mail.yahoo.com \
--to=zmajeed@sbcglobal.net \
--cc=cygwin@cygwin.com \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).