All of lore.kernel.org
 help / color / mirror / Atom feed
From: greened@obbligato.org (David A. Greene)
To: Gregor Jasny <gjasny@googlemail.com>
Cc: git@vger.kernel.org
Subject: Re: Git subtree stumbles over annotated tags
Date: Sat, 21 May 2016 18:02:41 -0500	[thread overview]
Message-ID: <87iny7ovzi.fsf@waller.obbligato.org> (raw)
In-Reply-To: <56EAA5DC.1040801@googlemail.com> (Gregor Jasny's message of "Thu, 17 Mar 2016 13:41:00 +0100")

Gregor Jasny <gjasny@googlemail.com> writes:

> Hello,
>
> On 10/03/16 16:51, Gregor Jasny wrote:
>> today I discovered that it's a bad idea to "git subtree pull" from an
>> annotated tag. This issue got discussed in those two threads:
>>
>> http://comments.gmane.org/gmane.comp.version-control.git/247503> http://comments.gmane.org/gmane.comp.version-control.git/248395>
>> I was under the impression that it is fixed in recent versions of git
>> but my homebrew 2.7.0 still behaves badly. If I run the attached script
>> to reproduce the issue I get the following error message:
>
> For the record: this bug was already fixed in November:
> https://github.com/git/git/commit/5d65fe312e22594b7fec7349945fb0072987716b#diff-59f70cbe935ec223e3df413b94cab740
>
> Would it make sense to cherry-pick it into 2.7.x?

I wouldn't object to it if you can prepare the patch but git-subtree is
under heavy development and I don't have the free cycles to maintain a
"release" version of it.

                      -David

      reply	other threads:[~2016-05-21 23:02 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-03-10 15:51 Git subtree stumbles over annotated tags Gregor Jasny
2016-03-17 12:41 ` Gregor Jasny
2016-05-21 23:02   ` David A. Greene [this message]

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=87iny7ovzi.fsf@waller.obbligato.org \
    --to=greened@obbligato.org \
    --cc=git@vger.kernel.org \
    --cc=gjasny@googlemail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.