[RFC] Moving main git-subtree development. to GitHub

Hello all, I have decided that moving git-subtree development off of the main git mailing list is the best way to address the needs of git-subtree users while providing the flexibility necessary to get it in shape for eventual "official" status in the git project. Over the last year and a half I

Re: [PATCH v5 1/1] contrib/subtree: Add a test for subtree rebase that loses commits

Junio C Hamano <gits...@pobox.com> writes: > gree...@obbligato.org (David A. Greene) writes: > >>> I also notice that files_subtree/master4 does not appear in any of >>> the verification in the three tests that use the history being >>> prepared here, i.

Re: [PATCH] contrib/subtree: Remove --annotate

Junio C Hamano <gits...@pobox.com> writes: > gree...@obbligato.org (David A. Greene) writes: > >> Just to clarify, what is the expectation of things in contrib? >> Basically the same as other code? > > That heavily depends on your exit strategy. > > If

Re: [PATCH] contrib/subtree: add repo url to commit messages

Mathias Nyman writes: > For recalling where a subtree came from; git-subtree operations 'add' > and 'pull', when called with the parameter add this to the > commit message: > git-subtree-repo: I am sorry it tooks a couple of months to respond. I am finally coming up

Re: Subtree split unsquashes everything

Joseph Musser writes: > I ran `git subtree split -P=subdir/subdir/ -b newbranch` and the > outcome seems to be perfect except that each squash merge has turned > into a full merge, bringing along all history from the other repo. Why > does it do this and how can I preserve my repo

Re: Subtree Split Includes Commits Outside Prefix Directory

ELI writes: > I then reviewed the commit history of contrib/subtree/git-subtree.sh > and determined that the last successful subtree push was performed > prior to the integration of this change: >

Re: Git subtree stumbles over annotated tags

Gregor Jasny 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: >> >>

Re: [PATCH 0/3] subtree: add 'git-subtree-repo' and list command

Nicola Paolucci writes: > To my knowledge 'git subtree' currently lacks a way to > track where injected repositories come from originally. > Adding this information allows for useful extensions to > the command and makes it easier to use subtrees to track > external

Re: [PATCH] contrib/subtree: Split history with empty trees correctly

Marcus Brinkmann writes: >> Are you still able to do a re-roll on this? > > I have to admit that my interest has declined steeply since > discovering that subtree-split and filter-branch --subtree-filter give > different results from "git svn" on the subdirectory. The

Re: [PATCH] contrib/subtree: Split history with empty trees correctly

[ Sorry it took a few days to reply. I am absolutely slammed at work and will be for the next few weeks at least. The good news is that it's resulting in some nice work on git-subtree! :) ] Marcus Brinkmann <m.brinkm...@semantics.de> writes: > On 01/20/2016 05:05 AM, David A. Gre

Re: [PATCH] contrib/subtree: Split history with empty trees correctly

Marcus Brinkmann writes: > With my patch, "git subtree split -P" produces the same result (for my > data set) as "git filter-branch --subdirectory-filter", which is much > faster, because it selects the revisions to rewrite before rewriting. > As I am not using any of

Re: [PATCH] contrib/subtree: Remove --annotate

Junio C Hamano <gits...@pobox.com> writes: > David Greene <gree...@obbligato.org> writes: > >> From: "David A. Greene" <gree...@obbligato.org> >> >> Remove --annotate. This obviates the need for an --unannotate >> command, which

Re: [PATCH] Add a test for subtree rebase that loses commits

Eric Sunshine <sunsh...@sunshineco.com> writes: > On Mon, Jan 4, 2016 at 11:40 PM, David Greene <gree...@obbligato.org> wrote: >> This test merges an external tree in as a subtree, makes some commits >> on top of it and splits it back out. In the process th

Re: Odd rebase behavior

John Keeping writes: > It seems that the problem is introduces by --preserve-merges (and > -Xsubtree causes something interesting to happen as well). I see the > following behaviour: Thanks for narrowing this down! Is it possible this is actually a cherry-pick problem

Odd rebase behavior

Hi, The attached tests do not do what I expected them to do. I commented out the tests involving the new rebase empty commit behavior I just sent. The uncommented tests show the strange behavior. According to the rebase man page, rebase gathers commits as in "git log ..HEAD." However, that is

rebase -X subtree

Hi, I had a particular notion of what rebase -X subtree would do but I am apparently mistaken. What should be the result of the script below? I expected commits to be replayed on top of master with their trees adjusted to move files into a "files" directory. In the first case, the rebase seems

Re: [PATCH] contrib/subtree: unwrap tag refs

Rob Mayoff writes: > diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh > index 9f06571..b051600 100755 > --- a/contrib/subtree/git-subtree.sh > +++ b/contrib/subtree/git-subtree.sh > @@ -245,7 +245,10 @@ find_latest_squash() > case "$a" in

Re: [PATCH 1/7] contrib/subtree: Clean and refactor test code

David Greene <gree...@obbligato.org> writes: Just a ping to ask if anyone has looked at this. Apparently send-email uses the commit author as the From address. These messages are actually from me, sent on behalf of the commit authors. I've got more coming, but want to get these in

[PATCH 1/8] contrib/subtree: Use %B for split subject/body

From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900

[PATCH 2/8] contrib/subtree: Fix whitespaces

From: Techlive Zheng techlivezh...@gmail.com Previous code does not fulfill Git's whitespace policy. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 68 contrib/subtree/git-subtree.txt

[PATCH 3/8] contrib/subtree: Ignore testing directory

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/.gitignore |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/.gitignore b/contrib

[PATCH 4/8] contrib/subtree: Code cleaning and refactoring

From: Techlive Zheng techlivezh...@gmail.com Mostly prepare for the later tests refactoring. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 256 +++- 1 file

[PATCH 5/8] contrib/subtree: Make each test self-contained

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 1000 +--- 1 file changed, 693 insertions(+), 307 deletions(-) diff

[PATCH 6/8] contrib/subtree: Handle '--prefix' argument with a slash appended

From: Techlive Zheng techlivezh...@gmail.com 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |2 +- contrib

[PATCH 7/8] contrib/subtree: Remove --annotate

From: David A. Greene gree...@obbligato.org Remove --annotate. This obviates the need for an --unannotate command. We really want a more generalized commit message rewrite mechanism. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |6

[PATCH 8/8] Remove test artifaces from clean rule

From: David A. Greene gree...@obbligato.org There should be no need to remove 'mainline' nd 'subproj' in the Makefile as these should always be created under the test directory. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |1 - 1 file changed, 1

Rebased git-subtree changes

Here's a re-send of the git-subtree patches after rebasing onto master. Hopefully Junio will have better luck applying these. -David -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo

[PATCH 02/13] contrib/subtree: Use %B for Split Subject/Body

From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh

[PATCH 03/13] contrib/subtree: Better Error Handling for add

From: David A. Greene gree...@obbligato.org Check refspecs for validity before passing them on to other commands. This lets us generate more helpful error messages. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 12 +--- 1 file changed, 9

[PATCH 04/13] contrib/subtree: Fix Synopsis

From: David A. Greene gree...@obbligato.org Fix the documentation of add to show that a repository can be specified along with a commit. Suggested by Yann Dirson dir...@bertin.fr. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |6 ++ contrib

[PATCH 06/13] contrib/subtree: Make the Manual Directory if Needed

From: Jesper L. Nielsen lya...@gmail.com Before install git-subtree documentation, make sure the manpage directory exists. Signed-off-by: Jesper L. Nielsen lya...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |1 + 1 file changed, 1 insertion

[PATCH 09/13] contrib/subtree: Ignore testing directory

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/.gitignore |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/.gitignore b/contrib

[PATCH 08/13] contrib/subtree: Add vim modeline

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |2 ++ contrib/subtree/t/t7900-subtree.sh |2 ++ 2 files changed, 4 insertions(+) diff --git

[PATCH 07/13] contrib/subtree: Fix whitespaces

From: Techlive Zheng techlivezh...@gmail.com Previous code does not fulfill Git's whitespace policy. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 68 contrib/subtree/git-subtree.txt

[PATCH 05/13] contrib/subtree: Honor DESTDIR

From: Adam Tkac at...@redhat.com Teach git-subtree's Makefile to honor DESTDIR. Signed-off-by: Adam Tkac at...@redhat.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/subtree

[PATCH 13/13] contrib/subtree: Remove --annotate

From: David A. Greene gree...@obbligato.org Remove --annotate. This obviates the need for an --unannotate command. We really want a more generalized commit message rewrite mechanism. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |6

[PATCH 12/13] contrib/subtree: Handle '--prefix' argument with a slash appended

From: Techlive Zheng techlivezh...@gmail.com 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |2 +- contrib

[PATCH 10/13] contrib/subtree: Code cleaning and refactoring

From: Techlive Zheng techlivezh...@gmail.com Mostly prepare for the later tests refactoring. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 270 ++-- 1 file

[PATCH 11/13] contrib/subtree: Make each test self-contained

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 871 +--- 1 file changed, 613 insertions(+), 258 deletions(-) diff

[PATCH 01/13] contrib/subtree: Remove Test Number Comments

From: David A. Greene gree...@obbligato.org Delete the comments indicating test numbers as it causes maintenance headaches. t*.sh -i will help us find any broken tests. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 55

[PATCH 02/13] contrib/subtree: Use %B for Split Subject/Body

From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh

[PATCH 03/13] contrib/subtree: Better Error Handling for add

From: David A. Greene gree...@obbligato.org Check refspecs for validity before passing them on to other commands. This lets us generate more helpful error messages. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 12 +--- 1 file changed, 9

[PATCH 04/13] contrib/subtree: Fix Synopsis

From: David A. Greene gree...@obbligato.org Fix the documentation of add to show that a repository can be specified along with a commit. Suggested by Yann Dirson dir...@bertin.fr. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |6 ++ contrib

[PATCH 05/13] contrib/subtree: Honor DESTDIR

From: Adam Tkac at...@redhat.com Teach git-subtree's Makefile to honor DESTDIR. Signed-off-by: Adam Tkac at...@redhat.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/subtree

[PATCH 06/13] contrib/subtree: Make the Manual Directory if Needed

From: Jesper L. Nielsen lya...@gmail.com Before install git-subtree documentation, make sure the manpage directory exists. Signed-off-by: Jesper L. Nielsen lya...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |1 + 1 file changed, 1 insertion

[PATCH 07/13] contrib/subtree: Fix whitespaces

From: Techlive Zheng techlivezh...@gmail.com Previous code does not fulfill Git's whitespace policy. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 68 contrib/subtree/git-subtree.txt

[PATCH 09/13] contrib/subtree: Ignore testing directory

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/.gitignore |5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/contrib/subtree/.gitignore b/contrib

[PATCH 08/13] contrib/subtree: Add vim modeline

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |2 ++ contrib/subtree/t/t7900-subtree.sh |2 ++ 2 files changed, 4 insertions(+) diff --git

[PATCH 13/13] contrib/subtree: Remove --annotate

From: David A. Greene gree...@obbligato.org Remove --annotate. This obviates the need for an --unannotate command. We really want a more generalized commit message rewrite mechanism. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |6

[PATCH 12/13] contrib/subtree: Handle '--prefix' argument with a slash appended

From: Techlive Zheng techlivezh...@gmail.com 'git subtree merge' will fail if the argument of '--prefix' has a slash appended. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |2 +- contrib

[PATCH 10/13] contrib/subtree: Code cleaning and refactoring

From: Techlive Zheng techlivezh...@gmail.com Mostly prepare for the later tests refactoring. Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 270 ++-- 1 file

[PATCH 11/13] contrib/subtree: Make each test self-contained

From: Techlive Zheng techlivezh...@gmail.com Signed-off-by: Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 871 +--- 1 file changed, 613 insertions(+), 258 deletions(-) diff

Revised git-subtree Patches

Here is the set of revised patches to git-subtree. I think I've got everything cleaned up now. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH 1/7] Remove Test Number Comments

From: David A. Greene gree...@obbligato.org Delete the comments indicating test numbers as it causes maintenance headaches. t*.sh -i will help us find any broken tests. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/t/t7900-subtree.sh | 55

[PATCH 3/7] contrib/subtree: Add --unannotate

From: James Nylen jny...@gmail.com Teach git-subtree about --unannotate. This option strips a prefix from a commit message when doing a subtree split. Signed-off-by: James Nylen jny...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 11

[PATCH 5/7] contrib/subtree: Fix Synopsis

From: David A. Greene gree...@obbligato.org Fix the documentation of add to show that a repository can be specified along with a commit. Suggested by Yann Dirson dir...@bertin.fr. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh |6 ++ contrib

[PATCH 7/7] contrib/subtree: Make the Manual Directory if Needed

From: Jesper L. Nielsen lya...@gmail.com Before install git-subtree documentation, make sure the manpage directory exists. Signed-off-by: Jesper L. Nielsen lya...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |1 + 1 file changed, 1 insertion

[PATCH 6/7] contrib/subtree: Honor DESTDIR

From: Adam Tkac at...@redhat.com Teach git-subtree's Makefile to honor DESTDIR. Signed-off-by: Adam Tkac at...@redhat.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/subtree

git-subtree Patches to Apply

Here are all of the patches for git-subtree that have been posted to the mailing list that I could apply and test in a reasonable amount of time. These are all rebased from trunk as of tonight. Many apologies for being *so* behind. Work has been a bear but I'm hoping things will ease up in the

[PATCH 1/8] Use %B for Split Subject/Body

From: Techlive Zheng techlivezh...@gmail.com Use %B to format the commit message and body to avoid an extra newline if a commit only has a subject line. Author:Techlive Zheng techlivezh...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh

[PATCH 2/8] Add --unannotate

From: James Nylen jny...@gmail.com Teach git-subtree about --unannotate. This option strips a prefix from a commit message when doing a subtree split. Author:James Nylen jny...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 11

[PATCH 3/8] Better Error Handling for add

From: David A. Greene gree...@obbligato.org Check refspecs for validity before passing them on to other commands. This lets us generate more helpful error messages. Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/git-subtree.sh | 12 1 file changed, 12

[PATCH 4/8] Fix Synopsis

From: David A. Greene gree...@obbligato.org Fix the documentation of add to show that a repository can be specified along with a commit. Change commit to refspec in the synopsis for add. Suggested by Yann Dirson dir...@bertin.fr. Signed-off-by: David A. Greene gree...@obbligato.org

[PATCH 5/8] Honor DESTDIR

From: Adam Tkac at...@redhat.com Teach git-subtree's Makefile to honor DESTDIR. Author:Adam Tkac at...@redhat.com Signed-off-by:Adam Tkac at...@redhat.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/Makefile |4 ++-- 1 file changed, 2 insertions(+), 2

[PATCH 6/8] Make the Manual Directory if Needed

From: Jesper L. Nielsen lya...@gmail.com Before install git-subtree documentation, make sure the manpage directory exists. Author:Jesper L. Nielsen lya...@gmail.com Signed-off-by:Jesper L. Nielsen lya...@gmail.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib

[PATCH 8/8] Fix Documentation Typo

From: Michael Schubert msc...@elegosoft.com split is documented below push so fix the reference to it in push's documentation. Author:Michael Schubert msc...@elegosoft.com Signed-off-by:Michael Schubert msc...@elegosoft.com Signed-off-by: David A. Greene gree...@obbligato.org

[PATCH 7/8] Ignore git-subtree

From: Michael Schubert msc...@elegosoft.com Add the git-subtree command executable to .gitignore. Author:Michael Schubert msc...@elegosoft.com Signed-off-by:Michael Schubert msc...@elegosoft.com Signed-off-by: David A. Greene gree...@obbligato.org --- contrib/subtree/.gitignore |1