Re: [RFC] Questions for Git User's Survey 2011

2012-09-25 Thread Matthieu Moy
Jakub Narębski jna...@gmail.com writes: Second, the situation is more complicated: one can be actively involved in 1 distributed project with 200+ contributors via Gerrit, often contribute to 1 centralized project with 15-25 contributors, and rarely interact with distributed project using

[RFC] Questions for Git User's Survey 2011

2012-09-25 Thread Jakub Narębski
[I'm sorry for breaking the chain, but I have accidentally hit Reply, instead of Reply To All, and missed sending reply to git mailing list] On Tue, Sep 25, 2012 at 8:17 AM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Jakub Narębski jna...@gmail.com writes: Second, the situation is more

[PATCH 6/5] side-step a make rule that builds t3070-wildmatch

2012-09-25 Thread Johannes Sixt
From: Johannes Sixt j...@kdbg.org Running make t3070-wildmatch aborts with this error: $ make t3070-wildmatch *** t3070-wildmatch.sh *** # passed all 11 test(s) 1..11 cat t3070-wildmatch.sh t3070-wildmatch /bin/sh.exe: t3070-wildmatch: File exists make: *** [t3070-wildmatch]

Re: Quickly searching for a note

2012-09-25 Thread Michael J Gruber
Jeff King venit, vidit, dixit 25.09.2012 02:42: On Sun, Sep 23, 2012 at 05:07:04PM +0200, Michael J Gruber wrote: If we linked with an embeddable scripting language interpreter (e.g. lua, tcl, guile, ...), it may be a more practical enhancement, though. Yes, the idea is extend, don't

Re: [RFC/PATCH] git: expand user path in --git-dir

2012-09-25 Thread Michael J Gruber
Jan Engelhardt venit, vidit, dixit 25.09.2012 07:33: On Monday 2012-09-24 14:57, Michael J Gruber wrote: Currently, all paths in the config file are subject to tilde expansion for user paths while the argument to --git-dir is not expanded, and neither are paths in the environment such as

Re: Can git pull from a mercurial repository?

2012-09-25 Thread Gelonida N
On 09/18/2012 02:40 PM, Joachim Schmitz wrote: From: Andreas Ericsson [mailto:a...@op5.se] Sent: Tuesday, September 18, 2012 1:46 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: Can git pull from a mercurial repository? On 09/18/2012 01:22 PM, Joachim Schmitz wrote: Is there an

[PATCH] mergetool--lib: Allow custom commands to override built-ins

2012-09-25 Thread David Aguilar
Allow users to override the default commands provided by the mergetools/* scriptlets. Users occasionally run into problems where they expect to be able to override the built-in tool names. The documentation does not explicitly mention that built-ins cannot be overridden, so it's easy to assume

Re: [RFC/PATCH 0/3] git log --pretty=lua

2012-09-25 Thread Nguyen Thai Ngoc Duy
On Tue, Sep 25, 2012 at 7:23 AM, Jeff King p...@peff.net wrote: We've talked off and on about extending the --pretty=format specifiers to something more flexible. There's also been talk recently of more flexible commit-filtering (e.g., grepping individual notes). Rather than invent a new

Re: [RFC/PATCH 0/3] git log --pretty=lua

2012-09-25 Thread Stephen Bash
- Original Message - From: Nguyen Thai Ngoc Duy pclo...@gmail.com Sent: Tuesday, September 25, 2012 7:22:49 AM Subject: Re: [RFC/PATCH 0/3] git log --pretty=lua On Tue, Sep 25, 2012 at 7:23 AM, Jeff King p...@peff.net wrote: We've talked off and on about extending the

Re: Can git pull from a mercurial repository?

2012-09-25 Thread Joachim Schmitz
Gelonida N wrote: On 09/18/2012 02:40 PM, Joachim Schmitz wrote: From: Andreas Ericsson [mailto:a...@op5.se] Sent: Tuesday, September 18, 2012 1:46 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: Can git pull from a mercurial repository? On 09/18/2012 01:22 PM, Joachim Schmitz

Re: Can git pull from a mercurial repository?

2012-09-25 Thread Max Horn
Hi there, On 18.09.2012, at 14:40, Joachim Schmitz wrote: From: Andreas Ericsson [mailto:a...@op5.se] Sent: Tuesday, September 18, 2012 1:46 PM To: Joachim Schmitz Cc: git@vger.kernel.org Subject: Re: Can git pull from a mercurial repository? On 09/18/2012 01:22 PM, Joachim Schmitz

RE: Can git pull from a mercurial repository?

2012-09-25 Thread Joachim Schmitz
From: Max Horn [mailto:post...@quendi.de] Sent: Tuesday, September 25, 2012 4:15 PM To: Joachim Schmitz Cc: 'Andreas Ericsson'; git@vger.kernel.org Subject: Re: Can git pull from a mercurial repository? Hi there, On 18.09.2012, at 14:40, Joachim Schmitz wrote: From: Andreas

Re: [RFC/PATCH 0/3] git log --pretty=lua

2012-09-25 Thread Matthieu Moy
Jeff King p...@peff.net writes: We've talked off and on about extending the --pretty=format specifiers to something more flexible. There's also been talk recently of more flexible commit-filtering (e.g., grepping individual notes). Mercurial has a similar thing, which can be a source of

Re: Quickly searching for a note

2012-09-25 Thread Junio C Hamano
Jeff King p...@peff.net writes: Agreed. I just posted a patch series that gives you --pretty lua support, though I haven't convinced myself it's all that exciting yet. I think it would be nicer for grepping, where the conditionals read more like regular code. Something like: git log

Re: [RFC/PATCH 0/3] git log --pretty=lua

2012-09-25 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Jeff King p...@peff.net writes: We've talked off and on about extending the --pretty=format specifiers to something more flexible. There's also been talk recently of more flexible commit-filtering (e.g., grepping individual notes).

[PATCH] pathspec.c: Fix some sparse warnings

2012-09-25 Thread Ramsay Jones
Sparse issues a warning for all six external symbols defined in this file. In order to suppress the warnings, we include the 'pathspec.h' header file, which contains the relevant extern declarations for these symbols. Signed-off-by: Ramsay Jones ram...@ramsay1.demon.co.uk --- Hi Adam, When you

Re: problem with setlocale trick in gettext.c

2012-09-25 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: I think the setlocale() trick in init_gettext_charset() messes up locale support from library. Currently I get fatal: Could not switch to '/foo/': Kh?ng c? t?p tin ho?c th? m?c nh? v?y That pretty much matches what the big comment before your

Re: [PATCH] pathspec.c: Fix some sparse warnings

2012-09-25 Thread Adam Spiers
On Tue, Sep 25, 2012 at 6:15 PM, Ramsay Jones ram...@ramsay1.demon.co.uk wrote: Sparse issues a warning for all six external symbols defined in this file. In order to suppress the warnings, we include the 'pathspec.h' header file, which contains the relevant extern declarations for these

Re: [PATCH] graph: avoid infinite loop in graph_show_commit()

2012-09-25 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Has either of you tried the patch with the problematic case the other patch tries to solve? Michal's old patch does smell like it is going in the better direction in that it stops looping when we know we would only be showing the padding, which is a

A generalization of git blame

2012-09-25 Thread xmeng
Hi, I have been developing my git tool (based on the git internal API) that can find out all the commits that have changed a line for better authorship. The reason is for my binary code authorship research, I use machine learning to classify code authorship. To produce training data, I start

[PATCH] git-web--browse: Fix open HTML help pages from iTerm

2012-09-25 Thread Steffen Prohaska
iTerm is an alternative to the default terminal emulation program on Mac OS X. git-web--browse wasn't aware of iTerm and failed to open HTML help pages when used in a shell session running in iTerm, reporting No known browser available. Now it works as expected. Signed-off-by: Steffen Prohaska

[RFC PATCH 0/2] gitweb: tags feed

2012-09-25 Thread Giuseppe Bilotta
The idea of this small patchset is to generate feeds listing only tags. This is useful to allow users to follow only the ‘stable’ (i.e. tagged, not in-progress) releases of the project from its gitweb (e.g. because the project doesn't have an actual website, or whatever). It's a draft

[PATCH 1/2] gitweb: infrastructure for tags feed

2012-09-25 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta giuseppe.bilo...@gmail.com --- gitweb/gitweb.perl | 79 +++--- 1 file changed, 58 insertions(+), 21 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 7f8c187..6cb51f7 100755 ---

[PATCH 2/2] gitweb: expose tags feed in appropriate places

2012-09-25 Thread Giuseppe Bilotta
Signed-off-by: Giuseppe Bilotta giuseppe.bilo...@gmail.com --- gitweb/gitweb.perl | 47 +-- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl index 6cb51f7..9ac28aa 100755 --- a/gitweb/gitweb.perl

Re: [PATCH] submodule: configure submodule.name.path on add and init

2012-09-25 Thread Jens Lehmann
Am 24.09.2012 22:43, schrieb Junio C Hamano: Jens Lehmann jens.lehm...@web.de writes: Am 24.09.2012 21:30, schrieb Orgad Shaneh: In order to read diff options for a submodule, its path must be configured --- git-submodule.sh |2 ++ 1 file changed, 2 insertions(+) diff --git

Re: [PATCH 2/3] add basic lua infrastructure

2012-09-25 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Sep 25, 2012 at 03:21:10AM +, Robin H. Johnson wrote: On Mon, Sep 24, 2012 at 08:25:12PM -0400, Jeff King wrote: +ifdef USE_LUA + BASIC_CFLAGS += -DUSE_LUA `pkg-config --cflags lua5.2` + EXTLIBS += `pkg-config --libs lua5.2` +endif Can

Re: A generalization of git blame

2012-09-25 Thread Philip Oakley
From: xm...@cs.wisc.edu I have been developing my git tool (based on the git internal API) that can find out all the commits that have changed a line for better authorship. The reason is for my binary code authorship research, I use machine learning to classify code authorship. To produce

Re: [PATCH] Revert completion: fix shell expansion of items

2012-09-25 Thread SZEDER Gábor
On Tue, Sep 25, 2012 at 12:31:19AM -0400, Jeff King wrote: Yeah, doing git checkout jk/tab is not working at all, and I noticed the buggy commit is on the maint track, but has not yet been released. I'm not sure of the solution, but I think we should do this in the meantime: -- 8 --

Re: Problem completing remotes when .git/remotes exits

2012-09-25 Thread SZEDER Gábor
Hi, On Wed, Sep 19, 2012 at 09:55:28PM +0200, Johannes Sixt wrote: I have an empty .git/remotes directory. Trying to complete the name of a remote always reports an error: git@master:1023 git fetch TABls: invalid option -- ' ' Try `ls --help' for more information. I have these:

Re: A generalization of git blame

2012-09-25 Thread Junio C Hamano
Philip Oakley philipoak...@iee.org writes: To get ground truth of authorship for each line, I start with git-blame. But later I find this is not sufficient because the last commit may only add comments or may only change a small part of the line, so that I shouldn't attribute the line of

Re: /* in .gitignore

2012-09-25 Thread Junio C Hamano
Hilco Wijbenga hilco.wijbe...@gmail.com writes: Naturally, this behaviour makes perfect sense: /* means everything. Still, I was wondering whether it might be a good idea to make an exception for '.gitignore' itself? Then if somebody *really* wanted to ignore '.gitignore' they could add

Re: [PATCH v2 14/14] Add git-check-ignore sub-command

2012-09-25 Thread Junio C Hamano
Johannes Sixt j.s...@viscovery.net writes: Am 9/20/2012 21:46, schrieb Adam Spiers: test_expect_success 'general options plus command' ' -test_completion git --version check checkout -test_completion git --paginate check checkout -test_completion git --git-dir=foo check

Re: [PATCH] Revert completion: fix shell expansion of items

2012-09-25 Thread Junio C Hamano
SZEDER Gábor sze...@ira.uka.de writes: On Tue, Sep 25, 2012 at 12:31:19AM -0400, Jeff King wrote: Yeah, doing git checkout jk/tab is not working at all, and I noticed the buggy commit is on the maint track, but has not yet been released. I'm not sure of the solution, but I think we should do

Re: Problem completing remotes when .git/remotes exits

2012-09-25 Thread Junio C Hamano
SZEDER Gábor sze...@ira.uka.de writes: - test -d $d/remotes ls -1 $d/remotes + test -d $d/remotes command ls -1 $d/remotes Yuck. For normal scripts, nobody sane would define alias for non-interactive environments, but because these things work in an interactive environment, we have

Re: /* in .gitignore

2012-09-25 Thread Hilco Wijbenga
On 25 September 2012 16:13, Junio C Hamano gits...@pobox.com wrote: Hilco Wijbenga hilco.wijbe...@gmail.com writes: Naturally, this behaviour makes perfect sense: /* means everything. Still, I was wondering whether it might be a good idea to make an exception for '.gitignore' itself? Then if

Re: [PATCH] Teach git-completion about git p4

2012-09-25 Thread Pete Wyckoff
etao...@gmail.com wrote on Fri, 21 Sep 2012 14:51 -0700: git p4 was moved out of contrib in 1.7.11 but it git-completion didn't know about it. Add git p4 completion based on the existing SVN completion. It covers all known subcommands and options except for the -/ option for clone which

Re: Problem completing remotes when .git/remotes exits

2012-09-25 Thread SZEDER Gábor
On Wed, Sep 26, 2012 at 01:00:45AM +0200, SZEDER Gábor wrote: But then it got me thinking... Notice how much effort we spend just to get the list of remotes? We could just run 'git remote' directly instead... Actually, we can't, because 'git remote' doesn't seem to list remotes stored under

Re: Problem completing remotes when .git/remotes exits

2012-09-25 Thread SZEDER Gábor
On Wed, Sep 26, 2012 at 03:09:38AM +0200, SZEDER Gábor wrote: On Wed, Sep 26, 2012 at 01:00:45AM +0200, SZEDER Gábor wrote: But then it got me thinking... Notice how much effort we spend just to get the list of remotes? We could just run 'git remote' directly instead... Actually, we

DWIM .git repository discovery

2012-09-25 Thread Nguyen Thai Ngoc Duy
Hi, I often find myself attempting to examine another repository, especially in projects that are closely related but put in different git repos. It's usually just a diff or log command git log --patch ../path/to/another/repo/path/to/file.c cd'ing out is nuisance for one-shot commands, even

Re: [PATCH] t/test-lib.sh: do not trust $SHELL

2012-09-25 Thread Ramkumar Ramachandra
Hi Junio, Junio C Hamano wrote: Ramkumar Ramachandra artag...@gmail.com writes: Here's a patch. -- 8 -- From: Ramkumar Ramachandra artag...@gmail.com Date: Sat, 22 Sep 2012 10:25:10 +0530 Subject: [PATCH] test-lib: do not trust $SHELL Do not trust $SHELL to be a bourne-compatible shell.

Bug in Submodule add

2012-09-25 Thread Jonathan Johnson
I believe I have found an issue with the way `submodule add` detects a submodule that already exists in the repository. To reproduce 1) add a git submodule in a specific location (we'll say it's at `./submodule/location`) 2) go through the normal steps of removing a submodule, as listed here

Re: DWIM .git repository discovery

2012-09-25 Thread Junio C Hamano
Nguyen Thai Ngoc Duy pclo...@gmail.com writes: I often find myself attempting to examine another repository, especially in projects that are closely related but put in different git repos. It's usually just a diff or log command git log --patch ../path/to/another/repo/path/to/file.c I

Re: [PATCH v2 14/14] Add git-check-ignore sub-command

2012-09-25 Thread Johannes Sixt
Am 9/26/2012 1:25, schrieb Junio C Hamano: Johannes Sixt j.s...@viscovery.net writes: Am 9/20/2012 21:46, schrieb Adam Spiers: test_expect_success 'general options plus command' ' - test_completion git --version check checkout - test_completion git --paginate check checkout -