> -Original Message-
> From: Johannes Schindelin
>
> Hi Roger,
>
>
> On Wed, 2 Jan 2019, Strain, Roger L. wrote:
>
> > TL;DR: Current script uses git rev-list to retrieve all commits which
> > are reachable from HEAD but not from . Is there a syn
> -Original Message-
> From: Marc Balmer
> Sent: Monday, December 31, 2018 5:24 AM
> To: Duy Nguyen
> Cc: Git Mailing List ; Strain, Roger L.
> ; Junio C Hamano
> Subject: Re: Regression in git-subtree.sh, introduced in 2.20.1, after
> 315a84f9aa0e2e62
Original failed to include the note that this patch is for the 'next' branch,
my apologies.
> -Original Message-
> From: Roger Strain
> Sent: Friday, October 12, 2018 8:52 AM
> To: git@vger.kernel.org
> Cc: Strain, Roger L.
> Subject: [PATCH] subtree:
individually, along with a single
commit that makes no functional change but performs a small refactor of the
existing code. Hopefully that will make reviewing it a simpler task. This is my
first attempt at submitting a patch back, so apologies if I've made any errors
in the process.
Strain, Roger
commit, based on the order in which they
were processed.
New behavior compares the merge base between the commits to determine if
a new merge commit is necessary to maintain history despite the identical
content.
Signed-off-by: Strain, Roger L
---
contrib/subtree/git-subtree.sh | 21
relocates the code to be called
recursively into a new method to simply comparisons of later
commits.
Signed-off-by: Strain, Roger L
---
contrib/subtree/git-subtree.sh | 78 ++
1 file changed, 42 insertions(+), 36 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh
generated synthetic commits will properly match previously-generated
commits, allowing successful pushing to a prior subtree repo.
Signed-off-by: Strain, Roger L
---
contrib/subtree/git-subtree.sh | 26 --
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/contr
commits part of the subtree history and include them at the
beginning of the synthetic history, causing the resulting hashes to be
incorrect for all later commits.
Signed-off-by: Strain, Roger L
---
contrib/subtree/git-subtree.sh | 14 +++---
1 file changed, 7 insertions(+), 7 deletions
I emailed the group yesterday regarding a possible error in the subtree script.
I've continued debugging and since have been able to reproduce the problem. In
fact, there are two failure cases which may expose three different problems. To
demonstrate, the following commands create two repos (mai
We've got a fairly large codebase that's been through two previous source
control systems, and recently converted to git. We have shared modules (but
with customization) between projects, so subtrees looked like a good approach
to sharing the code between projects. I've encountered a problem pus
10 matches
Mail list logo
