Junio C Hamano 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 the aspiration is to move up
Junio C Hamano 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.e. if master4 is silently
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 dependencies.
Thanks for wor
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:
>>
>> http://comments.gmane.org/gmane.comp.version-control.git/247503>
>> http://comm
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:
> https://git.kernel.org/cgit/git/git.git/commit/contrib/subtree/git-subtree.sh?id=933cfeb90b5d03b4096
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 history, includ
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 for air at work.
What
[ 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 writes:
> On 01/20/2016 05:05 AM, David A. Greene wrote:
>> Ma
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 the advanced features of "gi
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 reason is
> that git-svn in
ned-off-by: Techlive Zheng
> Signed-off-by: David A. Greene
> ---
> contrib/subtree/t/Makefile | 31 ---
> contrib/subtree/t/t7900-subtree.sh | 103
> -
> 2 files changed, 79 insertions(+), 55 deletions(-)
>
> diff --gi
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
>
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
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
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 since --preserve-merges f
that we don't forget to
>> fix it.
>>
>> Signed-off-by: David A. Greene
>> ---
>> diff --git a/t/t3427-rebase-subtree.sh b/t/t3427-rebase-subtree.sh
>> @@ -0,0 +1,68 @@
>> +#!/bin/sh
>> +
>> +test_description='git rebase
Junio C Hamano writes:
> David Greene writes:
>
>> From: "David A. Greene"
>>
>> Remove --annotate. This obviates the need for an --unannotate
>> command, which is both an obvious addition and difficult to define
>> due to the numerous ways o
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
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 n
From: Techlive Zheng
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
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |5 +++
contrib/subtree/t/t7900-subtree.sh | 73
From: James Nylen
Teach git-subtree about --unannotate. This option strips a prefix
from a commit message when doing a subtree split.
Author:James Nylen
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh | 11 +-
contrib/subtree/git-subtree.txt| 15
From: "David A. Greene"
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
---
contrib/subtree/git-subtree.sh | 12
1 file changed, 12 insertions(+)
diff --git
From: "David A. Greene"
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 .
Signed-off-by: David A. Greene
---
contrib/subtree/git-s
From: Adam Tkac
Teach git-subtree's Makefile to honor DESTDIR.
Author:Adam Tkac
Signed-off-by:Adam Tkac
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/Makefile b/contrib/su
From: "Jesper L. Nielsen"
Before install git-subtree documentation, make sure the manpage
directory exists.
Author:Jesper L. Nielsen
Signed-off-by:Jesper L. Nielsen
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |1 +
1 file changed, 1 insertion(+)
di
From: Michael Schubert
"split" is documented below "push" so fix the reference to it in
push's documentation.
Author:Michael Schubert
Signed-off-by:Michael Schubert
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.txt |2 +-
1 file c
From: Michael Schubert
Add the git-subtree command executable to .gitignore.
Author:Michael Schubert
Signed-off-by:Michael Schubert
Signed-off-by: David A. Greene
---
contrib/subtree/.gitignore |1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/subtree/.gitignore b
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
From: "David A. Greene"
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
---
contrib/subtree/t/t7900-subtree.sh | 55
1 file changed, 55
From: Techlive Zheng
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
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |6 +-
contrib/subtree/t/t7900-subtree.sh | 15
From: "David A. Greene"
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
---
contrib/subtree/git-subtree.sh | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
di
From: James Nylen
Teach git-subtree about --unannotate. This option strips a prefix
from a commit message when doing a subtree split.
Signed-off-by: James Nylen
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh | 11 +--
contrib/subtree/git-subtree.txt
From: "David A. Greene"
Fix the documentation of add to show that a repository can be
specified along with a commit.
Suggested by Yann Dirson .
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |6 ++
contrib/subtree/git-subtree.txt |3 ++-
2 files
From: "Jesper L. Nielsen"
Before install git-subtree documentation, make sure the manpage
directory exists.
Signed-off-by: Jesper L. Nielsen
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/subtree/Makefile
From: Adam Tkac
Teach git-subtree's Makefile to honor DESTDIR.
Signed-off-by: Adam Tkac
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 05
From: "David A. Greene"
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
---
contrib/subtree/t/t7900-subtree.sh | 55
1 file changed, 55
From: Techlive Zheng
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
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |2 +-
contrib/subtree/t/t7900-subtree.sh | 15
From: "David A. Greene"
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
---
contrib/subtree/git-subtree.sh | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
di
From: "David A. Greene"
Fix the documentation of add to show that a repository can be
specified along with a commit.
Suggested by Yann Dirson .
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |6 ++
contrib/subtree/git-subtree.txt |3 ++-
2 files
From: Adam Tkac
Teach git-subtree's Makefile to honor DESTDIR.
Signed-off-by: Adam Tkac
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 05
From: "Jesper L. Nielsen"
Before install git-subtree documentation, make sure the manpage
directory exists.
Signed-off-by: Jesper L. Nielsen
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/subtree/Makefile
From: Techlive Zheng
Previous code does not fulfill Git's whitespace policy.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh | 68
contrib/subtree/git-subtree.txt| 42 ++---
contrib/subtree/t/t7900-subtree.sh |
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/.gitignore |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3..59aeeb4 100644
--- a/contrib
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |2 ++
contrib/subtree/t/t7900-subtree.sh |2 ++
2 files changed, 4 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
From: "David A. Greene"
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
---
contrib/subtree/git-subtree.sh |6 +
contrib/subtree/t/t7900-subtree
From: Techlive Zheng
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |2 +-
contrib/subtree/t/t7900-subtree.sh | 19
From: Techlive Zheng
Mostly prepare for the later tests refactoring.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/t/t7900-subtree.sh | 270 ++--
1 file changed, 136 insertions(+), 134 deletions(-)
diff --git a/contrib
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/t/t7900-subtree.sh | 871 +---
1 file changed, 613 insertions(+), 258 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900
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
From: "David A. Greene"
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
---
contrib/subtree/t/t7900-subtree.sh | 55
1 file changed, 55
From: Techlive Zheng
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
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |2 +-
contrib/subtree/t/t7900-subtree.sh | 15
From: "David A. Greene"
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
---
contrib/subtree/git-subtree.sh | 12 +---
1 file changed, 9 insertions(+), 3 deletions(-)
di
From: "David A. Greene"
Fix the documentation of add to show that a repository can be
specified along with a commit.
Suggested by Yann Dirson .
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |6 ++
contrib/subtree/git-subtree.txt |3 ++-
2 files
From: "Jesper L. Nielsen"
Before install git-subtree documentation, make sure the manpage
directory exists.
Signed-off-by: Jesper L. Nielsen
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |1 +
1 file changed, 1 insertion(+)
diff --git a/contrib/subtree/Makefile
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/.gitignore |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3..59aeeb4 100644
--- a/contrib
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |2 ++
contrib/subtree/t/t7900-subtree.sh |2 ++
2 files changed, 4 insertions(+)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
From: Techlive Zheng
Previous code does not fulfill Git's whitespace policy.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh | 68
contrib/subtree/git-subtree.txt| 42 ++---
contrib/subtree/t/t7900-subtree.sh |
From: Adam Tkac
Teach git-subtree's Makefile to honor DESTDIR.
Signed-off-by: Adam Tkac
Signed-off-by: David A. Greene
---
contrib/subtree/Makefile |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 05
From: "David A. Greene"
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
---
contrib/subtree/git-subtree.sh |6 +
contrib/subtree/t/t7900-subtree
From: Techlive Zheng
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |2 +-
contrib/subtree/t/t7900-subtree.sh | 19
From: Techlive Zheng
Mostly prepare for the later tests refactoring.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/t/t7900-subtree.sh | 270 ++--
1 file changed, 136 insertions(+), 134 deletions(-)
diff --git a/contrib
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/t/t7900-subtree.sh | 871 +---
1 file changed, 613 insertions(+), 258 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900
Here are the subtree fixes I've got with changes in response to
feedback.
--
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
From: Techlive Zheng
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
Signed-off-by: David A. Greene
---
contrib/subtree/t/t7900-subtree.sh | 11 +++
1 file changed, 11 insertions(+)
diff
From: Techlive Zheng
Previous code does not fulfill Git's whitespace policy.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh | 68
contrib/subtree/git-subtree.txt| 42 ++---
contrib/subtree/t/t7900-subtree.sh |
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/.gitignore |5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/contrib/subtree/.gitignore b/contrib/subtree/.gitignore
index 91360a3..59aeeb4 100644
--- a/contrib
From: Techlive Zheng
Mostly prepare for the later tests refactoring.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/t/t7900-subtree.sh | 256 +++-
1 file changed, 136 insertions(+), 120 deletions(-)
diff --git a/contrib
From: Techlive Zheng
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/t/t7900-subtree.sh | 1000 +---
1 file changed, 693 insertions(+), 307 deletions(-)
diff --git a/contrib/subtree/t/t7900-subtree.sh
b/contrib/subtree/t/t7900
From: Techlive Zheng
'git subtree merge' will fail if the argument of '--prefix' has a slash
appended.
Signed-off-by: Techlive Zheng
Signed-off-by: David A. Greene
---
contrib/subtree/git-subtree.sh |2 +-
contrib/subtree/t/t7900-subtree.sh | 20 +
From: "David A. Greene"
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
---
contrib/subtree/git-subtree.sh |6 +
contrib/subtree/t/t7900-subtree
From: "David A. Greene"
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
---
contrib/subtree/Makefile |1 -
1 file changed, 1 deletion(-)
71 matches
Mail list logo
