Re: importing two different trees into a fresh git repo

2013-02-06 Thread Jeff King
On Tue, Feb 05, 2013 at 01:46:09PM -0800, Constantine A. Murenin wrote: I've encountered two problems so far: 0. After initialising the repository, I was unable to `git checkout --orphan Debian-6.0.4-nginx-1.0.12` -- presumably it doesn't work when the repo is empty? This sounds like a bug

Re: git-svn problems with white-space in tag names

2013-02-06 Thread Erik Faye-Lund
On Sun, Jan 27, 2013 at 3:12 PM, Hans-Juergen Euler waas.n...@gmail.com wrote: This seems to be a problem of the windows version. At least with its complete severity. Installed git on Ubuntu in a virtual machine was able to clone the subversion repos past the tag with the white-space at the

Re: [RFC] test-lib.sh: No POSIXPERM for cygwin

2013-02-06 Thread Erik Faye-Lund
On Sun, Jan 27, 2013 at 3:57 PM, Torsten Bögershausen tbo...@web.de wrote: t0070 and t1301 fail when running the test suite under cygwin. Skip the failing tests by unsetting POSIXPERM. But is this the real reason? I thought Cygwin implemented POSIX permissions...? -- To unsubscribe from this

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Michael Haggerty
On 02/05/2013 06:27 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: I would again like to express my discomfort about this feature, which is already listed as will merge to next. Do not take will merge to next too literally. One major purpose of marking a topic as

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Duy Nguyen
On Tue, Feb 5, 2013 at 5:29 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Hiderefs creates a dark corner of a remote git repo that can hold arbitrary content that is impossible for anybody to discover but nevertheless possible for anybody to download (if they know the name of a hidden

Re: [PATCH] Verify Content-Type from smart HTTP servers

2013-02-06 Thread Michael Schubert
On 01/31/2013 11:09 PM, Junio C Hamano wrote: -static int http_request_reauth(const char *url, void *result, int target, +static int http_request_reauth(const char *url, +struct strbuf *type, +void *result, int target,

Re: [PATCH] Verify Content-Type from smart HTTP servers

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 11:24:41AM +0100, Michael Schubert wrote: On 01/31/2013 11:09 PM, Junio C Hamano wrote: -static int http_request_reauth(const char *url, void *result, int target, +static int http_request_reauth(const char *url, + struct strbuf *type,

Re: [PATCH v2 2/2] i18n: mark OPTION_NUMBER (-NUM) for translation

2013-02-06 Thread Duy Nguyen
On Wed, Feb 6, 2013 at 11:35 AM, Junio C Hamano gits...@pobox.com wrote: How about this since [PATCH v3]: diff --git a/utf8.c b/utf8.c index 52dbd..b893a 100644 --- a/utf8.c +++ b/utf8.c @@ -443,8 +443,11 @@ int utf8_fprintf(FILE *stream, const char *format, ...) strbuf_vaddf(buf,

Re: [PATCH v3 3/8] upload/receive-pack: allow hiding ref hierarchies

2013-02-06 Thread Jeff King
On Tue, Feb 05, 2013 at 07:45:01AM -0800, Junio C Hamano wrote: In the earlier review, I mentioned making this per-service, but I see that is not the case here. Do you have an argument against doing so? Perhaps then I misunderstood your intention. By reminding me of the receive-pack

Why is ident_is_sufficient different on Windows?

2013-02-06 Thread Max Horn
Hi there, while trying to understand which parts of the author committer identity are mandatory (name, email, or both), I ended up in ident.c, looking at ident_is_sufficient(), and to my surprise discovered that this seems to differ between Windows (were both are mandatory) and everyone else:

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Michal Nazarewicz
On Wed, Feb 06 2013, Junio C Hamano gits...@pobox.com wrote: I see a lot of rerolls on the credential helper front, but is there anybody working on hooking send-email to the credential framework? I assumed someone had, but if not I can take a stab at it. I'm not sure however how should I map

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Ted Zlatanov
On Wed, 06 Feb 2013 14:26:46 +0100 Michal Nazarewicz min...@mina86.com wrote: MN On Wed, Feb 06 2013, Junio C Hamano gits...@pobox.com wrote: I see a lot of rerolls on the credential helper front, but is there anybody working on hooking send-email to the credential framework? MN I assumed

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Ted Zlatanov
On Wed, 06 Feb 2013 09:11:17 +0100 Matthieu Moy matthieu@grenoble-inp.fr wrote: MM Junio C Hamano gits...@pobox.com writes: I see a lot of rerolls on the credential helper front, but is there anybody working on hooking send-email to the credential framework? MM Not answering the

Re: Bug in git log --graph -p -m (version 1.7.7.6)

2013-02-06 Thread Dale R. Worley
From: Matthieu Moy matthieu@grenoble-inp.fr In any case, I can't reproduce with 1.8.1.2.526.gf51a757: I don't get undless output. On the other hand, I get a slightly misformatted output: * commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from

[RFC/PATCH 0/4] textconv for show and grep

2013-02-06 Thread Michael J Gruber
This min series aims at completing the textconv support of user facing commands. It is RFC for lack of documentation and tests, to check whether we really want to go in that direction (I do). 1/4 covers the missing textconv support in the blob case of git show, which should be (and then is)

[RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Michael J Gruber
Currently, diff and cat-file for blobs obey --textconv options (with the former defaulting to --textconv and the latter to --no-textconv) whereas show does not obey this option, even though it takes diff options. Make show on blobs behave like diff, i.e. obey --textconv by default and

[RFC/PATCH 2/4] cat-file: do not die on --textconv without textconv filters

2013-02-06 Thread Michael J Gruber
When a command is supposed to use textconv filters (by default or with --textconv) and none are configured then the blob is output without conversion; the only exception to this rule is cat-file --textconv. Make it behave like the rest of textconv aware commands. Signed-off-by: Michael J Gruber

[RFC/PATCH 4/4] grep: obey --textconv for the case rev:path

2013-02-06 Thread Michael J Gruber
Make grep obey the --textconv option also for the object case, i.e. when used with an argument rev:path. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- builtin/grep.c | 11 ++- object.c | 26 -- object.h | 2 ++ 3 files changed, 28

CodingGuidelines Perl amendment (was: [PATCH 1/3] Add contrib/credentials/netrc with GPG support)

2013-02-06 Thread Ted Zlatanov
On Mon, 04 Feb 2013 15:10:45 -0800 Junio C Hamano gits...@pobox.com wrote: JCH Ted Zlatanov t...@lifelogs.com writes: JCH I thought that we tend to avoid Emacs/Vim formatting cruft left in JCH the file. Do we have any in existing file outside contrib/? No, but it's a nice way to express the

Re: [PATCH] Verify Content-Type from smart HTTP servers

2013-02-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: Is it worth having a strbuf_set* family of functions to match the strbuf_add*? We seem to have these sorts of errors with strbuf from time to time, and I wonder if that would make it easier (and more readable) to do the right thing. Possibly. The callsite

Re: [PATCH v3 3/8] upload/receive-pack: allow hiding ref hierarchies

2013-02-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Feb 05, 2013 at 07:45:01AM -0800, Junio C Hamano wrote: In the earlier review, I mentioned making this per-service, but I see that is not the case here. Do you have an argument against doing so? Perhaps then I misunderstood your intention. By

How to diff 2 file revisions with gitk

2013-02-06 Thread R. Diez
Hi there: I asked a few days ago whether I could easily diff 2 file revisions with the mouse in gitk, but I got no reply yet, see here:    How to diff two file revisions with the mouse (with gitk)    https://groups.google.com/forum/#!topic/git-users/9znsQsTB0dE I am hoping that it was the

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Ted Zlatanov
On Wed, 06 Feb 2013 16:10:12 +0100 Matthieu Moy matthieu@grenoble-inp.fr wrote: MM Ted Zlatanov t...@lifelogs.com writes: MM [...] so the way to go for send-email is probably to libify the MM credential support in git-remote-mediawiki, and to use it in send-email. I looked and that's

[Request] Git export with hardlinks

2013-02-06 Thread Thomas Koch
Hi, I'd like to script a git export command that can be given a list of already exported worktrees and the tree SHA1s these worktrees correspond too. The git export command should then for every file it wants to export lookup in the existing worktrees whether an identical file is already

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Junio C Hamano
Ted Zlatanov t...@lifelogs.com writes: - As in C (see above), we avoid using braces unnecessarily (but Perl forces braces around if/unless/else/foreach blocks, so this is not always possible). Is it ever (as opposed to not always) possible to omit braces? It sounds as if we encourage

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Matthieu Moy
Ted Zlatanov t...@lifelogs.com writes: None of these are a big deal, and Michal said he's working on libifying this anyhow: - making 'fill' a special operation is weird Well, 'fill' is the only operation that mutates the credential structure (i.e. the only one for which git credential emits

Re: [RFC/PATCH 2/4] cat-file: do not die on --textconv without textconv filters

2013-02-06 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: When a command is supposed to use textconv filters (by default or with --textconv) and none are configured then the blob is output without conversion; the only exception to this rule is cat-file --textconv. I am of two minds. Because

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Junio C Hamano
Michael J Gruber g...@drmicha.warpmail.net writes: Currently, diff and cat-file for blobs obey --textconv options (with the former defaulting to --textconv and the latter to --no-textconv) whereas show does not obey this option, even though it takes diff options. Make show on blobs behave

Re: [RFC/PATCH 0/4] textconv for show and grep

2013-02-06 Thread Junio C Hamano
The parts for grep in the series makes tons of sense to me. I am not yet convinced about the other two, though. Thanks. -- 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

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Ted Zlatanov
On Wed, 06 Feb 2013 17:41:01 +0100 Matthieu Moy matthieu@grenoble-inp.fr wrote: MM Ted Zlatanov t...@lifelogs.com writes: - sort the output tokens (after 'url' is extracted) so the output is consistent and testable MM Why not, if you want to use the output of credential_write in tests.

Re: CodingGuidelines Perl amendment

2013-02-06 Thread demerphq
On 6 February 2013 17:29, Junio C Hamano gits...@pobox.com wrote: Ted Zlatanov t...@lifelogs.com writes: - As in C (see above), we avoid using braces unnecessarily (but Perl forces braces around if/unless/else/foreach blocks, so this is not always possible). Is it ever (as opposed to

[PATCH] Update CodingGuidelines for Perl 5

2013-02-06 Thread Ted Zlatanov
Update the coding guidelines for Perl 5. Signed-off-by: Ted Zlatanov t...@lifelogs.com --- Documentation/CodingGuidelines | 44 1 files changed, 44 insertions(+), 0 deletions(-) diff --git a/Documentation/CodingGuidelines

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Ted Zlatanov
On Wed, 06 Feb 2013 08:29:30 -0800 Junio C Hamano gits...@pobox.com wrote: JCH Is it ever (as opposed to not always) possible to omit braces? Oh yes! Not that I recommend it, and I'm not even going to touch on Perl Golf :) JCH It sounds as if we encourage the use of statement modifiers, which

Re: How to diff 2 file revisions with gitk

2013-02-06 Thread Johannes Sixt
Am 06.02.2013 16:57, schrieb R. Diez: I would like to start gitk, select with the mouse 2 revisions of some file and then compare them, hopefully with an external diff tool, very much like I am used to with WinCVS. The closest I got is to start gitk with a filename as an argument, in

[PATCH 2/4] perl.mak: introduce $(GIT_ROOT_DIR) to allow inclusion from other directories

2013-02-06 Thread Matthieu Moy
perl.mak uses relative path, which is OK when called from the toplevel, but won't be anymore if one includes it from elsewhere. It is now possible to include the file using: GIT_ROOT_DIR=whatever include $(GIT_ROOT_DIR)/perl.mak Signed-off-by: Matthieu Moy matthieu@imag.fr --- perl.mak | 11

[PATCH 1/4] Makefile: extract perl-related rules to make them available from other dirs

2013-02-06 Thread Matthieu Moy
The final goal is to make it easy to write Git commands in perl in the contrib/ directory. It is currently possible to do so, but without the benefits of Git's Makefile: adapt first line with $(PERL_PATH), hardcode the path to Git.pm, ... We make the perl-related part of the Makefile available

[PATCH 3/4] Makefile: factor common configuration in git-default-config.mak

2013-02-06 Thread Matthieu Moy
Similarly to the extraction of perl-related code in perl.mak, we extract general default configuration from the Makefile to make it available from directories other than the toplevel. This is required to make perl.mak usable because it requires $(pathsep) to be set. Signed-off-by: Matthieu Moy

[PATCH 0/4] Allow contrib/ to use Git's Makefile for perl code

2013-02-06 Thread Matthieu Moy
The very final goal is to be able to move painlessly (credential) code from git-remote-mediawiki to Git.pm, but then it's nice for the user to be able to say just cd contrib/mw-to-git make install and let the Makefile set perl's library path just like other Git commands written in perl. This

[PATCH 4/4] git-remote-mediawiki: use Git's Makefile to build the script

2013-02-06 Thread Matthieu Moy
The configuration of the install directory is not reused from the toplevel Makefile: we assume Git is already built, hence just call git --exec-path. This avoids too much surgery in the toplevel Makefile. git-remote-mediawiki.perl can now use Git;. Signed-off-by: Matthieu Moy

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Junio C Hamano
demerphq demer...@gmail.com writes: As you mention below statement modifiers have their place. For instance next if $whatever; Is considered preferable to if ($whatever) { next; } Similarly open my $fh, , $filename or die Failed to open '$filename': $!; Is considered

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Junio C Hamano
Ted Zlatanov t...@lifelogs.com writes: On Wed, 06 Feb 2013 08:29:30 -0800 Junio C Hamano gits...@pobox.com wrote: JCH Is it ever (as opposed to not always) possible to omit braces? Oh yes! Not that I recommend it, and I'm not even going to touch on Perl Golf :) JCH It sounds as if we

Re: CodingGuidelines Perl amendment

2013-02-06 Thread demerphq
On 6 February 2013 19:14, Junio C Hamano gits...@pobox.com wrote: demerphq demer...@gmail.com writes: As you mention below statement modifiers have their place. For instance next if $whatever; Is considered preferable to if ($whatever) { next; } Similarly open my $fh, ,

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Ted Zlatanov
On Wed, 06 Feb 2013 10:16:21 -0800 Junio C Hamano gits...@pobox.com wrote: JCH I'd suggest to just drop that try to write without braces entirely. OK, I'll do it on the reroll, or you can just make the change directly. I agree it was not going anywhere :) Ted diff --git

What's cooking in git.git (Feb 2013, #03; Wed, 6)

2013-02-06 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. As usual, this cycle is expected to last for 8 to 10 weeks, with a preview -rc0 sometime in the middle of this month. You can find the changes

Re: Bug in git log --graph -p -m (version 1.7.7.6)

2013-02-06 Thread Matthieu Moy
John Keeping j...@keeping.me.uk writes: I would argue that the line should start with | | , since it really is just a continuation of the same commit. | | | | commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from 33e70e70c0173d634826b998bdc304f93c0966b8) | | Merge: 2c1e6a3 33e70e7 | |

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Ted Zlatanov
On Wed, 6 Feb 2013 19:25:43 +0100 demerphq demer...@gmail.com wrote: d On 6 February 2013 19:05, Ted Zlatanov t...@lifelogs.com wrote: On Wed, 06 Feb 2013 08:29:30 -0800 Junio C Hamano gits...@pobox.com wrote: JCH Is it ever (as opposed to not always) possible to omit braces? Oh yes! Not

Re: CodingGuidelines Perl amendment

2013-02-06 Thread demerphq
On 6 February 2013 19:35, Ted Zlatanov t...@lifelogs.com wrote: On Wed, 6 Feb 2013 19:25:43 +0100 demerphq demer...@gmail.com wrote: d On 6 February 2013 19:05, Ted Zlatanov t...@lifelogs.com wrote: On Wed, 06 Feb 2013 08:29:30 -0800 Junio C Hamano gits...@pobox.com wrote: JCH Is it ever (as

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Ted Zlatanov
On Wed, 6 Feb 2013 19:44:16 +0100 demerphq demer...@gmail.com wrote: d Ah ok. Right, at a low level: d if (condition) { do_this() } d is identical to d condition do_this(); d IOW, Perl allows logical operators to act as control flow statements. d I hope your document include something that

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Junio C Hamano
Duy Nguyen pclo...@gmail.com writes: On Tue, Feb 5, 2013 at 5:29 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Hiderefs creates a dark corner of a remote git repo that can hold arbitrary content that is impossible for anybody to discover but nevertheless possible for anybody to download

Re: What's cooking in git.git (Feb 2013, #03; Wed, 6)

2013-02-06 Thread Jens Lehmann
Am 06.02.2013 19:29, schrieb Junio C Hamano: * jl/submodule-deinit (2013-02-04) 1 commit - submodule: add 'deinit' command There was no Porcelain way to say I no longer am interested in this submodule, once you express your interest in a submodule with submodule init. submodule deinit

Re: CodingGuidelines Perl amendment

2013-02-06 Thread Junio C Hamano
Ted Zlatanov t...@lifelogs.com writes: Make your code readable and sensible, and don't try to be clever. But this is good C and shell advice too,... Sounds sensible. -- To unsubscribe from this list: send the line unsubscribe git in the body of a message to majord...@vger.kernel.org More

Re: What's cooking in git.git (Feb 2013, #03; Wed, 6)

2013-02-06 Thread Junio C Hamano
Jens Lehmann jens.lehm...@web.de writes: Am 06.02.2013 19:29, schrieb Junio C Hamano: * jl/submodule-deinit (2013-02-04) 1 commit - submodule: add 'deinit' command There was no Porcelain way to say I no longer am interested in this submodule, once you express your interest in a

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Jonathan Nieder
Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: On Tue, Feb 5, 2013 at 5:29 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Hiderefs creates a dark corner of a remote git repo [...] Or you can think hiderefs is the first step to addressing the initial ref advertisment problem.

[PATCH v2] Update CodingGuidelines for Perl 5

2013-02-06 Thread Ted Zlatanov
Update the coding guidelines for Perl 5. Signed-off-by: Ted Zlatanov t...@lifelogs.com --- Changes since PATCHv1: - removed brace guidelines - add don't try to be clever at beginning Documentation/CodingGuidelines | 42 1 files changed, 42

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Jonathan Nieder
Michael Haggerty wrote: Scenario 1: Some providers junk up their users' repositories with content that is not created by the repository's owner and that the owner doesn't want to appear to vouch for (e.g., GitHub pull requests). These references might sometimes be useful to fetch, singly or

[PATCH] graph: output padding for merge subsequent parents

2013-02-06 Thread John Keeping
On Wed, Feb 06, 2013 at 07:33:08PM +0100, Matthieu Moy wrote: John Keeping j...@keeping.me.uk writes: I would argue that the line should start with | | , since it really is just a continuation of the same commit. | | | | commit a393ed598e9fb11436f85bd58f1a38c82f2cadb7 (from

Re: [RFC] test-lib.sh: No POSIXPERM for cygwin

2013-02-06 Thread Torsten Bögershausen
Am 2013-02-06 10:34, schrieb Erik Faye-Lund: On Sun, Jan 27, 2013 at 3:57 PM, Torsten Bögershausen tbo...@web.de wrote: t0070 and t1301 fail when running the test suite under cygwin. Skip the failing tests by unsetting POSIXPERM. But is this the real reason? I thought Cygwin implemented

[PATCH 0/4] Make git-send-email git-credential

2013-02-06 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com As discussed on the list, adding git-credential interface to Git.pm (sort of copied from git-remote-mediawiki) and making git-send-email use it. I see git-remote-mediawiki does not have “use Git” so I did not touch it. On top of that I'd have no way to

Re: [PATCH 0/4] Make git-send-email git-credential

2013-02-06 Thread Michal Nazarewicz
On Wed, Feb 06 2013, Michal Nazarewicz wrote: As discussed on the list, adding git-credential interface to Git.pm (sort of copied from git-remote-mediawiki) and making git-send-email use it. I see git-remote-mediawiki does not have “use Git” so I did not touch it. On top of that I'd have no

Re: Why is ident_is_sufficient different on Windows?

2013-02-06 Thread Junio C Hamano
Max Horn m...@quendi.de writes: static int ident_is_sufficient(int user_ident_explicitly_given) { #ifndef WINDOWS return (user_ident_explicitly_given IDENT_MAIL_GIVEN); #else return (user_ident_explicitly_given == IDENT_ALL_GIVEN); #endif } According to git blame, this was

[PATCH 0/4] Make git-send-email git-credential

2013-02-06 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com As discussed on the list, adding git-credential interface to Git.pm (sort of copied from git-remote-mediawiki) and making git-send-email use it. I see git-remote-mediawiki does not have “use Git” so I did not touch it. On top of that I'd have no way to

[PATCH 1/4] Git.pm: Allow command_close_bidi_pipe() to be called as method

2013-02-06 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com The documentation of command_close_bidi_pipe() claims that it can be called as a method, but it does not check whether the first argument is $self or not assuming the latter. Using _maybe_self() fixes this. Signed-off-by: Michal Nazarewicz

[PATCH 2/4] Git.pm: Allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-06 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com The command_close_bidi_pipe() function will insist on closing both input and output pipes returned by command_bidi_pipe(). With this change it is possible to close one of the pipes in advance and pass undef as an argument. This allows for something

[PATCH 4/4] git-send-email: Use git credential to obtain password.

2013-02-06 Thread Michal Nazarewicz
From: Michal Nazarewicz min...@mina86.com If smtp_user is provided but smtp_pass is not, instead of prompting for password, make git-send-email use git credential command instead. Signed-off-by: Michal Nazarewicz min...@mina86.com --- Documentation/git-send-email.txt | 4 +--

Re: Why is ident_is_sufficient different on Windows?

2013-02-06 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: I suspect somebody from the Windows camp saw a patch I posted without the ifdef, noticed that there is a problem to expect IDENT_NAME_GIVEN to be set on Windows for some reason, and resulted in a reroll of the function in that shape. I didn't find

Re: Why is ident_is_sufficient different on Windows?

2013-02-06 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Junio C Hamano gits...@pobox.com writes: I suspect somebody from the Windows camp saw a patch I posted without the ifdef, noticed that there is a problem to expect IDENT_NAME_GIVEN to be set on Windows for some reason, and resulted in a reroll of the

Re: [PATCH 0/4] Make git-send-email git-credential

2013-02-06 Thread Junio C Hamano
Michal Nazarewicz min...@mina86.com writes: On second thought, give me a moment, ;) I've just discovered a bug preventing git-send-email from mailing a patchset. I somehow found this highly amusing. I wish all the bugs are like that: if your series is buggy, some parts of the system prevents

[PATCH v4] submodule: add 'deinit' command

2013-02-06 Thread Jens Lehmann
With git submodule init the user is able to tell git he cares about one or more submodules and wants to have it populated on the next call to git submodule update. But currently there is no easy way he could tell git he does not care about a submodule anymore and wants to get rid of his local work

Re: will git provide `submodule remove` option ?‏

2013-02-06 Thread Jens Lehmann
Am 05.02.2013 11:32, schrieb Lingcha X: As we all know, git provides `submodule add , init, update, sync, sumary, foreach, status`, but where is `submodule remove`? will I not delete one of them sometime in the future? Although most people will not use submodule or one who uses it can

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Michael Haggerty
On 02/06/2013 08:17 PM, Junio C Hamano wrote: Duy Nguyen pclo...@gmail.com writes: On Tue, Feb 5, 2013 at 5:29 PM, Michael Haggerty mhag...@alum.mit.edu wrote: Hiderefs creates a dark corner of a remote git repo that can hold arbitrary content that is impossible for anybody to discover but

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 10:58:13AM -0500, Ted Zlatanov wrote: MM I don't know about the netrc credential helper, but I guess that's MM another layer. The git-remote-mediawiki code is the code to call the MM credential C API, that in turn may (or may not) call a credential MM helper. Yup.

[PATCH] connect.c: Tell *PLink to always use ssh protocol

2013-02-06 Thread Sven Strickroth
Default values for *plink can be set using PuTTY. If a user makes telnet the default in PuTTY this breaks ssh clones in git. Since git clones of the type user@host:path use ssh, tell *plink to use ssh and override PuTTY defaults for the protocol to use. Signed-off-by: Sven Strickroth

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 04:08:50PM +0100, Michael J Gruber wrote: diff --git a/builtin/log.c b/builtin/log.c index 8f0b2e8..f83870d 100644 --- a/builtin/log.c +++ b/builtin/log.c @@ -402,10 +402,28 @@ static void show_tagger(char *buf, int len, struct rev_info *rev)

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Michael Haggerty
On 02/06/2013 08:55 PM, Jonathan Nieder wrote: Michael Haggerty wrote: [...] But now every time I do a gitk --all or git log --decorate, the output is cluttered with all of his references (most of which are just old versions of references from the upstream repository that we both use). I

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 08:53:52AM -0800, Junio C Hamano wrote: Michael J Gruber g...@drmicha.warpmail.net writes: Currently, diff and cat-file for blobs obey --textconv options (with the former defaulting to --textconv and the latter to --no-textconv) whereas show does not obey this

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: On 02/06/2013 08:17 PM, Junio C Hamano wrote: ... Yes, the first three patches sound much more reasonable if this is the goal. ... I think that a more useful interim solution would be to make it easy to have two URLs accessing a single git

Re: [RFC/PATCH 2/4] cat-file: do not die on --textconv without textconv filters

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 04:08:51PM +0100, Michael J Gruber wrote: When a command is supposed to use textconv filters (by default or with --textconv) and none are configured then the blob is output without conversion; the only exception to this rule is cat-file --textconv. Make it behave

Re: [RFC/PATCH 3/4] grep: allow to use textconv filters

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 04:08:52PM +0100, Michael J Gruber wrote: From: Jeff King p...@peff.net Recently and not so recently, we made sure that log/grep type operations use textconv filters when a userfacing diff would do the same: ef90ab6 (pickaxe: use textconv for -S counting,

Re: [RFC/PATCH 2/4] cat-file: do not die on --textconv without textconv filters

2013-02-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: Which made me wonder: what happens with: git cat-file --textconv HEAD It looks like we die just before textconv-ing, because we have no obj_context.path. But that is also unlike all of the other --textconv switches, which mean turn on textconv if you are

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Ævar Arnfjörð Bjarmason
On Wed, Feb 6, 2013 at 8:17 PM, Junio C Hamano gits...@pobox.com wrote: Maybe this should be split up into a different thread, but: The upload-pack-2 service sits on a port different from today's [...]. I think there's a simpler way to do this, which is that: * New clients supporting v2 of

Re: [RFC/PATCH 4/4] grep: obey --textconv for the case rev:path

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 04:08:53PM +0100, Michael J Gruber wrote: - add_object_array(object, arg, list); + add_object_array_with_context(object, arg, list, xmemdupz(oc, sizeof(struct object_context))); If we go this route, this new _with_context

Re: [RFC/PATCH 2/4] cat-file: do not die on --textconv without textconv filters

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 02:23:36PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Which made me wonder: what happens with: git cat-file --textconv HEAD It looks like we die just before textconv-ing, because we have no obj_context.path. But that is also unlike all of

Re: [PATCH] Verify Content-Type from smart HTTP servers

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 07:56:08AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Is it worth having a strbuf_set* family of functions to match the strbuf_add*? We seem to have these sorts of errors with strbuf from time to time, and I wonder if that would make it easier

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 11:17:06AM -0800, Junio C Hamano wrote: Let me help unconfuse this thread. I think the series as 8-patch series was poorly presented, and separating it into two will help understanding what they are about. The first three: upload-pack: share more code

Re: [PATCH 2/4] Git.pm: Allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 09:47:04PM +0100, Michal Nazarewicz wrote: From: Michal Nazarewicz min...@mina86.com The command_close_bidi_pipe() function will insist on closing both input and output pipes returned by command_bidi_pipe(). With this change it is possible to close one of the pipes

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Ted Zlatanov
On Wed, 6 Feb 2013 16:57:24 -0500 Jeff King p...@peff.net wrote: JK On Wed, Feb 06, 2013 at 10:58:13AM -0500, Ted Zlatanov wrote: MM I don't know about the netrc credential helper, but I guess that's MM another layer. The git-remote-mediawiki code is the code to call the MM credential C API,

Re: [PATCH 3/4] Git.pm: Add interface for git credential command.

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 09:47:05PM +0100, Michal Nazarewicz wrote: +sub _credential_read { + my %credential; + my ($reader, $op) = (@_); + while ($reader) { + chomp; + my ($key, $value) = /([^=]*)=(.*)/; Empty keys are not valid. Can we make this:

Re: [PATCH 4/4] git-send-email: Use git credential to obtain password.

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 09:47:06PM +0100, Michal Nazarewicz wrote: From: Michal Nazarewicz min...@mina86.com If smtp_user is provided but smtp_pass is not, instead of prompting for password, make git-send-email use git credential command instead. Signed-off-by: Michal Nazarewicz

Re: [PATCH] connect.c: Tell *PLink to always use ssh protocol

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 10:58:49PM +0100, Sven Strickroth wrote: Default values for *plink can be set using PuTTY. If a user makes telnet the default in PuTTY this breaks ssh clones in git. Since git clones of the type user@host:path use ssh, tell *plink to use ssh and override PuTTY

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: And stating it that way makes it clear that there may be other missing steps (3 and up) to apply other gitattributes. For example, should git show $blob respect crlf attributes? Smudge filters? Yeah, I think applying these when path is availble may make sense.

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 03:49:44PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: And stating it that way makes it clear that there may be other missing steps (3 and up) to apply other gitattributes. For example, should git show $blob respect crlf attributes? Smudge

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason ava...@gmail.com writes: I think there's a simpler way to do this, which is that: * New clients supporting v2 of the protocol send some piece of data that would break old servers. * If that fails the new client goes oh jeeze, I guess it's an old server, and

Re: [PATCH 2/4] Git.pm: Allow pipes to be closed prior to calling command_close_bidi_pipe

2013-02-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Feb 06, 2013 at 09:47:04PM +0100, Michal Nazarewicz wrote: From: Michal Nazarewicz min...@mina86.com The command_close_bidi_pipe() function will insist on closing both input and output pipes returned by command_bidi_pipe(). With this change it is

Re: [PATCH v3 0/8] Hiding refs

2013-02-06 Thread Jeff King
On Wed, Feb 06, 2013 at 04:12:10PM -0800, Junio C Hamano wrote: Ævar Arnfjörð Bjarmason ava...@gmail.com writes: I think there's a simpler way to do this, which is that: * New clients supporting v2 of the protocol send some piece of data that would break old servers. * If that

Re: [RFC/PATCH 1/4] show: obey --textconv for blobs

2013-02-06 Thread Junio C Hamano
Jeff King p...@peff.net writes: git-show should probably have the same option. I doubt it should be on by default, but I can see it being useful for: git show --to-filesystem HEAD:Makefile Makefile or whatever. I don't think those features necessarily need to come as part of Michael's

Re: [PATCH 2/3] combine-diff: suppress a clang warning

2013-02-06 Thread Miles Bader
John Keeping j...@keeping.me.uk writes: I generally like to get rid of the pointless warnings so that the useful ones can't hide in the noise. Perhaps CFLAGS += -Wno-string-plus-int would be better for this particular warning, but when there's only one bit of code that triggers it, tweaking

RE: will git provide `submodule remove` option ?‏

2013-02-06 Thread Lingcha X
Hi Jens,     `git rm -r submodule` will not do the same thing, i do NOT know if `git submodule deinit`, i will have some tests. Thanks and Best Regards, lingchax Date: Wed, 6 Feb 2013 22:27:48 +0100 From: jens.lehm...@web.de To:

Re: [PATCH] git-send-email: add ~/.authinfo parsing

2013-02-06 Thread Matthieu Moy
Ted Zlatanov t...@lifelogs.com writes: Logically they are different steps (query and response), even though the data protocol is the same. But it's really not a big deal, I know what it means either way. Yes, but if you rename write() to query(), then on the helper side, you'll have to call

Re: [PATCH 3/4] Git.pm: Add interface for git credential command.

2013-02-06 Thread Matthieu Moy
Michal Nazarewicz m...@google.com writes: From: Michal Nazarewicz min...@mina86.com Add a credential() function which is an interface to the git credential command. Nice. I think you should credit git-remote-mediawiki for the code in the commit message. Perhaps have a first copy/paste

Re: [PATCH 3/4] Git.pm: Add interface for git credential command.

2013-02-06 Thread Matthieu Moy
Michal Nazarewicz m...@google.com writes: Subject: [PATCH 3/4] Git.pm: Add interface for git credential command. Ah, just a nitpick: usually we write the message without capital after : and without the final .. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list:

  1   2   >