of these, nor
have I really looked at them closely to decide if they are worth
including at all. Be sure to exameine not just the discussion around
the specific patches, but also the other patches in each series...)
- Matthew Ogilvie
--
To unsubscribe from this list: send
.]
- Matthew
2014/1/23 Matthew Ogilvie mmogilvi_...@miniinfo.net:
On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote:
2013/12/7 Matthew Ogilvie mmogilvi_...@miniinfo.net
Subject: [PATCH 1/4] subtree: support split --rejoin --squash
Allow using --squash
On Wed, Jan 22, 2014 at 03:58:28PM +0100, Pierre Penninckx wrote:
2013/12/7 Matthew Ogilvie mmogilvi_...@miniinfo.net
Subject: [PATCH 1/4] subtree: support split --rejoin --squash
Allow using --squash with git subtree split --rejoin. It
will still split off (and save to --branch
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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 merge --squash works).
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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 well
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
? Do we need to also
support Pierre Penninckx's split --squash semantics somehow? If
so, what command line options would allow for distinguishing the
two cases?
--
Matthew Ogilvie [mmogilvi_...@miniinfo.net]
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message
Standard cvs add never does any recursion. With standard
cvs, cvs add dir will either add just the dir to
the repository, or error out. Prior to this change, git-cvsserver
would try to recurse (perhaps re-adding sandbox-removed files?) into
the existing directory instead.
Signed-off-by: Matthew
,
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 probably doesn't work with branches or
tags either (untested)?
Signed-off-by: Matthew Ogilvie mmogilvi_
who really
wants features like these can use these patches as a starting
point. That said, perhaps some of the trivial cleanup
patches could go in now?
---
Matthew Ogilvie (20):
cvsserver t9400: add basic 'cvs log' test
cvsserver: removed unused sha1Or-k mode from
'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 mmogilvi_...@miniinfo.net
---
t/t9400-git-cvsserver-server.sh | 70
- Comment that it should not be considered a complete list.
- #'annotate' comment - Uncommented annotate line is 2 lines earlier.
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
git-cvsserver.perl | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/git
Instead of a comment, we should really add test cases and actually fix it.
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
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 mmogilvi_...@miniinfo.net
---
git
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
contents).
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
Remove:
- _headrev() - It uses similar functionality from getmeta() and gethead().
- gethistory() - It uses similar functions gethistorydense() and getlog().
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
git-cvsserver.perl | 36
1 file
-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
This allows getmeta() to recognize any commitish (sha1,
tag/branch name, etc).
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
git-cvsserver.perl | 156 +
1 file changed, 145 insertions(+), 11 deletions(-)
diff --git a/git
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
Nothing sets sticky yet, or uses the values set by this, but soon...
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
git-cvsserver.perl | 171 -
1 file changed, 169 insertions(+), 2 deletions(-)
diff --git a/git-cvsserver.perl b
Some field conversion was already duplicated, and more calls will
be added soon.
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
git-cvsserver.perl | 176 -
1 file changed, 105 insertions(+), 71 deletions(-)
diff --git a/git
Signed-off-by: Matthew Ogilvie mmogilvi_...@miniinfo.net
---
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
28 matches
Mail list logo
