=git&m=136415882128742&w=2
http://marc.info/?l=git&m=136415654228062&w=2
- Miscellaneous
And probably others...
(I don't know if these are the latest or "best" versions of these, nor
have I really looked at them closely to decide if they are worth
includ
ne or after the previous message, not at the top, so new
people can more easily pick up the discussion.]
- Matthew
> 2014/1/23 Matthew Ogilvie :
> > On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote:
> >> 2013/12/7 Matthew Ogilvie
>
On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote:
> 2013/12/7 Matthew Ogilvie
> > Subject: [PATCH 1/4] subtree: support split --rejoin --squash
> >
> > Allow using --squash with "git subtree split --rejoin". It
> > will still split of
Bug description: Unless you use --ignore-joins, "git subtree split"'s
optimization to avoid re-scanning all of history can trim too much.
Any new merged branches that have parents before the previous "split"
will not be re-attached properly in the split-off subtree.
In the extreme case (if all the
(similar to
how "git subtree merge --squash" works).
Signed-off-by: Matthew Ogilvie
---
I can think of a couple of possible objections to this patch.
Are these (or any others) worth fixing?
1. Perhaps someone want the saved subtree (--branch) to have
a squashed representation as
Signed-off-by: Matthew Ogilvie
---
contrib/subtree/git-subtree.sh | 8 +++-
contrib/subtree/git-subtree.txt | 9 -
2 files changed, 7 insertions(+), 10 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 998a9c5..56d915f 100755
--- a
Signed-off-by: Matthew Ogilvie
---
contrib/subtree/git-subtree.sh | 37 +
contrib/subtree/git-subtree.txt | 4
2 files changed, 33 insertions(+), 8 deletions(-)
diff --git a/contrib/subtree/git-subtree.sh b/contrib/subtree/git-subtree.sh
index 56d915f
ed
to finish it.
I'm fairly sure I can make this work without new adverse effects,
but if someone sees something I'm missing, let me know.
Does anyone have any suggestions about the UI? Do we need to also
support Pierre Penninckx's "split --squash" semantics some
branches simply encode git
commit IDs in a way that resembles CVS revision numbers,
dropping all normal CVS structural relations between different
revision numbers.
- FUTURE: "log" doesn't try to work properly at all with branches
and tags.
- FUTURE: "annotate&q
ectory instead.
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 2 --
1 file changed, 2 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 8a7106d..4d514b4 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -543,8 +543,6 @@ sub req_add
my $updater
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 28
1 file changed, 28 insertions(+)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index dca0ed6..1d929df 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -2309,6 +2309,9 @@ sub filenamesplit
Some field conversion was already duplicated, and more calls will
be added soon.
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 176 -
1 file changed, 105 insertions(+), 71 deletions(-)
diff --git a/git-cvsserver.perl b/git
Nothing sets sticky yet, or uses the values set by this, but soon...
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 171 -
1 file changed, 169 insertions(+), 2 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl| 24
t/t9401-git-cvsserver-crlf.sh | 35 +++
2 files changed, 55 insertions(+), 4 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 4d514b4..c5ebfa0
Signed-off-by: Matthew Ogilvie
---
Documentation/git-cvsserver.txt | 37 +
1 file changed, 37 insertions(+)
diff --git a/Documentation/git-cvsserver.txt b/Documentation/git-cvsserver.txt
index 88d814a..940c2ba 100644
--- a/Documentation/git-cvsserver.txt
This allows getmeta() to recognize any commitish (sha1,
tag/branch name, etc).
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 156 +
1 file changed, 145 insertions(+), 11 deletions(-)
diff --git a/git-cvsserver.perl b/git
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 228 ++---
1 file changed, 198 insertions(+), 30 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 7bb6f83..5e558d1 100755
--- a/git-cvsserver.perl
+++ b/git
Signed-off-by: Matthew Ogilvie
---
t/t9402-git-cvsserver-refs.sh | 558 ++
1 file changed, 558 insertions(+)
create mode 100755 t/t9402-git-cvsserver-refs.sh
diff --git a/t/t9402-git-cvsserver-refs.sh b/t/t9402-git-cvsserver-refs.sh
new file mode 100755
: Matthew Ogilvie
---
git-cvsserver.perl | 91 ++
1 file changed, 91 insertions(+)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 1d929df..4eecc0b 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -3807,6 +3807,97 @@ sub
Remove:
- _headrev() - It uses similar functionality from getmeta() and gethead().
- gethistory() - It uses similar functions gethistorydense() and getlog().
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 36
1 file changed, 4 insertions
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 220 ++---
1 file changed, 159 insertions(+), 61 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 9e71f30..eb8f138 100755
--- a/git-cvsserver.perl
+++ b/git
from contents).
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 38 +-
1 file changed, 5 insertions(+), 33 deletions(-)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index b8eddab..f43d287 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver
These will be used soon, but not yet.
PERFORMANCE NOTE: getMetaFromCommithash() does not scale well as currently
implemented. See comment for possible optimization strategies.
Fortunately, it will only be used in cases that would not have worked
at all before this change.
Signed-off-by: Matthew
It used to leave off the prefix.
Other than the conflict marker, this change doesn't effect
external functionality. No new features, and the DB schema
is unchanged such that it continues to store just
the stripped rev numbers (without prefix).
Signed-off-by: Matthew Ogilvie
---
git
Instead of a comment, we should really add test cases and actually fix it.
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 4
1 file changed, 4 insertions(+)
diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 595865c..cc39b6b 100755
--- a/git-cvsserver.perl
+++ b/git
- Comment that it should not be considered a complete list.
- #'annotate' comment - Uncommented annotate line is 2 lines earlier.
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/git-cvsserver.
No functionality changes, but these comments should make it easier to
understand how it works.
Signed-off-by: Matthew Ogilvie
---
git-cvsserver.perl | 46 ++
1 file changed, 42 insertions(+), 4 deletions(-)
diff --git a/git-cvsserver.perl b/git
'cvs log' output is arguably deficient in a number of ways
(see the comment added with the test), but add a test for
the current output to detect for accidental regressions.
Signed-off-by: Matthew Ogilvie
---
t/t9400-git-cvsserver-server.sh | 70 +++
vs how many adjustments maintainers want, I might gradually get
this into a ready-to-include state (possibly weeks or months). But
my primary goal here is just to have it available publicly
somewhere (like the mailing list) where someone who really
wants features like these can use these patches as a
29 matches
Mail list logo
