From: Ed Maste <emaste@freebsd.org>
To: Tom Clarkson <tqclarkson@icloud.com>
Cc: Marc Balmer <marc@msys.ch>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>,
"Strain, Roger L." <roger.strain@swri.org>,
"git@vger.kernel.org" <git@vger.kernel.org>,
"gitster@pobox.com" <gitster@pobox.com>,
"ns@nadavsinai.com" <ns@nadavsinai.com>,
"pclouds@gmail.com" <pclouds@gmail.com>
Subject: Re: Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed
Date: Mon, 16 Dec 2019 06:30:50 -0500 [thread overview]
Message-ID: <CAPyFy2ANiDQ+Ed+3vG-MAxeAV=CRhJow56F7tBooBpJ-Q9B-bA@mail.gmail.com> (raw)
In-Reply-To: <10B64ECE-6635-4735-A8AA-44E66BF0E5DA@icloud.com>
On Sat, 14 Dec 2019 at 09:27, Tom Clarkson <tqclarkson@icloud.com> wrote:
>
> When you say it pushed every commit, does that mean that a bunch of mainline commits erroneously ended up in the subtree repo?
We encounter this case when trying to use subtree on the FreeBSD
repository. In our case it's caused by commit that should not be
classified as a commit to the subtree, but has no files in the
subtree. In our case it looks like an artifact of svn-git conversion
of an odd working branch, but the same issue is reproducible in other
ways. For example, it will appear if the subtree is deleted at some
point and later re-added.
next prev parent reply other threads:[~2019-12-16 15:17 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-12-08 10:30 Regression in git-subtree.sh, introduced in 2.20.1, after 315a84f9aa0e2e629b0680068646b0032518ebed Nadav SInai
2019-12-09 14:11 ` Strain, Roger L.
2019-12-09 11:45 ` Ed Maste
2019-12-09 16:19 ` Strain, Roger L.
2019-12-09 14:13 ` Marc Balmer
2019-12-09 14:18 ` Strain, Roger L.
2019-12-09 14:30 ` Marc Balmer
2019-12-09 15:26 ` Johannes Schindelin
2019-12-09 15:31 ` Marc Balmer
2019-12-09 19:38 ` Johannes Schindelin
2019-12-11 5:43 ` Tom Clarkson
2019-12-11 14:39 ` Strain, Roger L.
2019-12-12 5:02 ` Tom Clarkson
2019-12-13 13:41 ` Johannes Schindelin
2019-12-14 8:29 ` Marc Balmer
[not found] ` <BAB4CF6D-6904-4698-ACE1-EBEEC745E569@msys.ch>
2019-12-14 14:27 ` Tom Clarkson
2019-12-16 11:30 ` Ed Maste [this message]
2019-12-18 0:15 ` Tom Clarkson
2020-03-12 10:40 ` Marc Balmer
2019-12-16 3:50 ` Tom Clarkson
[not found] <3E84DE22-9614-4E1B-9717-69F6777DD219@msys.ch>
2020-03-12 10:43 ` Tom Clarkson
-- strict thread matches above, loose matches on Subject: below --
2018-12-31 10:28 Marc Balmer
2018-12-31 10:51 ` Duy Nguyen
2018-12-31 11:12 ` Marc Balmer
2018-12-31 11:20 ` Duy Nguyen
2018-12-31 11:24 ` Marc Balmer
2018-12-31 11:36 ` Duy Nguyen
2018-12-31 12:31 ` Marc Balmer
2019-01-01 13:19 ` Duy Nguyen
2019-01-02 9:13 ` Marc Balmer
2019-01-02 20:20 ` Strain, Roger L.
2019-01-03 13:50 ` Johannes Schindelin
2019-01-03 15:30 ` Strain, Roger L.
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAPyFy2ANiDQ+Ed+3vG-MAxeAV=CRhJow56F7tBooBpJ-Q9B-bA@mail.gmail.com' \
--to=emaste@freebsd.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=marc@msys.ch \
--cc=ns@nadavsinai.com \
--cc=pclouds@gmail.com \
--cc=roger.strain@swri.org \
--cc=tqclarkson@icloud.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).