[RFC] Questions for "Git User's Survey 2011"

2012-09-24 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 wrote: > Jakub Narębski writes: > >> Second, the situation is more complicated: one can be actively involved

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

2012-09-24 Thread Matthieu Moy
Jakub Narębski 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 "blessed" reposi

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

2012-09-24 Thread Jan Engelhardt
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 GIT_DIR. From the user >perspective, though, the two comma

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

2012-09-24 Thread Jeff King
On Tue, Sep 25, 2012 at 08:55:23AM +0700, Nguyen Thai Ngoc Duy wrote: > On Tue, Sep 25, 2012 at 7:25 AM, Jeff King wrote: > > +ifdef USE_LUA > > + BASIC_CFLAGS += -DUSE_LUA `pkg-config --cflags lua5.2` > > + EXTLIBS += `pkg-config --libs lua5.2` > > +endif > > + > > I remember we pai

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

2012-09-24 Thread Jeff King
On Thu, Sep 20, 2012 at 08:11:52PM +0200, SZEDER Gábor wrote: > > > Solves the original problem for me. > > > > Me too. Thanks. > > While it solves the original problem, it seems to break refs > completion, as demonstrated by the following POC test: > > > diff --git a/t/t9902-completion.sh b/t

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

2012-09-24 Thread Jeff King
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 you please hoist the pack

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

2012-09-24 Thread Robin H. Johnson
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 you please hoist the packagename out to a variable? It's just plain "lua" on Gentoo. -- Robin Hugh

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

2012-09-24 Thread Nguyen Thai Ngoc Duy
On Tue, Sep 25, 2012 at 7:25 AM, Jeff King wrote: > +ifdef USE_LUA > + BASIC_CFLAGS += -DUSE_LUA `pkg-config --cflags lua5.2` > + EXTLIBS += `pkg-config --libs lua5.2` > +endif > + I remember we paid noticeable penalty when linking with libcurl to main git binary and Linus removed lib

Re: Quickly searching for a note

2012-09-24 Thread Jeff King
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 embed" the other way round, so to say.

Re: Quickly searching for a note

2012-09-24 Thread Jeff King
On Sat, Sep 22, 2012 at 01:23:56PM -0700, Junio C Hamano wrote: > Michael J Gruber writes: > > > On my mental scratch pad (yeah, that's where the bald spots are) I have > > the following more general idea to enhance the revision parser: > > > > --limit-run=

Re: [PATCH 3/2] pretty: support right alignment

2012-09-24 Thread Jeff King
On Sun, Sep 23, 2012 at 01:17:43AM -0700, Junio C Hamano wrote: > Nguyen Thai Ngoc Duy writes: > > > ... On the other hand, I don't > > really wish to turn pretty format machinery into a full feature text > > layout engine (by ripping of links/lynx?). > > That is very true. We should restrain

[PATCH 3/3] add a "lua" pretty format

2012-09-24 Thread Jeff King
With this patch, you can do: git log --pretty=lua:' return abbrev(hash()) .. " (" .. author().email .. ") " .. subject() ' Signed-off-by: Jeff King --- commit.h | 1 + log-tree.c | 3 ++- pretty.c | 21 +++-- 3 files changed, 22 insertions(+), 3 deletions(-) diff

[PATCH 2/3] add basic lua infrastructure

2012-09-24 Thread Jeff King
This adds a small module for examining parts of a commit from inside a lua interpreter. Eventually you'll be able to do grep-like filtering and --pretty formatting. The most naive presentation would be to parse the whole commit and put it in a lua table. However, instead we build upon the incremen

[PATCH 1/3] pretty: make some commit-parsing helpers more public

2012-09-24 Thread Jeff King
This is a quick hack to make these functions available for the lua code. It would be way cleaner to move all of the incremental parsing bits to format-commit.[ch] and clean up the names (e.g., "struct chunk" is not nearly descriptive enough for a global). Signed-off-by: Jeff King --- commit.h |

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

2012-09-24 Thread Jeff King
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 Turing-complete language, I thought I'd try building on somebody else's w

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

2012-09-24 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > On Sun, Sep 23, 2012 at 6:55 PM, Michal Kiedrowicz > wrote: >> Nguyễn Thái Ngọc Duy gmail.com> writes: >> >>> >>> The loop can be triggered with "git diff-tree --graph commit" where >>> the commit is a non-merge. It goes like this >> >> >> Isn't this the same issu

Re: [PATCH] silence git gc --auto --quiet output

2012-09-24 Thread Junio C Hamano
Junio C Hamano writes: > Tobias Ulmer writes: > >> When --quiet is requested, gc --auto should not display messages unless >> there is an error. >> >> Signed-off-by: Tobias Ulmer >> --- >> builtin/gc.c |4 +--- >> 1 files changed, 1 insertions(+), 3 deletions(-) >> >> diff --git a/builtin/

Re: [PATCH] silence git gc --auto --quiet output

2012-09-24 Thread Junio C Hamano
Tobias Ulmer writes: > When --quiet is requested, gc --auto should not display messages unless > there is an error. > > Signed-off-by: Tobias Ulmer > --- > builtin/gc.c |4 +--- > 1 files changed, 1 insertions(+), 3 deletions(-) > > diff --git a/builtin/gc.c b/builtin/gc.c > index 6d46608..

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

2012-09-24 Thread Junio C Hamano
Adam Spiers writes: > t/t0007-ignores.sh| 587 > ++ I needed this to make it pass the test. I didn't see anything that is passed to expect_in via $text that would benefit from "echo -e" but I did not look too carefully; you may have had a reas

[PATCHv2] l10n: de.po: correct translation of one 'rebase' message

2012-09-24 Thread Ralf Thielow
Noticed-by: Sascha Cunz Signed-off-by: Ralf Thielow --- >Not very elegant yet, shouldn't it say something like > > als ob es das Verzeichnis ... bereits {gibt,gäbe} > >? Yes, thanks. po/de.po | 10 +- 1 Datei geändert, 5 Zeilen hinzugefügt(+), 5 Zeilen entfernt(-) diff --git a/po/de

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

2012-09-24 Thread Junio C Hamano
Jens Lehmann 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 a/git-submodule.sh b/git-submodule.sh >> index 3e2045e..f97bb

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Junio C Hamano
Jens Lehmann writes: > But submodule.mod.path should only be set in .gitmodules, not in > $GIT_DIR/config. Did you just remove the ignore setting from > .gitmodules or the path too? Without that in $GIT_DIR/config, how would path<->name mapping correctly work??? Confused... -- To unsubscribe fr

Re: [RFC/PATCH] l10n: de.po: correct translation of a 'rebase' message

2012-09-24 Thread Thomas Rast
Ralf Thielow writes: > Noticed-by: Sascha Cunz > Signed-off-by: Ralf Thielow [...] > The English original is: > > "It seems that there is already a $state_dir_base directory, and\n" > "I wonder if you are in the middle of another rebase. If that is the\n" > "case, please try\n" > "\t$cmd_live_

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Jens Lehmann
Am 24.09.2012 21:59, schrieb Orgad Shaneh: > On Mon, Sep 24, 2012 at 9:56 PM, Jens Lehmann wrote: >> Am 24.09.2012 21:16, schrieb Orgad Shaneh: >>> On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano wrote: Orgad Shaneh writes: > That is not correct. git-config is ignored as well for c

Re: Message from 'git-rebase'; German translation

2012-09-24 Thread Thomas Hochstein
Ralf Thielow schrieb: > We try to avoid translating terms like "I wonder if.." and similar as > "ich wundere mich", "I wonder if ..." is not "ich wundere mich" (that's a false friend), but "Ich frage mich ...". "... and I wonder if you are in the middle of another rebase" does not mean "... und

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Orgad Shaneh
On Mon, Sep 24, 2012 at 9:56 PM, Jens Lehmann wrote: > Am 24.09.2012 21:16, schrieb Orgad Shaneh: >> On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano wrote: >>> Orgad Shaneh writes: >>> That is not correct. git-config is ignored as well for commit. >>> >>> What do you mean? As far as I can

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

2012-09-24 Thread Jens Lehmann
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 a/git-submodule.sh b/git-submodule.sh > index 3e2045e..f97bb62 100755 > --- a/git-submodule.

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Jens Lehmann
Am 24.09.2012 21:16, schrieb Orgad Shaneh: > On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano wrote: >> Orgad Shaneh writes: >> >>> That is not correct. git-config is ignored as well for commit. >> >> What do you mean? As far as I can tell, if you have >> >> [submodule "var"] >> path

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

2012-09-24 Thread Jakub Narębski
On Mon, Sep 24, 2012 at 9:35 PM, Matthieu Moy wrote: > Jakub Narębski writes: > >> On Mon, Sep 24, 2012 at 6:18 PM, Matthieu Moy >> wrote: >>> Jakub Narębski writes: >>> I have therefore added the following multiple-choice question: #19. What git workflow(s) is used by projects i

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

2012-09-24 Thread Matthieu Moy
Jakub Narębski writes: > On Mon, Sep 24, 2012 at 6:18 PM, Matthieu Moy > wrote: >> Jakub Narębski writes: >> >>> I have therefore added the following multiple-choice question: >>> >>> #19. What git workflow(s) is used by projects in which development you >>> participate? >> >> If we want to hav

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

2012-09-24 Thread Orgad Shaneh
On Mon, Sep 24, 2012 at 9:30 PM, Orgad Shaneh wrote: > 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 a/git-submodule.sh b/git-submodule.sh > index 3e2045e..f97bb62 100755 > --- a/git-

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

2012-09-24 Thread Orgad Shaneh
In order to read diff options for a submodule, its path must be configured Signed-off-by: Orgad Shaneh --- git-submodule.sh |2 ++ 1 file changed, 2 insertions(+) diff --git a/git-submodule.sh b/git-submodule.sh index 3e2045e..af9c003 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@

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

2012-09-24 Thread 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 a/git-submodule.sh b/git-submodule.sh index 3e2045e..f97bb62 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -359,6 +359,7 @@ Use -f if you

Re: git pull transfers useless files

2012-09-24 Thread Jeff King
On Mon, Sep 24, 2012 at 07:51:20PM +0200, Angelo Borsotti wrote: > #!/bin/bash > > set -v > cd remote > rm -rf * .git/ > git init > echo '*.pdf -crlf -diff merge=binary' >.git/info/attributes > > touch f1 > git add f1 > echo "aaa" >f1.pdf > git add f1.pdf > cp .pdf f2.pdf > git add f2.pdf > git

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Orgad Shaneh
On Mon, Sep 24, 2012 at 9:06 PM, Junio C Hamano wrote: > Orgad Shaneh writes: > >> That is not correct. git-config is ignored as well for commit. > > What do you mean? As far as I can tell, if you have > > [submodule "var"] > path = var > ignore = dirty > > in $GIT_DIR/config

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Junio C Hamano
Orgad Shaneh writes: > That is not correct. git-config is ignored as well for commit. What do you mean? As far as I can tell, if you have [submodule "var"] path = var ignore = dirty in $GIT_DIR/config, a work-tree-dirty submodule "var" is not reported by "git status" and "

Re: git pull transfers useless files

2012-09-24 Thread Junio C Hamano
Angelo Borsotti writes: > When it executes the git pull it spends on my computer some 30 seconds, > obviously transferring the pdf file, that then it disregards because of the > merge=binary attribute. > When a commit contains many binary files, the command spends a lot of > time needlessly. Tha

Re: [PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM

2012-09-24 Thread Junio C Hamano
"Jonathan \"Duke\" Leto" writes: > From: "Jonathan \"Duke\" Leto" > > Describe what '=' means in the output of __git_ps1 when using > GIT_PS1_SHOWUPSTREAM, which was not previously described. > > Signed-off-by: Jonathan "Duke" Leto > --- Makes sense; will directly apply to 'maint'. > contrib

Re: submodule: if $command was not matched, don't parse other args

2012-09-24 Thread Ramkumar Ramachandra
Junio C Hamano wrote: > Ramkumar Ramachandra writes: > >> Junio C Hamano wrote: >>> OK, I do not think Ramkumar's patch hurts anybody, but dropping the >>> "nothing on the command line defaults to 'status' action" could. So >>> let's queue the patch as-is at least for now and leave the default >>

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Orgad Shaneh
On Mon, Sep 24, 2012 at 8:34 PM, Junio C Hamano wrote: > > Jens Lehmann writes: > > > Am 24.09.2012 18:27, schrieb Junio C Hamano: > >> Junio C Hamano writes: > >>> In any case, the log message I suggested in the review needs to be > >>> updated in the reroll to make it clear that this is about

Re: submodule: if $command was not matched, don't parse other args

2012-09-24 Thread Junio C Hamano
Ramkumar Ramachandra writes: > Junio C Hamano wrote: >> OK, I do not think Ramkumar's patch hurts anybody, but dropping the >> "nothing on the command line defaults to 'status' action" could. So >> let's queue the patch as-is at least for now and leave the default >> discussion to a separarte th

Re: [PATCH] silence git gc --auto --quiet output

2012-09-24 Thread Jeff King
On Mon, Sep 24, 2012 at 04:40:24AM +0200, Tobias Ulmer wrote: > When --quiet is requested, gc --auto should not display messages unless > there is an error. > [...] > - if (quiet) > - fprintf(stderr, _("Auto packing the repository for > optimum performance.\n"));

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Junio C Hamano
Jens Lehmann writes: > Am 24.09.2012 18:27, schrieb Junio C Hamano: >> Junio C Hamano writes: >>> In any case, the log message I suggested in the review needs to be >>> updated in the reroll to make it clear that this is about reading >>> from .gitmodules, not "configuration". AFAICS, gitmodule

Re: Can I use tmp_packs in the git root.

2012-09-24 Thread Junio C Hamano
Shakthi Prasad GS writes: > Basically I use, "cat tmp_packs*|git-unpack-objects" . Log indicates > that, objects are unpacked. > > Am I doing anything wrong, If unpack is all you do, then it won't help very much, as Git only trusts objects that are reachable from refs. You would need to also ma

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Jens Lehmann
Am 24.09.2012 18:27, schrieb Junio C Hamano: > Junio C Hamano writes: >> In any case, the log message I suggested in the review needs to be >> updated in the reroll to make it clear that this is about reading >> from .gitmodules, not "configuration". AFAICS, gitmodule_config() >> does not even re

Re: git archive --format zip utf-8 issues

2012-09-24 Thread Junio C Hamano
René Scharfe writes: > "git 1" is the patch "archive-zip: support UTF-8 paths" added, which > let's archive-zip make use of the UTF-8 flag. "git 2" is "git 1" plus > the patch "archive-zip: declare creator to be Unix for UTF-8 > paths". Both have been posted before. "git 3" is "git 1" plus the

[PATCH] Improve the description of GIT_PS1_SHOWUPSTREAM

2012-09-24 Thread Jonathan "Duke" Leto
From: "Jonathan \"Duke\" Leto" Describe what '=' means in the output of __git_ps1 when using GIT_PS1_SHOWUPSTREAM, which was not previously described. Signed-off-by: Jonathan "Duke" Leto --- contrib/completion/git-prompt.sh | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --g

[RFC/PATCH] l10n: de.po: correct translation of a 'rebase' message

2012-09-24 Thread Ralf Thielow
Noticed-by: Sascha Cunz Signed-off-by: Ralf Thielow --- It turns out that one of the 'rebase' messages has a wrong translation. Please review this fix. Thanks The English original is: "It seems that there is already a $state_dir_base directory, and\n" "I wonder if you are in the middle of ano

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

2012-09-24 Thread Junio C Hamano
Michael J Gruber writes: > 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 GIT_DIR. From the user > perspective, though, the two commands > > GIT_DIR=~user/f

Re: [PATCH] commit: configure submodules

2012-09-24 Thread Junio C Hamano
Junio C Hamano writes: > Jens Lehmann writes: > >>> Jens, what do you think? I see no reason for anybody other than >>> "submodule init" to call gitmodules_config() that reads from the >>> in-tree .gitmodules file. >> >> I think the copying on init is not what we should do here because >> it se

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

2012-09-24 Thread Matthieu Moy
Jakub Narębski writes: > I have therefore added the following multiple-choice question: > > #19. What git workflow(s) is used by projects in which development you > participate? If we want to have an idea of which workflows are the most commonly used, just a binary answer may be insufficient. We

[Ad] SubGit 1.0 is released

2012-09-24 Thread Semen Vadishev
Hello All, Our team is proud and delighted to announce SubGit 1.0 release! New version is available for download at SubGit web site at http://subgit.com/ SubGit is a server-side tool for a smooth, stress-free SVN to Git migration. SubGit lets one to set up a bidirectional Subversion to Git replic

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

2012-09-24 Thread Jakub Narębski
On Mon, Sep 24, 2012 at 6:18 PM, Matthieu Moy wrote: > Jakub Narębski writes: > >> I have therefore added the following multiple-choice question: >> >> #19. What git workflow(s) is used by projects in which development you >> participate? > > If we want to have an idea of which workflows are the

Re: submodule: if $command was not matched, don't parse other args

2012-09-24 Thread Junio C Hamano
Marc Branchaud writes: > On 12-09-23 01:36 PM, Jens Lehmann wrote: >> Am 22.09.2012 22:31, schrieb Junio C Hamano: >>> Ramkumar Ramachandra writes: diff --git a/git-submodule.sh b/git-submodule.sh index a7e933e..dfec45d 100755 --- a/git-submodule.sh +++ b/git-submodule.sh >>>

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

2012-09-24 Thread Jakub Narębski
On Mon, Sep 24, 2012 at 5:37 PM, Matthieu Moy wrote: > Jakub Narębski writes: > >> I have created short (well, at least shorter than previous ones) >> "Git User's Survey 2012" on Survs.com. The test channel is >> >> https://www.survs.com/survey/J87I3PDBU4 > > If it's still time, it would be ni

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

2012-09-24 Thread Junio C Hamano
Ryan Cumming writes: > From: Ryan Cumming > > 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 doesn't use t

Re: git archive --format zip utf-8 issues

2012-09-24 Thread René Scharfe
Hi, I found a way to make unzip respect the UTF-8 flag in ZIP files: Apparently (from looking at the source) an extended field needs to be present in order for it to even look at general purpose flag 11. I sent a patch to add an extended timestamp field that fits the bill. Here are new numb

[PATCH 3/2] archive-zip: write extended timestamp

2012-09-24 Thread René Scharfe
File modification times in ZIP files are encoded in DOS format: local time with a granularity of two seconds. Add an extra field to all archive entries to also record the mtime in Unix' fashion, as UTC with a granularity of one second. This has the desirable side-effect of convincing Info-ZIP unz

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Andreas Schwab
Jeff King writes: > Bash is even weirder than you might think. Try this: > > $ echo ~/foo > /home/peff/foo > > $ echo arg=~/foo > arg=/home/peff/foo > > $ echo --arg=~/foo > --arg=~/foo Bash expands all arguments that look like variable assignments. That lets you write "export arg=~

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

2012-09-24 Thread Matthieu Moy
Jakub Narębski writes: > I have created short (well, at least shorter than previous ones) > "Git User's Survey 2012" on Survs.com. The test channel is > > https://www.survs.com/survey/J87I3PDBU4 If it's still time, it would be nice to add a question on the kind of workflow people use. E.g. W

Re: [ANNOUNCE] tig-1.0

2012-09-24 Thread Jonas Fonseca
On Mon, Sep 24, 2012 at 10:57 AM, Jean-Baptiste Quenot wrote: > This actually happens everytime I run a git command with a key > binding, be it successful or not. The main view is restored to the > tip of the current branch. If I have understood the problem correctly, you have a keybinding mappi

Re: submodule: if $command was not matched, don't parse other args

2012-09-24 Thread Marc Branchaud
On 12-09-23 01:36 PM, Jens Lehmann wrote: > Am 22.09.2012 22:31, schrieb Junio C Hamano: >> Ramkumar Ramachandra writes: >>> diff --git a/git-submodule.sh b/git-submodule.sh >>> index a7e933e..dfec45d 100755 >>> --- a/git-submodule.sh >>> +++ b/git-submodule.sh >>> @@ -1108,7 +1108,15 @@ do >>> d

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

2012-09-24 Thread Michael J Gruber
Jeff King venit, vidit, dixit 24.09.2012 16:52: > On Mon, Sep 24, 2012 at 02:57:20PM +0200, 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 environ

Re: [ANNOUNCE] tig-1.0

2012-09-24 Thread Jean-Baptiste Quenot
This actually happens everytime I run a git command with a key binding, be it successful or not. The main view is restored to the tip of the current branch. 2012/9/24 Jean-Baptiste Quenot : > There's a small glitch however: when some git command returns an error > (for example when typing 'M' for

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Jeff King venit, vidit, dixit 24.09.2012 16:49: > On Mon, Sep 24, 2012 at 09:19:27AM +0200, Michael J Gruber wrote: > >> [mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel >> /home/mjg >> >> [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel >> fatal: Not a git

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

2012-09-24 Thread Jeff King
On Mon, Sep 24, 2012 at 02:57:20PM +0200, 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 GIT_DIR. From the user > perspective, thou

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Junio C Hamano venit, vidit, dixit 24.09.2012 16:36: > Nguyen Thai Ngoc Duy writes: > >> "~" is a shell feature. Know your shell. If we make an exception for >> --git-dir, we might have to support --blahblah=~/somewhere. > > Correct but not entirely true. > > When we know --git-dir= must name a

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Jeff King
On Mon, Sep 24, 2012 at 09:19:27AM +0200, Michael J Gruber wrote: > [mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel > /home/mjg > > [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel > fatal: Not a git repository: '~/.githome' > > Huh? Ok, so most users pro

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > "~" is a shell feature. Know your shell. If we make an exception for > --git-dir, we might have to support --blahblah=~/somewhere. Correct but not entirely true. When we know --git-dir= must name a path, we should be able to do better. See OPT_FILENAME in >parse-

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

2012-09-24 Thread Jakub Narębski
On Mon, Sep 24, 2012 at 3:23 PM, Michael J Gruber wrote: [...] > Other version control systems: > I think the list needs to be sorted alphabetically, it's really long. I have split this list in two: other centralized VCS and other distributed VCS; both have "other" field. > (You could also reduc

Re: [ANNOUNCE] tig-1.0

2012-09-24 Thread Jean-Baptiste Quenot
There's a small glitch however: when some git command returns an error (for example when typing 'M' for merge in main view) the main view displays the tip of the current branch, instead of the list of revisions passed in stdin. 2012/9/24 Jean-Baptiste Quenot : > Yes it works great, thanks! > > 201

Re: [BUG?] Path limiting in "git log" when run from another subdir

2012-09-24 Thread Johan Herland
On Mon, Sep 24, 2012 at 3:39 PM, Nguyen Thai Ngoc Duy wrote: > On Mon, Sep 24, 2012 at 8:30 PM, Nguyen Thai Ngoc Duy > wrote: >> Any special in gitdir/worktree setting? > > What does "GIT_TRACE_SETUP=1 git log -- /Documentation" show? FWIW, this issue is resolved as far as I'm concerned. I was

Re: [BUG?] Path limiting in "git log" when run from another subdir

2012-09-24 Thread Johan Herland
On Mon, Sep 24, 2012 at 3:30 PM, Nguyen Thai Ngoc Duy wrote: >> In any case, what is the _preferred_ way to path-limit "git log" to >> Documentation/RelNotes, when my cwd is t/? > > If you want worktree root no matter where you stand, use "git log -- > :/Documentation/RelNotes". The idea is ":" st

Re: [BUG?] Path limiting in "git log" when run from another subdir

2012-09-24 Thread Nguyen Thai Ngoc Duy
On Mon, Sep 24, 2012 at 8:30 PM, Nguyen Thai Ngoc Duy wrote: > Any special in gitdir/worktree setting? What does "GIT_TRACE_SETUP=1 git log -- /Documentation" show? -- Duy -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Andreas Schwab
Michael J Gruber writes: > But that argument applies to config files in exactly the same way as it > applies to command line arguments. Git is the only one reading them. So > why not leave it up to Git to decide about expansion? Command line arguments are first processed by the shell, handling e

Re: [BUG?] Path limiting in "git log" when run from another subdir

2012-09-24 Thread Nguyen Thai Ngoc Duy
On Mon, Sep 24, 2012 at 8:16 PM, Johan Herland wrote: > On Mon, Sep 24, 2012 at 2:22 PM, Nguyen Thai Ngoc Duy > wrote: >> On Mon, Sep 24, 2012 at 6:59 PM, Johan Herland wrote: >>> The following works in the git.git repo: >>> >>> $ cd t >>> $ git log -- /Documentation >>> [...] >>> >> >> What ve

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

2012-09-24 Thread Michael J Gruber
Jakub Narębski venit, vidit, dixit 23.09.2012 00:45: > On Wed, Sep 19, 2012 at 7:35 PM, Felipe Contreras > wrote: >> Hi, >> >> On Wed, Sep 14, 2011 at 7:39 PM, Jakub Narebski wrote: >> >>> P.S. Would you be interested in running the next survey? >> >> I haven't seen any news regarding the 2012 su

Re: [BUG?] Path limiting in "git log" when run from another subdir

2012-09-24 Thread Johan Herland
On Mon, Sep 24, 2012 at 2:22 PM, Nguyen Thai Ngoc Duy wrote: > On Mon, Sep 24, 2012 at 6:59 PM, Johan Herland wrote: >> The following works in the git.git repo: >> >> $ cd t >> $ git log -- /Documentation >> [...] >> > > What version? Mine (recent master) does not work > > ~/w/git/t $ ../git log

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

2012-09-24 Thread Michael J Gruber
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 GIT_DIR. From the user perspective, though, the two commands GIT_DIR=~user/foo git command git --git-dir=~user/foo

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Nguyen Thai Ngoc Duy venit, vidit, dixit 24.09.2012 11:53: > On Mon, Sep 24, 2012 at 2:57 PM, Michael J Gruber > wrote: >> It might be difficult to implement, but I'm sorry I can't follow the >> argumentation above at all; it's not based on what we do in other places >> and other cases. > > My po

Re: Message from 'git-rebase'; German translation

2012-09-24 Thread Greg Troxel
Ralf Thielow writes: > On Sat, Sep 22, 2012 at 11:57 PM, Sascha Cunz wrote: >> Original: >> ... and I wonder if you are in the middle of another rebase. >> >> German git translation: >> ... und es wäre verwunderlich, wenn ein Neuaufbau bereits im Gange ist. >> >> And a re-translation back to En

Re: [BUG?] Path limiting in "git log" when run from another subdir

2012-09-24 Thread Nguyen Thai Ngoc Duy
On Mon, Sep 24, 2012 at 6:59 PM, Johan Herland wrote: > The following works in the git.git repo: > > $ cd t > $ git log -- /Documentation > [...] > What version? Mine (recent master) does not work ~/w/git/t $ ../git log -- /Documentation fatal: '/Documentation' is outside repository > but the f

[BUG?] Path limiting in "git log" when run from another subdir

2012-09-24 Thread Johan Herland
The following works in the git.git repo: $ cd t $ git log -- /Documentation [...] but the following does not: $ cd t $ git log -- /Documentation/RelNotes fatal: Could not switch to '/Documentation': No such file or directory Is this the intended behavior? ...Johan -- Johan Herland, www.he

Re: [ANNOUNCE] tig-1.0

2012-09-24 Thread Jean-Baptiste Quenot
Yes it works great, thanks! 2012/9/16 Jonas Fonseca : > On Tue, Sep 11, 2012 at 3:24 PM, Jean-Baptiste Quenot > wrote: >> 2012/9/7 Jonas Fonseca : >>> [snip] I suggest to support something like the following: >>> >>> tig --no-walk --stdin < tmp-file >>> >>> Would that cover your use case? >>

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Nguyen Thai Ngoc Duy
On Mon, Sep 24, 2012 at 2:57 PM, Michael J Gruber wrote: > It might be difficult to implement, but I'm sorry I can't follow the > argumentation above at all; it's not based on what we do in other places > and other cases. My point is, what's so special about --git-dir? what about --work-tree, or

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
Nguyen Thai Ngoc Duy venit, vidit, dixit 24.09.2012 09:41: > On Mon, Sep 24, 2012 at 2:19 PM, Michael J Gruber > wrote: >> [mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel >> /home/mjg >> >> [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel >> fatal: Not a gi

Re: GIT_DIR vs. --git-dir

2012-09-24 Thread Nguyen Thai Ngoc Duy
On Mon, Sep 24, 2012 at 2:19 PM, Michael J Gruber wrote: > [mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel > /home/mjg > > [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel > fatal: Not a git repository: '~/.githome' > > Huh? The message looks pretty clear

Re: Message from 'git-rebase'; German translation

2012-09-24 Thread Michael J Gruber
Sascha Cunz venit, vidit, dixit 22.09.2012 23:57: > As I know how hard translations can be, esp. with that much technical terms > inside, I'm usually expecting _not_ to yield the same result when translating > a software's translation back to English. > > However, git-rebase just threw these two

GIT_DIR vs. --git-dir

2012-09-24 Thread Michael J Gruber
[mjg@localhost ~]$ GIT_DIR=~/.githome git rev-parse --show-toplevel /home/mjg [mjg@localhost ~]$ git --git-dir=~/.githome rev-parse --show-toplevel fatal: Not a git repository: '~/.githome' Huh? Ok, so most users probably would not try further and blame git, but: [mjg@localhost ~]$ git --git-dir