{"thread":{"id":"41664","subject":"Git subtree stumbles over annotated tags","startedAt":"2016-03-10T15:51:37Z","lastAt":"2016-05-21T23:02:41Z","messageCount":3,"participants":["Gregor Jasny","David A. Greene"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"280559","messageId":"56E19809.5040305@googlemail.com","threadId":"41664","inReplyTo":null,"subject":"Git subtree stumbles over annotated tags","fromName":"Gregor Jasny","fromEmail":"gjasny@googlemail.com","sentAt":"2016-03-10T15:51:37Z","receivedAt":"2016-03-10T15:51:37Z","isPatch":false,"sender":{"key":"gjasny@googlemail.com","avatar":null},"body":"Hello,\n\ntoday I discovered that it's a bad idea to \"git subtree pull\" from an\nannotated tag. This issue got discussed in those two threads:\n\nhttp://comments.gmane.org/gmane.comp.version-control.git/247503\nhttp://comments.gmane.org/gmane.comp.version-control.git/248395\n\nI was under the impression that it is fixed in recent versions of git\nbut my homebrew 2.7.0 still behaves badly. If I run the attached script\nto reproduce the issue I get the following error message:\n\n> git push using:  sub somebranch\n> fatal: 6d621d73ca18dc90424de0929357b5ae62988e00 is not a valid 'commit' object\n> Can't copy commit ab38e3fe1ff27f7f87505db37d35adc5c3ceed27\n\n> git ls-remote sub\n> 99be40f8e3a4c926d45507be53ab6918789b3a52\tHEAD\n> 99be40f8e3a4c926d45507be53ab6918789b3a52\trefs/heads/master\n> 6d621d73ca18dc90424de0929357b5ae62988e00\trefs/tags/sometag\n> 99be40f8e3a4c926d45507be53ab6918789b3a52\trefs/tags/sometag^{}\n\nBesides handling this bug could you please give me a hint how to repair\nmy main repository? The problematic subtree pull happened some time ago\nso I cannot alter the pull itself. I could go the brutal approach and\nremove, then re-add the subtree but I guess there is a smarter approach.\nAny help is appreciated!\n\nThanks,\nGregor\n"},{"id":"281026","messageId":"56EAA5DC.1040801@googlemail.com","threadId":"41664","inReplyTo":"56E19809.5040305@googlemail.com","subject":"Re: Git subtree stumbles over annotated tags","fromName":"Gregor Jasny","fromEmail":"gjasny@googlemail.com","sentAt":"2016-03-17T12:41:00Z","receivedAt":"2016-03-17T12:41:00Z","isPatch":false,"sender":{"key":"gjasny@googlemail.com","avatar":null},"body":"Hello,\n\nOn 10/03/16 16:51, Gregor Jasny wrote:\n> today I discovered that it's a bad idea to \"git subtree pull\" from an\n> annotated tag. This issue got discussed in those two threads:\n>\n> http://comments.gmane.org/gmane.comp.version-control.git/247503\n> http://comments.gmane.org/gmane.comp.version-control.git/248395\n>\n> I was under the impression that it is fixed in recent versions of git\n> but my homebrew 2.7.0 still behaves badly. If I run the attached script\n> to reproduce the issue I get the following error message:\n\nFor the record: this bug was already fixed in November:\nhttps://github.com/git/git/commit/5d65fe312e22594b7fec7349945fb0072987716b#diff-59f70cbe935ec223e3df413b94cab740\n\nWould it make sense to cherry-pick it into 2.7.x?\n\nThanks,\nGregor\n"},{"id":"287160","messageId":"87iny7ovzi.fsf@waller.obbligato.org","threadId":"41664","inReplyTo":"56EAA5DC.1040801@googlemail.com","subject":"Re: Git subtree stumbles over annotated tags","fromName":"David A. Greene","fromEmail":"greened@obbligato.org","sentAt":"2016-05-21T23:02:41Z","receivedAt":"2016-05-21T23:02:41Z","isPatch":false,"sender":{"key":"greened@obbligato.org","avatar":"https://avatars.githubusercontent.com/u/5291869?v=4"},"body":"Gregor Jasny <gjasny@googlemail.com> writes:\n\n> Hello,\n>\n> On 10/03/16 16:51, Gregor Jasny wrote:\n>> today I discovered that it's a bad idea to \"git subtree pull\" from an\n>> annotated tag. This issue got discussed in those two threads:\n>>\n>> http://comments.gmane.org/gmane.comp.version-control.git/247503> http://comments.gmane.org/gmane.comp.version-control.git/248395>\n>> I was under the impression that it is fixed in recent versions of git\n>> but my homebrew 2.7.0 still behaves badly. If I run the attached script\n>> to reproduce the issue I get the following error message:\n>\n> For the record: this bug was already fixed in November:\n> https://github.com/git/git/commit/5d65fe312e22594b7fec7349945fb0072987716b#diff-59f70cbe935ec223e3df413b94cab740\n>\n> Would it make sense to cherry-pick it into 2.7.x?\n\nI wouldn't object to it if you can prepare the patch but git-subtree is\nunder heavy development and I don't have the free cycles to maintain a\n\"release\" version of it.\n\n                      -David\n"}]}