Skip to content
Permalink
Browse files

THIS REPO IS NOW OBSOLETE!

This git-subtree repository is obsolete now that git-subtree has been merged
into mainline git (yay!).  If you have patches you want to make to
git-subtree, I encourage you to email them to the core git mailing list,
where the hordes of awesome maintainers are well known for responding very
quickly to queries and patches, very much unlike me.

Thanks!

Avery
  • Loading branch information...
apenwarr committed May 1, 2012
1 parent 2793ee6 commit 8cd698957f57f62ec3d313403bebced2fdf751e5
Showing with 11 additions and 0 deletions.
  1. +11 −0 THIS-REPO-IS-OBSOLETE
@@ -0,0 +1,11 @@
Hi,

This git-subtree repository is obsolete now that git-subtree has been merged
into mainline git (yay!). If you have patches you want to make to
git-subtree, I encourage you to email them to the core git mailing list,
where the hordes of awesome maintainers are well known for responding very
quickly to queries and patches, very much unlike me.

Thanks!

Avery

17 comments on commit 8cd6989

@patcon

This comment has been minimized.

Copy link

replied May 16, 2012

Congratulations! Yeeeeeoooow!

Dog wanting to party.

@apenwarr

This comment has been minimized.

Copy link
Owner Author

replied May 16, 2012

@c00kiemon5ter

This comment has been minimized.

Copy link

replied May 17, 2012

that's great ⚡️ thanks

@dbingham

This comment has been minimized.

Copy link

replied May 23, 2012

Do you have any details on this? I can't find mention of it in any of the git release notes and finding it in the official git repo's history is a needle in the haystack search...

Any idea what version it will be in? Any changes to the syntax, options, etc?

@patcon

This comment has been minimized.

Copy link

replied May 23, 2012

$ git clone https://github.com/git/git.git /tmp/git; cd /tmp/git
$ git grep git-subtree

Just assuming it's the right stuff that shows up from that, so apologies if not :)

@dbingham

This comment has been minimized.

Copy link

replied May 23, 2012

Maybe I'm missing something, but I thought "grep" was for searching the working tree and index. Not history.

Incidentally that does prove that it has been merged into the git master branch (which I never doubted). Here's what I can do:

$ cd git/contrib/subtree
$ git log --oneline .
-- copy the commit id where it was introduced --
$ git log --online --all
-- search for that commit ID in the log --

What I find is this:
git log for subtree

Does that help you figure out what release of git it will be in? Doesn't help me. Figuring out which branch that ends up on and what release that corresponds to is beyond me. Maybe there are some git tools for figuring that out, but I don't know what they are. Hence the question. Figured it would be an "off the top of the head" type thing for the author of subtree. If not, I'll survive and I'm sure I'll run across it in my installed contrib dir at some point.

@apenwarr

This comment has been minimized.

Copy link
Owner Author

replied May 24, 2012

@patcon

This comment has been minimized.

Copy link

replied May 24, 2012

@dbingham yeah, sorry man -- couldn't answer the full question, but hey, that tip is amazing @apenwarr

git branch --contains COMMIT_ID

@dbingham

This comment has been minimized.

Copy link

replied May 24, 2012

@patcon no biggie. Appreciate taking a stab at it, though.

Agreed, @apenwarr, really cool tip that I hadn't seen before. Easy to miss those types of things in the mass of man pages around git commands. I'll definitely be putting "--contains" to good use...

@programmerdave

This comment has been minimized.

Copy link

replied Jun 5, 2012

Anyone know when this will be accessible through git?

@arjank

This comment has been minimized.

Copy link

replied Jun 9, 2012

@programmerdave it's not in 1.7.10.4 but it is in 1.7.11-rc2. So we just need to wait for the release of 1.7.11 (or compile from the repo).

@apenwarr it's good that the project made it into the git repo, but declaring this repo obsolete is premature. Please do check contrib/README of the main git repo.

@apenwarr

This comment has been minimized.

Copy link
Owner Author

replied Jun 10, 2012

@arjank

This comment has been minimized.

Copy link

replied Jun 12, 2012

There is for instance the line "these subdirectories are owned by their respective primary authors". Of course 'primary author' does not have to be you. On the other hand there are several references to this repo and your email address, which would indicate that this is still the place to be. I have not found other contact information.

@apenwarr

This comment has been minimized.

Copy link
Owner Author

replied Jun 12, 2012

@dbingham

This comment has been minimized.

Copy link

replied Jun 12, 2012

Far more relevant are the following quotes from the contrib README:

If you have patches to things in contrib/ area, the patch should be
first sent to the primary author, and then the primary author
should ack and forward it to me (git pull request is nicer).

Which implies a separate repo being maintained from which a pull request can be generated.

and

I do not work with projects whose upstream is svn

Which implies that the expectation is that there is an upstream (other than svn).

Of course, nothing prevents you from making your "upstream" of subtree something on your local machine (even, perhaps, a local branch of the official git repo). But, something public here on github (this repo?) seems like it would maintain the spirit of open source, public contribution, etc.

OTOH, I'm all for you doing whatever you want with software you write. Just pointing those things out since the topic came up.

Daniel

@apenwarr

This comment has been minimized.

Copy link
Owner Author

replied Jun 12, 2012

@dbingham

This comment has been minimized.

Copy link

replied Jun 12, 2012

Works for me. Thanks for the awesome tool, by the way.

Daniel

Please sign in to comment.
You can’t perform that action at this time.