Fredrik Gustafsson writes:
> Sometimes the server wants to communicate directly to the git user.
> ...
> For example:
> gitolite has something called wild repos[1]. The management is
> cumbersome and if you misspell when you clone a repo you might instead
> create a new repo.
>
> This could have
Nguyen Thai Ngoc Duy writes:
> On Sat, Jul 28, 2012 at 04:18:49PM +0300, Nikolay Vladimirov wrote:
>> But the behavior now seems kind of strange, or maybe I'm missing something:
>> # git config foobar; echo $?
>> error: key does not contain a section: foobar
>> 255
>>
>> # git config foobar.info
Martin von Zweigbergk writes:
>> I incorrectly assumed that ignore_merges was about revision
>> traversal, but now I think it's only diff output from 'git log' (and
>> possibly others).
Yeah, I realized the same after I wrote the response last night and
went to bed. I am glad you figured all ou
Heiko Voigt writes:
> Note: This is a code cleanup and does not fix any bugs. As a side effect
> the variables containing the parsed flags to "git submodule status" are
> passed down recursively. So everything was already behaving as expected.
If that is the case, shouldn't we stop passing anyth
Sorry, I meant to CC the list. See below.
On Sat, Jul 28, 2012 at 9:56 PM, Martin von Zweigbergk
wrote:
> On Fri, Jul 27, 2012 at 11:52 PM, Junio C Hamano wrote:
>> Junio C Hamano writes:
>>
>> It seems to have some interaction with your other topic, though.
>> These two patches alone will pass
Hi,
sometimes git communicates with something that's not git on the other
side (gitolite and github for example).
Sometimes the server wants to communicate directly to the git user.
git isn't really designed for this. gitolite solves this by do user
interaction on STDERR instead. The bad thing ab
Hello!
send-email (tested versions 1.7.9.2 and 1.7.10.4) breaks email addresses.
Steps to reproduce:
Modify file.
git commit --author="Michał Tz " modified.file -m "Test"
git format-patch -o patches origin
Now, the patch seems to have the address right, see [1]
git send-email --to myown.a
On 2012.7.28 1:02 PM, Jonathan Nieder wrote:
> Jonathan Nieder wrote:
>> Michael G Schwern wrote:
>
>>> I would suggest that worrying whether a few lines of code are introduced now
>>> or 10 patches later in the same branch which is all going to be merged in
>>> one
>>> go (and retesting the patc
Jonathan Nieder wrote:
> Michael G Schwern wrote:
>> I would suggest that worrying whether a few lines of code are introduced now
>> or 10 patches later in the same branch which is all going to be merged in one
>> go (and retesting the patches after it) is not the most important thing.
[...]
> In
Michael G Schwern wrote:
> On 2012.7.28 12:30 PM, Jonathan Nieder wrote:
>> Since this part of the series is not tested with SVN 1.7, this is
>> basically adding dead code, right? That could be avoided by
>> reordering the changes to keep "canonicalize_url" as-is until later in
>> the series when
On 2012.7.28 12:30 PM, Jonathan Nieder wrote:
>> I didn't know about that. I don't know what your SVN backwards compat
>> requirements are, but if that behavior goes back far enough in SVN to satisfy
>> you folks, then canonicalize_url() should fall back to
>> SVN::_Core::svn_path_canonicalize().
On 2012.7.28 7:16 AM, Jonathan Nieder wrote:
> Michael G. Schwern wrote:
>
>> Rather than guess what SVN is going to do for each version, make the test use
>> the branch name that was actually created.
> [...]
>> -git rev-parse "refs/remotes/not-a%40{0}reflog"
>> +git rev-p
Michael G Schwern wrote:
> On 2012.7.28 6:50 AM, Jonathan Nieder wrote:
>> If I am reading Subversion r873487 correctly, in ancient times,
>> svn_path_canonicalize() did the appropriate tweaking for URIs. Today
>> its implementation is comforting:
>>
>> const char *
>> svn_path_canonic
On 2012.7.28 7:11 AM, Jonathan Nieder wrote:
> Yay! Am I correct in imagining this makes the following sequence of
> commands[1] no longer trip an assertion failure in svn_path_join[2]
> with SVN 1.6?
>
> git svn init -Thttp://trac-hacks.org/svn/tagsplugin/trunk \
> -thttp://t
On 2012.7.28 6:55 AM, Jonathan Nieder wrote:
> Michael G. Schwern wrote:
>> --- a/perl/Git/SVN/Utils.pm
>> +++ b/perl/Git/SVN/Utils.pm
>> @@ -86,6 +86,27 @@ sub _collapse_dotdot {
>>
>>
>> sub canonicalize_path {
>> +my $path = shift;
>> +
>> +# The 1.7 way to do it
>> +if ( define
On 2012.7.28 6:50 AM, Jonathan Nieder wrote:
>> --- a/perl/Git/SVN/Utils.pm
>> +++ b/perl/Git/SVN/Utils.pm
> [...]
>> @@ -100,6 +102,20 @@ API as a URL.
>> =cut
>>
>> sub canonicalize_url {
>> +my $url = shift;
>> +
>> +# The 1.7 way to do it
>> +if ( defined &SVN::_Core::svn_uri_ca
Since commit bbc09c22 ("grep: rip out support for external grep",
12-01-2010), test number 60 ("grep -C1 hunk mark between files") is
essentially the same as test number 59.
Test 59 was intended to verify the behaviour of git-grep resulting
from multiple invocations of an external grep. As part o
In particular, the final test ('flags and then non flags') fails
intermittently, depending on how much time elapsed between the
invocations of "git commit-tree" when creating the commits which
later have their commit id's compared. For example, if the commits
for childid-3 and childid-4 are create
Hi Junio,
I actually tested v1.7.12-rc0-22-gcdd159b, thus:
$ time $(GIT_SKIP_TESTS='t0061.3 t0070.3 t9010 t9300' make test >
test-outp1 2>&1)
real137m11.901s
user118m55.071s
sys 59m50.695s
$
the result, ignoring the explicity skipped tests (nothing new there)
Junio C Hamano wrote:
> Jonathan Nieder writes:
>
>> FWIW I find Junio's test_setup name more self-explanatory. What
>> mnemonic should I be using to remember the _fixture name?
>
> Previous exposure to things like Rails?
I did once have a brief look at ruby, but my "new language to learn"
lis
Jonathan Nieder wrote:
> [...]
>> [1] For example, what should/will happen if someone uses test_must_fail,
>> test_might_fail, etc., within the test_fixture script? Should they simply
>> be banned within a text_fixture?
>
> Why wouldn't they act just like they do in test_expect_success blocks?
He
On Saturday, 28. July 2012 at 09:21, Heiko Voigt wrote:
> On Tue, Jul 24, 2012 at 01:33:44PM -0700, Justin Spahr-Summers wrote:
> > Here's some real output, with a couple specific names removed, starting
> > from the root of the top-level repository (where External/twui is a
> > submodule):
> >
On Tue, Jul 24, 2012 at 01:33:44PM -0700, Justin Spahr-Summers wrote:
> Here's some real output, with a couple specific names removed, starting from
> the root of the top-level repository (where External/twui is a submodule):
>
> $ cd External/twui
> $ git submodule add git://github.com/petejkim/
Heiko Voigt writes:
> if (!git_index_file) {
> - git_index_file = xmalloc(strlen(git_dir) + 7);
> + git_index_file = xmalloc(strlen(git_dir) + 7 + 8);
> sprintf(git_index_file, "%s/index", git_dir);
> }
[...]
> - if (!memcmp(ent->b
pfxlen can be longer than the path in objdir when relative_base contains
the path to gits object directory.
Signed-off-by: Heiko Voigt
---
sha1_file.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/sha1_file.c b/sha1_file.c
index 4ccaf7a..631d0dd 100644
--- a/sha1_file.
Hi,
just to verify that this is unlikely just a hardware issue on one machine. I
today experienced this failure on master as well.
On Mon, Jul 16, 2012 at 06:06:26PM +0200, Torsten B?gershausen wrote:
>
> Am 16.07.2012 um 09:57 schrieb Thomas Rast:
>
> > Torsten Bögershausen writes:
> > What O
Signed-off-by: Jeff King
---
0 files changed
mode change 100644 => 100755 t/t7409-submodule-detached-worktree.sh
diff --git a/t/t7409-submodule-detached-worktree.sh
b/t/t7409-submodule-detached-worktree.sh
old mode 100644
new mode 100755
--
1.7.12.rc0.15.g2184f59
--
To unsubscribe from this
Short of somebody happening to beat the 1 in 2^160 odds of
actually generating content that hashes to the null sha1, we
should never see this value in a tree entry. So let's have
fsck warn if it it seen.
As in the previous commit, we test both blob and submodule
entries to future-proof the test su
We should never need to write the null sha1 into an index
entry (short of the 1 in 2^160 chance that somebody actually
has content that hashes to it). If we attempt to do so, it
is much more likely that it is a bug, since we use the null
sha1 as a sentinel value to mean "not valid".
The presence o
The diff code represents paths using the diff_filespec
struct. This struct has a sha1 to represent the sha1 of the
content at that path, as well as a sha1_valid member which
indicates whether its sha1 field is actually useful. If
sha1_valid is not true, then the filespec represents a
working tree f
I recently came across a tree in the wild that had a submodule entry
whose sha1 was the null sha1 (i.e., all-zeros). It triggered an
interesting bug in the diff code, which is fixed by patch 1.
Unfortunately, I have no clue how this tree came about. I'm assuming it
was simply a bug somewhere in gi
Michael G. Schwern wrote:
> Rather than guess what SVN is going to do for each version, make the test use
> the branch name that was actually created.
[...]
> - git rev-parse "refs/remotes/not-a%40{0}reflog"
> + git rev-parse "refs/remotes/$non_reflog"
Doesn't this defeat
Michael G. Schwern wrote:
> This canonicalizes paths and urls as early as possible so we don't
> have to remember to do it at the point of use.
Yay! Am I correct in imagining this makes the following sequence of
commands[1] no longer trip an assertion failure in svn_path_join[2]
with SVN 1.6?
Michael G. Schwern wrote:
> --- a/perl/Git/SVN/Utils.pm
> +++ b/perl/Git/SVN/Utils.pm
> @@ -86,6 +86,27 @@ sub _collapse_dotdot {
>
>
> sub canonicalize_path {
> + my $path = shift;
> +
> + # The 1.7 way to do it
> + if ( defined &SVN::_Core::svn_dirent_canonicalize ) {
> +
Hi,
Michael G. Schwern wrote:
> --- a/perl/Git/SVN/Utils.pm
> +++ b/perl/Git/SVN/Utils.pm
[...]
> @@ -100,6 +102,20 @@ API as a URL.
> =cut
>
> sub canonicalize_url {
> + my $url = shift;
> +
> + # The 1.7 way to do it
> + if ( defined &SVN::_Core::svn_uri_canonicalize ) {
> +
On Sat, Jul 28, 2012 at 04:18:49PM +0300, Nikolay Vladimirov wrote:
> But the behavior now seems kind of strange, or maybe I'm missing something:
> # git config foobar; echo $?
> error: key does not contain a section: foobar
> 255
>
> # git config foobar.info; echo $?
> 1
>
> git version 1.7.11.2
On Sat, Jul 28, 2012 at 6:42 PM, Nikolai Vladimirov
wrote:
> Returning -1 instead of 1 results in wrong exit status(255) since
> the output of get_value is passed to exit().
>
> 'git config missing_section' should now return proper exit status = 1,
> as specified by the git config documentation.
In commit 98dbe63 the variable $orig_args was renamed to $orig_flags.
One location in cmd_status() was missed.
Note: This is a code cleanup and does not fix any bugs. As a side effect
the variables containing the parsed flags to "git submodule status" are
passed down recursively. So everything was
Returning -1 instead of 1 results in wrong exit status(255) since
the output of get_value is passed to exit().
'git config missing_section' should now return proper exit status = 1,
as specified by the git config documentation.
Signed-off-by: Nikolai Vladimirov
---
builtin/config.c | 2 +-
1 fi
Hi,
On Fri, Jul 27, 2012 at 04:25:58PM -0700, Junio C Hamano wrote:
> Stefan Zager writes:
>
> > On Fri, Jul 27, 2012 at 2:38 PM, Junio C Hamano wrote:
> >
> >> Stefan Zager writes:
> >>
> >> > + module_list "$@" | awk '{print $4}' | xargs -L 1 -P
> >> "$jobs" git submodule update
Hi Stefan,
neat patch. See below for a few notes.
On Fri, Jul 27, 2012 at 11:37:34AM -0700, Stefan Zager wrote:
> diff --git a/git-submodule.sh b/git-submodule.sh
> index dba4d39..761420a 100755
> --- a/git-submodule.sh
> +++ b/git-submodule.sh
> @@ -491,6 +492,20 @@ cmd_update()
>
From: "Michael G. Schwern"
Just a few things I noticed. Its good to canonicalize as early as
possible.
---
git-svn.perl | 6 +++---
perl/Git/SVN/Ra.pm | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 6e97545..6b90765 100755
--- a/g
From: "Michael G. Schwern"
Previously, our URL canonicalization didn't do much of anything.
Now it actually escapes and collapses slashes. This is mostly a cut & paste
of escape_url from git-svn.
This is closer to how SVN 1.7's canonicalization behaves. Doing it with
1.6 lets us chase down som
From: "Michael G. Schwern"
Go through all the spots that use the new add_path_to_url() to
make a new URL and canonicalize them.
* copyfrom_path has to be canonicalized else find_parent_branch
will get confused
* due to the `canonicalize_url($full_url) ne $full_url)` line of
logic in gs_do_s
From: "Michael G. Schwern"
Remove the ad-hoc versions.
This is mostly to normalize the process and ensure the URLs produced
don't have double slashes or anything.
Also provides a place to fix the corner case where a file path
contains a percent sign.
---
git-svn.perl | 3
From: "Michael G. Schwern"
---
git-svn.perl| 8
perl/Git/SVN.pm | 1 -
2 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index 3d120d5..56d1ba7 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -36,6 +36,7 @@ use Git::SVN::Utils qw(
can
From: "Michael G. Schwern"
Rather than guess what SVN is going to do for each version, make the test use
the branch name that was actually created.
---
t/t9118-git-svn-funky-branch-names.sh | 7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/t/t9118-git-svn-funky-branch-nam
From: "Michael G. Schwern"
Continuing to move towards getting everything canonicalizing the same way.
* Git::SVN->init_remote_config and Git::SVN::Ra->minimize_url both
have to canonicalize the same way else init_remote_config
will incorrectly think they're different URLs causing
t9107-git
From: "Michael G. Schwern"
Test to check that the migration got rid of the old style git-svn directory.
It wasn't failing, just throwing a message to STDERR.
---
t/t9107-git-svn-migrate.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t9107-git-svn-migrate.sh b/t/t9107-gi
This patch series fixes git-svn for SVN 1.7 tested against SVN 1.7.5 and
1.6.18. Patch 7/8 is where SVN 1.7 starts passing.
There is one exception. t9100-git-svn-basic.sh fails 11-13. This appears
to be due to a bug in SVN to do with symlinks. Leave that for somebody
else, this is the final su
From: "Michael G. Schwern"
This canonicalizes paths and urls as early as possible so we don't
have to remember to do it at the point of use. It will fix a swath
of SVN 1.7 problems in one go.
Its ok to double canonicalize things.
SVN 1.7 still fails, still not worrying about that.
---
perl/Gi
From: "Michael G. Schwern"
All tests pass with SVN 1.6. SVN 1.7 remains broken, not worrying
about it yet.
SVN changed its path canonicalization API between 1.6 and 1.7.
http://svnbook.red-bean.com/en/1.6/svn.developer.usingapi.html#svn.developer.usingapi.urlpath
http://svnbook.red-bean.com/en/
From: "Michael G. Schwern"
The code doesn't use File::Spec.
---
perl/Git/SVN/Utils.pm | 2 --
1 file changed, 2 deletions(-)
diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm
index deade07..6c8ae53 100644
--- a/perl/Git/SVN/Utils.pm
+++ b/perl/Git/SVN/Utils.pm
@@ -92,8 +92,6 @@ sub can
From: "Michael G. Schwern"
Otherwise you might wind up with things like...
my $path1 = undef;
my $path2 = 'foo';
my $path = $path1 . '/' . $path2;
creating '/foo'. Or this...
my $path1 = 'foo/';
my $path2 = 'bar';
my $path = $path1 . '/' . $path2;
creating 'foo//bar'.
From: "Michael G. Schwern"
No change on SVN 1.6. The tests all pass with SVN 1.6 if
canonicalize_url() does nothing, so tests passing doesn't have
much meaning.
The tests are so messed up right now with SVN 1.7 it isn't really
useful to check. They will be useful later.
---
perl/Git/SVN/Utils
From: "Michael G. Schwern"
The SVN API functions will not accept ../foo but their canonicalization
functions will not collapse it. So we'll have to do it ourselves.
_collapse_dotdot() works better than the existing regex did.
This will be used shortly when canonicalize_path() starts using the
From: "Michael G. Schwern"
So they can be used by others.
I'd like to test them, but they're going to become SVN API wrappers shortly
and those aren't predictable.
No functional change.
---
git-svn.perl | 33 +++-
perl/Git/SVN/Utils.pm | 52
This patch turns on canonicalization in the Git::SVN and Git::SVN::Ra
path and url accessors.
It also makes the canonicalizers use the SVN API when available.
All patches pass with SVN 1.6. Next patch series will fix SVN 1.7.
This should be placed on top of the previous patch series which added
Michael G Schwern wrote:
> On 2012.7.27 8:10 PM, Jonathan Nieder wrote:
>> If you have a chance at some point to offer advice, I'd love to add
>> the information to Documentation/SubmittingPatches that was missing.
[...]
> Remind me when I'm done with the 1.7 fix please?
Sure, if I remember to. :
On 2012.7.27 8:10 PM, Jonathan Nieder wrote:
>> This is the last refactoring patch series. After this bugs, start
>> getting fixed.
>
> I just wanted to say thanks for your thoughtful presentation of this
> code. I was worried before, but these have been pleasantly submitted.
You're welcome. I
Hi,
Florian Achleitner wrote:
> a515ebe9.
[...]
> Btw, these added capabilities are not mentioned in Docs.
Sverre, any hints about how these (capabilities "import-marks "
and "export-marks ") are meant to be used? Why would one use
these instead of "feature import-marks" / "feature ex
Florian Achleitner wrote:
> So I should kick printd out?
I think so, yes.
"git log -SGIT_TRANSPORT_HELPER_DEBUG transport-helper.c" tells me
that that option was added to make the transport-helper machinery make
noise to make it obvious at what stage a remote helper has deadlocked.
GIT_TRANSPOR
62 matches
Mail list logo
