Re: [PATCH 1/3] Make test using invalid commit with -C more strict

2013-08-25 Thread Jonathan Nieder
Junio C Hamano wrote: Kacper Kornet wrote: In the test 'using invalid commit with -C' git-commit would have failed even if the -C option had been given the correct commit, as there was nothing to commit. [...] Also it would be much simpler to say git commit --allow-empty. Sounds good. ;-)

Re: [PATCH 3/3] t/t7106-reset-unborn-branch.sh: Add PERL prerequisite

2013-08-25 Thread Jonathan Nieder
Junio C Hamano wrote: The change to the one that feeds 'y' to reset -p may be a bit too pedantic, as we are not in the business of testing echo y, though. Yeah, that's true. Here's a patch for squashing in. diff --git i/t/t7106-reset-unborn-branch.sh w/t/t7106-reset-unborn-branch.sh index

Re: [PATCH 1/3] t3404: preserve test_tick state across short SHA-1 collision test

2013-08-25 Thread Jonathan Nieder
Eric Sunshine wrote: On Sun, Aug 25, 2013 at 1:55 AM, Jonathan Nieder jrnie...@gmail.com wrote: Would be clearer if the code in a subshell were indented: ( unset test_tick test_commit ... ) I considered it, but decided against

Re: [PATCHv2] write_index: optionally allow broken null sha1s

2013-08-25 Thread Jonathan Nieder
On Sun, Aug 25, 2013 at 05:58:18AM -0400, Jeff King wrote: On Sat, Aug 24, 2013 at 11:15:00PM -0700, Jonathan Nieder wrote: I was tempted to not involve filter-branch in this commit at all, and instead require the user to manually invoke GIT_ALLOW_NULL_SHA1=1 git filter-branch

Re: Re: [PATCH 09/13] Improve section Merge multiple trees

2013-08-25 Thread Jonathan Nieder
Thomas Ackermann wrote: Maybe the intent is Git can help you perform a three-way merge, which can in turn be [...] If you don't mind I will use your text No problem. Signed-off-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git

Re: git-svn - canonicalize: Assertion `*src != '/'' failed.

2013-08-26 Thread Jonathan Nieder
Hi, Bruce Korb wrote: I was trying to clone a SVN repo, but not having luck: $ git svn clone $PWD/private-lustre-svn $PWD/private-lustre-git perl: subversion/libsvn_subr/dirent_uri.c:321: canonicalize: Assertion `*src != '/'' failed. error: git-svn died of signal 6 What is Perl or

Re: [PATCHv2] write_index: optionally allow broken null sha1s

2013-08-26 Thread Jonathan Nieder
Jeff King wrote: On Sun, Aug 25, 2013 at 12:54:12PM -0700, Jonathan Nieder wrote: [setup split across three tests] This is kind of an old-fashioned test, since each step of the setup is treated as a separate test assertion. I don't really mind until we get better automation to make it easy

Re: git-svn - canonicalize: Assertion `*src != '/'' failed.

2013-08-26 Thread Jonathan Nieder
Bruce Korb wrote: $ git svn --version git-svn version 1.8.1.4 (svn 1.7.11) Hm. Two ideas: * Does 1.8.2 or newer work better? (It contains v1.8.2-rc0~110^2, git-svn: do not escape certain characters in paths, 2013-01-17, which at first glance looks unlikely to help but might be worth

Re: [PATCH 04/11] Use git merge instead of git pull .

2013-08-27 Thread Jonathan Nieder
On Tue, Aug 27, 2013 at 12:06:33PM -0700, Junio C Hamano wrote: Thomas Ackermann th.ac...@arcor.de writes: git pull . works, but git merge is the recommended way for new users to do things. (The old description also should have read The former is actually *not* very commonly used.)

Re: [RFC/PATCH v2 3/3] status: introduce status.displayCommentChar to disable display of #

2013-08-28 Thread Jonathan Nieder
Matthieu Moy wrote: Historically, git status needed to prefix each output line with '#' so that the output could be added as comment to the commit message. This prefix comment has no real purpose when git status is ran from the command-line, and this may distract users from the real content.

Re: Stalled git cloning and possible solutions

2013-08-29 Thread Jonathan Nieder
V.Krishn wrote: Quite sometimes when cloning a large repo stalls, hitting Ctrl+c cleans what been downloaded, and process needs re-start. Is there a way to recover or continue from already downloaded files during cloning ? No, sadly. The pack sent for a clone is generated dynamically, so

Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check

2013-09-02 Thread Jonathan Nieder
Hi, Philip Oakley wrote: Does `hash-object` do the inverese of `cat-file commit`? I didn't find the hash-object(1) man page very informative on that matter Hm. The manpage says: Computes the object ID value for an object with specified type with the contents of the named

Re: [PATCH v3 07/11] Documentation/replace: tell that -f option bypasses the type check

2013-09-02 Thread Jonathan Nieder
Philip Oakley wrote: The problem is the file format, in the sense that the earlier `git cat-file commit $orig` has a human readable output which is a description of the commit header, rather than the specific binary content. Ah. That's the actual raw commit object format, though. The

Re: the pager

2013-09-02 Thread Jonathan Nieder
Hi, Dale R. Worley wrote: That's true, but it would change the effect of using cat as a value: cat as a value of DEFAULT_PAGER would cause git_pager() to return NULL, whereas now it causes git_pager() to return cat. (All other places where cat can be a value are translated to NULL already.)

[PATCH 0/4] Re: [PATCH 3/4] t: rev-parse-parents: avoid yoda conditions

2013-09-03 Thread Jonathan Nieder
). Improvements welcome, as always. Thanks. Felipe Contreras (3): rev-parse test: modernize quoting and whitespace rev-parse test: use test_must_fail, not if command; then false; fi rev-parse test: use standard test functions for setup Jonathan Nieder (1): rev-parse test: use test_cmp instead

[PATCH 1/4] rev-parse test: modernize quoting and whitespace

2013-09-03 Thread Jonathan Nieder
for more useful --verbose output. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- t/t6101-rev-parse-parents.sh | 74 ++-- 1 file changed, 58 insertions(+), 16 deletions(-) diff --git a/t

[PATCH 2/4] rev-parse test: use test_must_fail, not if command; then false; fi

2013-09-03 Thread Jonathan Nieder
From: Felipe Contreras felipe.contre...@gmail.com This way, if rev-parse segfaults then the test will fail instead of treating it the same way as a controlled failure. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- t/t6101-rev

[PATCH 3/4] rev-parse test: use test_cmp instead of test builtin

2013-09-03 Thread Jonathan Nieder
in abstract. Reported-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- t/t6101-rev-parse-parents.sh | 33 +++-- 1 file changed, 19 insertions(+), 14 deletions(-) diff --git a/t/t6101-rev-parse-parents.sh b/t/t6101-rev

[PATCH v2 4/4] rev-parse test: use standard test functions for setup

2013-09-03 Thread Jonathan Nieder
output suppressed when running without --verbose as in other tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Lost a line from the patch last time (removal of the '. $TEST_DIRECTORY/lib-t6000.sh' directive. Sorry about

[PATCH 4/4] rev-parse test: use standard test functions for setup

2013-09-03 Thread Jonathan Nieder
output suppressed when running without --verbose as in other tests. Signed-off-by: Felipe Contreras felipe.contre...@gmail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Thanks for reading. t/t6101-rev-parse-parents.sh | 17 + 1 file changed, 9 insertions(+), 8 deletions

Re: [PATCH 3/4] rev-parse test: use test_cmp instead of test builtin

2013-09-03 Thread Jonathan Nieder
Junio C Hamano wrote: After applying this patch and running git show | grep test_cmp_rev_output, I notice that the second is always git rev-parse something. Do we still need to eval these, or would it be sufficient to do test_cmp_rev_output () { git rev-parse

Re: [PATCH v4 0/5] Disable git status comment prefix

2013-09-06 Thread Jonathan Nieder
Jeff King wrote: On Thu, Sep 05, 2013 at 09:36:47PM +0200, Matthieu Moy wrote: I'm fine with any name actually (since it is enabled by default, people don't need to know the name to benefit from the new output). Maybe status.displayCommentPrefix was the best name after all. FWIW, I had the

Re: [PATCH 0/3] Reject non-ff pulls by default

2013-09-06 Thread Jonathan Nieder
John Keeping wrote: On Thu, Sep 05, 2013 at 12:18:45PM -0700, Junio C Hamano wrote: I somehow thought that rebase by default looked in the reflog to do exactly that. Perhaps I am not remembering correctly. It just does @{upstream} by default, which tends to get messy if the upstream has

Re: [PATCH] http-backend: provide Allow header for 405

2013-09-08 Thread Jonathan Nieder
Hi, brian m. carlson wrote: --- a/http-backend.c +++ b/http-backend.c @@ -594,8 +594,11 @@ int main(int argc, char **argv) if (strcmp(method, c-method)) { const char *proto = getenv(SERVER_PROTOCOL); - if

Re: [RFC] Disabling status hints in COMMIT_EDITMSG

2013-09-10 Thread Jonathan Nieder
Matthieu Moy wrote: I just noticed that the template COMMIT_EDITMSG was containing status hints, and that they were not particularty helpfull _during_ a commit. I think it would be sensible to ignore advice.statusHints and disable hints unconditionally when writting to COMMIT_EDITMSG. Any

Re: breakage in revision traversal with pathspec

2013-09-11 Thread Jonathan Nieder
Kevin Bracey wrote: On reflection I'm not sure what we should for the simple history view of v1.8.3.1..v1.8.4. We're not rewriting parents, so we don't get a chance to reconsider the merge as being zero-parent, and we do have this little section of graph to traverse at the bottom:

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-11 Thread Jonathan Nieder
Sebastian Schuberth wrote: This is necessary so that read_mailmap() can obtain a pointer to the function. Hm, what platform has strcasecmp() as an inline function? Is this allowed by POSIX? Even if it isn't, should we perhaps just work around it by providing our own thin static function

Re: [PATCH] Documentation/git-checkout: Move `--detach` flag in synopsis to correct command

2013-09-11 Thread Jonathan Nieder
Hi, Junio C Hamano wrote: --- a/Documentation/git-checkout.txt +++ b/Documentation/git-checkout.txt @@ -9,7 +9,8 @@ SYNOPSIS [verse] 'git checkout' [-q] [-f] [-m] [branch] -'git checkout' [-q] [-f] [-m] [--detach] [commit] +'git checkout' [-q] [-f] [-m] --detach [branch]

Re: [PATCH v2] http-backend: provide Allow header for 405

2013-09-11 Thread Jonathan Nieder
brian m. carlson wrote: Signed-off-by: brian m. carlson sand...@crustytoothpaste.net Thanks again for noticing. For what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-12 Thread Jonathan Nieder
Likewise. With or without that change, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- 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

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-12 Thread Jonathan Nieder
Sebastian Schuberth wrote: And that's exactly what defining __NO_INLINE__ does. Granted, defining __NO_INLINE__ in the scope of string.h will also add a #define strcasecmp _stricmp; but despite it's name, defining __NO_INLINE__ does not imply a performance hit due to functions not being

Re: [PATCH] git-compat-util: Avoid strcasecmp() being inlined

2013-09-12 Thread Jonathan Nieder
Sebastian Schuberth wrote: I'm not too happy with the wording either. As I see it, even on MinGW runtime version 4.0 it's not true that string.h has _only_ inline definition of strcasecmp; there's also #define strncasecmp _strnicmp I assume you mean #define strcasecmp _stricmp, which is

Re: [PATCH v2] urlmatch.c: recompute ptr after append_normalized_escapes

2013-09-12 Thread Jonathan Nieder
Kyle J. McKay wrote: The longer comment looks good to me. If you think the code will be safe from simplification patches without a comment, that works for me too. I think if we can't trust reviewers to catch this kind of thing, we're in trouble (i.e., moving too fast). :) So FWIW my instinct

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-08-12 Thread Jonathan Nieder
Hi again, Florian Achleitner wrote: back to the pipe-topic. Ok, thanks. [...] The way it's supposed to work is that in a bidi-import, the remote helper reads in the entire list of refs to be imported and only once the newline indicating that that list is over arrives starts writing its

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-08-12 Thread Jonathan Nieder
Hi again, Florian Achleitner wrote: Another alternative would be to use the existing --cat-pipe-fd argument. But that requires to open the fifo before execing fast-import and makes us dependent on the posix model of forking and inheriting file descriptors Let me elaborate on this, which I

Re: [RFC 1/4 v2] Implement a basic remote helper for svn in C.

2012-08-12 Thread Jonathan Nieder
Florian Achleitner wrote: This is how I see it, probably it's all wrong: I thought the main problem is, that we don't want processes to have *more than three pipes attached*, i.e. stdout, stdin, stderr, because existing APIs don't allow it. Oh, that makes sense. Thanks for explaining, and

Re: [PATCH/RFC v4 01/16] GSOC remote-svn

2012-08-20 Thread Jonathan Nieder
Hi, Florian Achleitner wrote: What version would you prefer? I think git-remote-svn should move out of contrib to the toplevel of git.git (as I think I've mentioned before). Since it's just a new git command in incubation, I don't want the maintenance hassle of keeping it in contrib/svn-fe.

Re: [RFC 1/5] GSOC: prepare svndump for branch detection

2012-08-20 Thread Jonathan Nieder
Florian Achleitner wrote: Currently, the mark number is equal to the svn revision number the commit corresponds to. I didn't want to break that, but not mandatory. We could also split the mark namespace by reserving one or more of the most significant bits as a type specifier. I'll develop a

How to request a fast-forward pull

2012-08-20 Thread Jonathan Nieder
Hi gitsters, Paul Gortmaker wrote: When you have a moment, would you please migrate this across to your main linux-stable repository? Both a branch and signed tag are present and pointing at the same commit, but git request-pull does favour output of the tag over the branch name. But

Re: [PATCH 5/7] Fix tests under GETTEXT_POISON on pack-object

2012-08-20 Thread Jonathan Nieder
Hi, Nguyễn Thái Ngọc Duy wrote: From: Jiang Xin worldhello@gmail.com Use i18n-specific test functions in test scripts for pack-object. Thanks for resending, and sorry I haven't made time to polish the translation-based poison implementation you sent before (which seemed very useful and

Re: [PATCH] Build in gettext poison feature unconditionally

2012-08-20 Thread Jonathan Nieder
Nguyễn Thái Ngọc Duy wrote: The runtime cost should be small. gcc -O2 inlines _() and use_gettext_poison(). But even if it does not, performance should not be impacted as _() calls are usually not on critical path. If some of them are, we better fix there as gettext() may or may not be cheap

Re: [PATCH 5/7] Fix tests under GETTEXT_POISON on pack-object

2012-08-21 Thread Jonathan Nieder
Nguyen Thai Ngoc Duy wrote: On Tue, Aug 21, 2012 at 12:17 PM, Jonathan Nieder jrnie...@gmail.com wrote: @@ -35,7 +35,7 @@ test_expect_success 'upload-pack fails due to error in pack-objects packing' ' printf 0032want %s\n0009done\n \ $(git rev-parse HEAD) input

Re: [PATCH 1/5] Make Git::SVN use accessors internally for path.

2012-09-17 Thread Jonathan Nieder
by renaming the underlying variable in patch 5. Jonathan Nieder (1): Git::SVN: rename private path field Michael G. Schwern (4): Git::SVN: introduce path accessor Git::SVN: use accessor to read path Git::SVN: use accessor to write path Git::SVN::_new: use accessor to write path field git

[FYI/PATCH 2/5] Git::SVN: use accessor to read path

2012-09-17 Thread Jonathan Nieder
a larger patch] Signed-off-by: Eric Wong normalper...@yhbt.net Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- git-svn.perl| 12 ++-- perl/Git/SVN.pm | 44 ++-- perl/Git/SVN/Fetcher.pm |2 +- perl/Git/SVN/Ra.pm

[FYI/PATCH 4/5] Git::SVN::_new: use accessor to write path field

2012-09-17 Thread Jonathan Nieder
-by: Jonathan Nieder jrnie...@gmail.com --- perl/Git/SVN.pm |6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm index 826a7fa6..3aa20109 100644 --- a/perl/Git/SVN.pm +++ b/perl/Git/SVN.pm @@ -2280,10 +2280,12 @@ sub _new { $_[3

Re: [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths.

2012-09-26 Thread Jonathan Nieder
Hi, Michael G Schwern wrote: On 2012.7.30 12:51 PM, Eric Wong wrote: Michael G Schwern wrote: _collapse_dotdot() works better than the existing regex did. I don't dispute it's better, but it's worth explaining in the commit message to reviewers why something is better. Yeah. I figured

Re: [PATCH 4/7] Add join_paths() to safely concatenate paths.

2012-09-26 Thread Jonathan Nieder
Hi, Michael G. Schwern wrote: 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;

Re: [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths.

2012-09-26 Thread Jonathan Nieder
Eric Wong wrote: That said, I'd favor an implementation that split on m{/+} and collapsed as Michael mentioned. Sounds sensible. Is canonicalize_path responsible for collapsing runs of slashes? What should _collapse_dotdot do to c:/.. or http://www.example.com/..;? -- To unsubscribe from

Re: [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths.

2012-09-26 Thread Jonathan Nieder
Eric Wong wrote: It should probably just return the root path (c:/ and http://www.example.com/; respectively). That means recognizing drive letters and URLs. Hm. Subversion commands seem to use svn_client_args_to_target_array2 to canonicalize arguments. It does something like the following:

Re: [PATCH 3/7] Extract, test and enhance the logic to collapse ../foo paths.

2012-09-26 Thread Jonathan Nieder
Eric Wong wrote: Ideally, yes. Is there an easy way to access that from Perl? (and for the older versions of SVN folks people are running). Subversion's swig bindings only wrap a few apr functions and do not depend on fuller apr bindings. Something like svn_dirent_is_under_root() could be

Re: [PATCH] gitk: refresh the index before running diff-files

2012-09-30 Thread Jonathan Nieder
Hi Jeff, Jeff King wrote: On Sun, Sep 30, 2012 at 10:05:27AM +1000, Paul Mackerras wrote: Unfortunately this will wait for the git update-index command to complete, making the GUI unresponsive while it executes, and that can take minutes on a large repository (e.g. the linux kernel) on a

Re: fa/remote-svn (Re: What's cooking in git.git (Oct 2012, #01; Tue, 2))

2012-10-04 Thread Jonathan Nieder
David Michael Barr wrote: On Wednesday, 3 October 2012 at 9:20 AM, Junio C Hamano wrote: * fa/remote-svn (2012-09-19) 16 commits - Add a test script for remote-svn - remote-svn: add marks-file regeneration - Add a svnrdump-simulator replaying a dump file for testing - remote-svn: add

[PATCH] git-svn: keep leading slash when canonicalizing paths (fallback case)

2012-10-05 Thread Jonathan Nieder
. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Hi Eric, Michael G Schwern wrote: On 2012.7.28 6:55 AM, Jonathan Nieder wrote: When would this else case trip? When svn_path_canonicalize() does not exist in the SVN API, presumably because their SVN is too old. I accidentally tested

[PATCH/RFC] test: work around SVN 1.7 mishandling of svn:special changes

2012-10-06 Thread Jonathan Nieder
followed by adding a new file and works fine. Perhaps git svn should mimic that, but for now let's teach the test suite to recover from the bug by testing the content of HEAD with a new checkout. After this change, tests t9100.11-13 pass again. Signed-off-by: Jonathan Nieder jrnie...@gmail.com

Re: Fw: [git-users] How do I git-push to an FTP server?

2012-10-07 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Thomas Ferris Nicolaisen tfn...@gmail.com writes: At least according to the documentation[1], Git natively supports [...] ftp. This could need some clarification if pushing over ftp is not supported. [...] -Git natively supports ssh, git, http, https, ftp, ftps,

Re: Fw: [git-users] How do I git-push to an FTP server?

2012-10-08 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: I see. Will we remove ftp[s] support too? I hope this is in order. I don't see why that would be desirable, as long as libcurl continues to support it for free. [...] Fetching and pushing over rsync, and fetching over ftp or ftps are deprecated, and will soon be

Re: Fw: [git-users] How do I git-push to an FTP server?

2012-10-08 Thread Jonathan Nieder
. For what it's worth, Reviewed-by: Jonathan Nieder jrnie...@gmail.com -- 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

[PATCH/RFC] svn test: escape peg revision separator using empty peg rev

2012-10-09 Thread Jonathan Nieder
) the test can survive that. Tested with Debian Subversion 1.6.12dfsg-6 and 1.7.5-1 and r1395837 of Subversion trunk (1.8.x). Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Michael G Schwern wrote: On 2012.7.28 7:16 AM, Jonathan Nieder wrote: Michael G. Schwern wrote: - git rev-parse

[PATCH/RFC v2] git svn: work around SVN 1.7 mishandling of svn:special changes

2012-10-09 Thread Jonathan Nieder
changes are sent in a format that modern svn update can handle and tests t9100.11-13 pass again. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Jonathan Nieder wrote: Revisions prepared with ordinary svn commands (svn add and not svn propset) don't trip this because they represent filetype

Re: [PATCH/RFC] svn test: escape peg revision separator using empty peg rev

2012-10-09 Thread Jonathan Nieder
Michael J Gruber wrote: Jonathan Nieder venit, vidit, dixit 09.10.2012 10:41: Signed-off-by: Jonathan Nieder jrnie...@gmail.com Tested with Subversion 1.6.18. [...] I haven't checked other svn versions but this approach looks perfectly sensible. It makes us test branch names which can't

[PATCH v3] git svn: work around SVN 1.7 mishandling of svn:special changes

2012-10-10 Thread Jonathan Nieder
changes are sent in a format that modern svn update can handle and tests t9100.11-13 pass again. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Eric Wong wrote: I needed to filter the patch through: s,git-svn\.perl,perl/Git/SVN/Editor.pm,g though... Yeah, good catch. Here's a v3

Re: [PATCH/RFC] svn test: escape peg revision separator using empty peg rev

2012-10-10 Thread Jonathan Nieder
Eric Wong wrote: Thanks both. Also pushed to master on git://bogomips.org/git-svn.git (commit 44bc5ac71fd99f195bf1a3bea63c11139d2d535f) Jonathan Nieder (2): git svn: work around SVN 1.7 mishandling of svn:special changes svn test: escape peg revision separator using empty peg

Re: [PATCH/RFC] svn test: escape peg revision separator using empty peg rev

2012-10-10 Thread Jonathan Nieder
Eric Wong wrote: Jonathan Nieder jrnie...@gmail.com wrote: -- 8 -- Subject: Git::SVN::Editor::T: pass $deletions to -A and -D For future reference, it'd be slightly easier for me to apply if you included the From: (and Date:) headers so I don't have to yank+paste them myself : Ah, I

[RFC/PATCH 0/2] Re: [PATCH] config: warn on inaccessible files

2012-10-13 Thread Jonathan Nieder
something like this? Jonathan Nieder (2): config, gitignore: failure to access with ENOTDIR is ok config: treat user and xdg config permission problems as errors config.c | 4 ++-- git-compat-util.h | 6 +- wrapper.c | 10 +- 3 files changed, 16 insertions(+), 4

[PATCH 1/2] config, gitignore: failure to access with ENOTDIR is ok

2012-10-13 Thread Jonathan Nieder
-by: Jonathan Nieder jrnie...@gmail.com --- git-compat-util.h | 5 - wrapper.c | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/git-compat-util.h b/git-compat-util.h index 2fbf1fd8..f567767f 100644 --- a/git-compat-util.h +++ b/git-compat-util.h @@ -635,7 +635,10 @@ int

[PATCH 2/2] config: treat user and xdg config permission problems as errors

2012-10-13 Thread Jonathan Nieder
the user knows to notify someone and get on with work in the meantime. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- config.c | 4 ++-- git-compat-util.h | 1 + wrapper.c | 8 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index

Re: [PATCH 2/2] config: treat user and xdg config permission problems as errors

2012-10-14 Thread Jonathan Nieder
these patches on top? Jonathan Nieder (2): config doc: advertise GIT_CONFIG_NOSYSTEM config: exit on error accessing any config file Documentation/git-config.txt | 8 config.c | 6 +++--- 2 files changed, 11 insertions(+), 3 deletions(-) -- To unsubscribe from this list

[PATCH 3/2] config doc: advertise GIT_CONFIG_NOSYSTEM

2012-10-14 Thread Jonathan Nieder
with teaching git to error out when /etc/gitconfig is unreadable. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Documentation/git-config.txt | 8 1 file changed, 8 insertions(+) diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index eaea0791..907a1fd5 100644

[PATCH 4/2] config: exit on error accessing any config file

2012-10-14 Thread Jonathan Nieder
complaint. After this patch, errors accessing the repository-local and systemwide config files and files requested in include directives cause Git to exit, just like errors accessing ~/.gitconfig. Explained-by: Jeff King p...@peff.net Signed-off-by: Jonathan Nieder jrnie...@gmail.com

[PATCH v2 3/2] doc: advertise GIT_CONFIG_NOSYSTEM

2012-10-14 Thread Jonathan Nieder
with teaching git to error out when /etc/gitconfig is unreadable. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Jonathan Nieder wrote: --- a/Documentation/git-config.txt +++ b/Documentation/git-config.txt @@ -240,6 +240,14 @@ GIT_CONFIG:: Using the --global option forces

Re: [RFC/PATCH 0/2] Re: [PATCH] config: warn on inaccessible files

2012-10-14 Thread Jonathan Nieder
Junio C Hamano wrote: If the config side can be switched to unconditionally attempt to fopen and then deal with an error when it happens, we can get rid of access_or_{warn,die} and replace them with fopen_or_{warn,die} and use them from the two

[PATCH/RFC 0/2] Re: [PATCH 2/7] Change canonicalize_url() to use the SVN 1.7 API when available.

2012-10-14 Thread Jonathan Nieder
Hi Eric, Michael G Schwern wrote: On 2012.7.28 6:50 AM, Jonathan Nieder wrote: 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

[PATCH 1/2] git svn: do not overescape URLs (fallback case)

2012-10-14 Thread Jonathan Nieder
passes again. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- perl/Git/SVN/Utils.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl/Git/SVN/Utils.pm b/perl/Git/SVN/Utils.pm index 8b8cf375..3d1a0933 100644 --- a/perl/Git/SVN/Utils.pm +++ b/perl/Git/SVN/Utils.pm

[PATCH 2/2] git svn: canonicalize_url(): use svn_path_canonicalize when available

2012-10-14 Thread Jonathan Nieder
the fallback code, which we keep to be conservative. Since svn_path_canonicalize() was added before Subversion 1.1, hopefully that doesn't happen often. Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- perl/Git/SVN/Utils.pm | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git

Re: [PATCH] contrib/hooks: avoid requiring root access in usage instructions

2012-10-20 Thread Jonathan Nieder
Junio C Hamano wrote: We already encourage casting-in-stone a particular version of the sample hook when a new repository is created by copying them from the template directory. This prevents from surprising users when an updated version of Git changes the behaviour of these samples. Even

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-24 Thread Jonathan Nieder
Hi Felipe, Felipe Contreras wrote: This test is completely wrong. 1) Where are the marks file? 2) master..master shouldn't export anything Why shouldn't master..master export anything? It means update the master ref; we already have all commits up to and including master^0. The underlying

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-24 Thread Jonathan Nieder
Felipe Contreras wrote: Does it mean that? I don't think so, but let's assume that's the case. We don't have all those commits; without the marks we have nothing. Or what exactly do you mean by 'we'? Not everyone uses marks. Ciao, Jonathan -- To unsubscribe from this list: send the line

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-24 Thread Jonathan Nieder
Felipe Contreras wrote: Again, if you don't have marks, I don't see what you expect to be exported with 'master..master', even with marks, I don't see what you expect. And that's fine. Unless you were trying to do some work and this lack of understanding got in the way. In that case, with a

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-24 Thread Jonathan Nieder
Felipe Contreras wrote: I don't need help, I am helping you, I was asked to take a look at this patch series. If you don't want my help, then by all means, keep this series rotting, it has being doing so for the past year without anybody complaining. Ah, so _that_ (namely getting Sverre's

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-24 Thread Jonathan Nieder
Felipe Contreras wrote: All right, so I run this and get this: % git fast-export master..master reset refs/heads/master from 8c7a786b6c8eae8eac91083cdc9a6e337bc133b0 As an user of fast-export, what do I do with that now? You passed master.. on the command line, indicating that your

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-25 Thread Jonathan Nieder
Felipe Contreras wrote: Show me a single remote helper that manually stores SHA-1's and I might believe you, but I doubt that, marks are too convenient. Oh dear lord. Why are you arguing? Explain how coming to a consensus on this will help accomplish something useful, and then I can explain

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-25 Thread Jonathan Nieder
Sverre Rabbelier wrote: That's weird, we have this bit: + if (elem-whence != REV_CMD_REV elem-whence != REV_CMD_RIGHT) + continue; If I understand correctly that should cause it to only output revs (e.g. 'foo1') and the rhs side of a have..want spec. If

[RFC/PATCH] __git_ps1: migrate out of contrib/completion

2012-10-25 Thread Jonathan Nieder
)\$ ' fi fi and the shell prompt will show the current branch name in git repositories when on a machine with a new enough version of git. Reported-by: Danny Yates mail4da...@googlemail.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Danny Yates wrote: Would

Re: [PATCH 1/3] t9350: point out that refs are not updated correctly

2012-10-25 Thread Jonathan Nieder
Sverre Rabbelier wrote: I know there was a reason why using UNINTERESTING didn't work (otherwise we could've used that to start with, instead of needing Junio's whence solution). I think all refs ended up being marked as UNINTERESTING or somesuch. True. Is it be possible to check

Re: Where should git-prompt.sh be installed?

2012-10-25 Thread Jonathan Nieder
SZEDER Gábor wrote: On Wed, Oct 24, 2012 at 05:51:06PM -0700, Jonathan Nieder wrote: Proposal: 1) /usr/lib/git-core/git-sh-prompt 2) git-sh-prompt(1) Not sure about the sh part. The prompt function is very Bash-specific, it won't work under a plain POSIX shell. That's an interesting

Re: [RFC/PATCH 2/2] doc: command line interface (cli) dot-repository dwimmery

2013-05-19 Thread Jonathan Nieder
Hi, Philip Oakley wrote: The Git cli will generally accept dot '.' (period) as equivalent to the current repository when appropriate. Tell the reader of this 'do what I mean' (dwim)mery action. [...] --- a/Documentation/gitcli.txt +++ b/Documentation/gitcli.txt @@ -59,6 +59,10 @@ working

Re: [RFC/PATCH 1/2] config doc: add dot-repository note

2013-05-19 Thread Jonathan Nieder
Philip Oakley wrote: --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -734,6 +734,8 @@ branch.name.remote:: overridden by `branch.name.pushremote`. If no remote is configured, or if you are not on any branch, it defaults to `origin` for fetching and

Re: [RFC/PATCH] patch-ids: check modified paths before calculating diff

2013-05-19 Thread Jonathan Nieder
John Keeping wrote: In this case, it is likely that only a small number of paths are touched by the commits on the smaller side of the range and by storing these we can ignore many commits on the other side before unpacking blobs and diffing them. I like this idea a lot. --- a/patch-ids.c

Re: git-diff-index man page

2013-05-20 Thread Jonathan Nieder
Junio C Hamano wrote: --- a/Documentation/git-diff-index.txt +++ b/Documentation/git-diff-index.txt @@ -3,7 +3,7 @@ git-diff-index(1) NAME -git-diff-index - Compares content and mode of blobs between the index and repository +git-diff-index - Compare a tree and the working tree

Re: Outdated and broken online versions of user-manual.html

2013-05-20 Thread Jonathan Nieder
Philip Oakley wrote: From: Thomas Ackermann th.ac...@arcor.de (5) Large overlapping with the tutorials. IMHO all of the tutorials should be blended into user-manual [...] I would be a little cautious of your point 5 if it squoze everything into one overlong document at the expense of losing

Re: [PATCH v8 0/3] Begin replacing OpenSSL with CommonCrypto

2013-05-21 Thread Jonathan Nieder
Torsten Bögershausen wrote: One minor nit, or 2: imap-send.c: In function ‘cram’: imap-send.c:913: warning: statement with no effect This fixes it: diff --git a/imap-send.c b/imap-send.c index 8ea180f..11577c9 100644 --- a/imap-send.c +++ b/imap-send.c @@ -35,7 +35,7 @@ typedef void

Re: Reading commit objects

2013-05-21 Thread Jonathan Nieder
Chico Sokol wrote: We're trying to build a improved java library focused in our needs (jgit has a really confusing api focused in solving egit needs). JGit is also open to contributions, including contributions that add less confusing API calls. :) See

Re: [PATCH] git clone depth of 0 not possible.

2013-05-28 Thread Jonathan Nieder
Matthijs Kooijman wrote: In other words: we won't break existing clients if we suddenly send back one less commit than before, since the client just sends over what it wants and then assumes that whatever it gets back is really what it wanted? Yes, depending on your definition of break. An

Re: [PATCH 4/5] test: improve rebase -q test

2013-05-28 Thread Jonathan Nieder
Junio C Hamano wrote: A more preferrable alternative may be adding something like this to test-lib.sh and call it from here and elsewhere (there are about 50 places that do test ! -s filename), perhaps? test_must_be_an_empty_file () { if test -s $1

Re: [git-users] Highlevel (but simple to implement) commands provided by default for git

2013-05-29 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Bráulio Bhavamitra wrote: Agree, these aliased should work as a fallback or as an automatic short version Making builtins override'able is also a terrible idea. It opens doors to potential bugs we don't want to deal with. Simple example: am = log -1

Re: [git-users] Highlevel (but simple to implement) commands provided by default for git

2013-05-29 Thread Jonathan Nieder
Felipe Contreras wrote: On Wed, May 29, 2013 at 6:43 PM, Jonathan Nieder jrnie...@gmail.com wrote: Ramkumar Ramachandra wrote: Making builtins override'able is also a terrible idea. It opens doors to potential bugs we don't want to deal with. Simple example: am = log -1 log = am -3

Re: [git-users] Highlevel (but simple to implement) commands provided by default for git

2013-05-30 Thread Jonathan Nieder
Felipe Contreras wrote: On Thu, May 30, 2013 at 12:23 AM, Jonathan Nieder jrnie...@gmail.com wrote: Felipe Contreras wrote: On Wed, May 29, 2013 at 6:43 PM, Jonathan Nieder jrnie...@gmail.com wrote: A bigger problem (in my opinion) with allowing arbitrary changes to the meaning of existing

Re: git-daemon: needs /root/.config/git/config?

2013-06-04 Thread Jonathan Nieder
Johannes Sixt wrote: Am 04.06.2013 18:08, schrieb Jeff King: However, since changing user id and leaving $HOME is so common, there is a patch under consideration to loosen the check only for the case of EACCES on files in $HOME. That commit is 4698c8f (config: allow inaccessible

Dependencies and packaging (Re: [Administrivia] On ruby and contrib/)

2013-06-06 Thread Jonathan Nieder
Ramkumar Ramachandra wrote: Git is probably the _last_ thing to be complaining about when it comes to packaging. It would be nice if contrib/ files supported the usual make; make install; make clean targets. That's missing functionality that does matter to

Re: Bug: `gitsubmodule` does not list modules with unicode characters

2013-06-08 Thread Jonathan Nieder
the entire manpage, it is too easy to miss that. Reported-by: Fredrik Gustafsson iv...@iveqy.com Signed-off-by: Jonathan Nieder jrnie...@gmail.com --- Documentation/git-ls-files.txt | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Documentation/git-ls-files.txt b/Documentation/git

<    1   2   3   4   5   6   7   8   9   10   >