bug report, v1.7.12.1 -- user-manual.xml:3739: parser error

2012-09-29 Thread Hugh Esco
doing a source install of git v1.7.12.1, on the `make all doc` step, I get: user-manual.xml:3739: parser error : Opening and ending tag mismatch: emphasis line 3739 and literal char , but is actually expected to be a poin ^ user-manual.xml:3741: parser

Re: [PATCH 0/2] Let "git submodule add" fail when .git/modules/ already exists

2012-09-29 Thread Junio C Hamano
Jens Lehmann writes: >> The only long term solution I can think of is to use some kind of UUID for >> the name, so that the names of newly added submodules won't have a chance >> to clash anymore. For the short term aborting "git submodule add" when a >> submodule of that name already exists in .

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

2012-09-29 Thread Nguyen Thai Ngoc Duy
On Tue, Sep 25, 2012 at 7:23 AM, Jeff King wrote: > Why Lua? I don't especially like it as a language. But it's designed for > this purpose, which makes it very lightweight and relatively simple to > embed. Another option is tcl. String-based approach feels more natural for pretty.c and shell use

Re: [PATCH] Remove the hard coded length limit on variable names in config files

2012-09-29 Thread Michael Haggerty
On 09/29/2012 12:19 PM, Ben Walton wrote: > Previously while reading the variable names in config files, there was > a 256 character limit with at most 128 of those characters being used > by the section header portion of the variable name. This limitation > was only enforced while reading the con

Re: [PATCH 2/3] revision: add --grep-reflog to filter commits by reflog messages

2012-09-29 Thread Nguyen Thai Ngoc Duy
On Sun, Sep 30, 2012 at 2:11 AM, Junio C Hamano wrote: > How about squashing this in? I've future-proofed commit_match() a > bit while at it; it would be cleaner to add new fake headers if the > function is done this way. Sure. It looks good to me. > --- a/Documentation/rev-list-options.txt > +

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

2012-09-29 Thread Jeff King
On Sun, Sep 30, 2012 at 10:05:27AM +1000, Paul Mackerras wrote: > On Fri, Sep 28, 2012 at 04:50:54PM -0400, Jeff King wrote: > > > +proc refresh_index {} { > > +global need_index_refresh > > +if { $need_index_refresh } { > > + exec sh -c "git update-index --refresh >/dev/null 2>&1 || tr

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

2012-09-29 Thread Paul Mackerras
On Fri, Sep 28, 2012 at 04:50:54PM -0400, Jeff King wrote: > +proc refresh_index {} { > +global need_index_refresh > +if { $need_index_refresh } { > + exec sh -c "git update-index --refresh >/dev/null 2>&1 || true" > + set need_index_refresh false > +} > +} Unfortunately this

[PATCH 2/2] submodule add: Fail when .git/modules/ already exists

2012-09-29 Thread Jens Lehmann
When adding a new submodule it can happen that .git/modules/ already contains a submodule repo, e.g. when a submodule is removed from the work tree and another submodule is added at the same path. But then the work tree of the submodule will be populated using the existing repository and not the on

[PATCH 1/2] Teach "git submodule add" the --name option

2012-09-29 Thread Jens Lehmann
"git submodule add" initializes the name of a submodule to its path. This was ok as long as the .git directory lived inside the submodule's work tree, but since 1.7.8 it is stored in the .git/modules/ directory of the superproject, making the submodule name survive the removal of the submodule's wo

[PATCH 0/2] Let "git submodule add" fail when .git/modules/ already exists

2012-09-29 Thread Jens Lehmann
Am 26.09.2012 22:56, schrieb Jens Lehmann: > Am 26.09.2012 06:18, schrieb Jonathan Johnson: >> 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 - >> https://git.

Re: Option for git bisect run to automatically clean up

2012-09-29 Thread Junio C Hamano
Christian Couder writes: > I understand that, but I wonder what we should do if some people > need a "git reset --hard" and if some other people need other > options than -dfx. > We would need both a --reset and a --clean, or perhaps even a > --reset[=(hard|mixed|soft|merge|keep) and a --clean[=]

Re: [PATCH 2/3] revision: add --grep-reflog to filter commits by reflog messages

2012-09-29 Thread Junio C Hamano
Nguyen Thai Ngoc Duy writes: > reflog, in terms of both the number of commits and message length, is > usually short enough that slowdown does not really show, especially > when used with git-log, an interactive command. You shouldn't do things you can easily tell you do not need to, especially

Re: Option for git bisect run to automatically clean up

2012-09-29 Thread Christian Couder
Hi, On Thu, Sep 27, 2012 at 6:55 PM, Laszlo Papp wrote: > Hi everybody, > > I have just run into a problem when I had to issue an explicit cleanup for > tracked files after a configure run in the Qt5 project. I have tried to > suggest to the people to bring up this idea on the mailing list in ord

Re: [PATCH] submodule: make 'show' an alias for 'summary'

2012-09-29 Thread Jens Lehmann
Am 29.09.2012 17:07, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> Am 29.09.2012 15:43, schrieb Ramkumar Ramachandra: >>> Signed-off-by: Ramkumar Ramachandra >>> --- >>> Like 'git remote show', 'git stash show'. >> >> I understand the analogy to "git stash show" (as that also displays >>

Re: [PATCH] submodule: make 'show' an alias for 'summary'

2012-09-29 Thread Ramkumar Ramachandra
Hi Jens, Jens Lehmann wrote: > Am 29.09.2012 15:43, schrieb Ramkumar Ramachandra: >> Signed-off-by: Ramkumar Ramachandra >> --- >> Like 'git remote show', 'git stash show'. > > I understand the analogy to "git stash show" (as that also displays > a diff similar to what " git submodule summary" d

Re: [PATCH] submodule: use abbreviated sha1 in 'status' output

2012-09-29 Thread Jens Lehmann
Am 29.09.2012 16:45, schrieb Ramkumar Ramachandra: > Jens Lehmann wrote: >> I'm not against the change per se, but do we really want to risk breaking >> scripts which parse the output of "git submodule status" without even >> providing a commit message explaining why we did that? > > Oh, I didn't

Re: [PATCH] submodule: make 'show' an alias for 'summary'

2012-09-29 Thread Jens Lehmann
Am 29.09.2012 15:43, schrieb Ramkumar Ramachandra: > Signed-off-by: Ramkumar Ramachandra > --- > Like 'git remote show', 'git stash show'. I understand the analogy to "git stash show" (as that also displays a diff similar to what " git submodule summary" does). But "git remote show" just display

Re: [PATCH] submodule: use abbreviated sha1 in 'status' output

2012-09-29 Thread Jens Lehmann
I'm not against the change per se, but do we really want to risk breaking scripts which parse the output of "git submodule status" without even providing a commit message explaining why we did that? Am 29.09.2012 15:43, schrieb Ramkumar Ramachandra: > Signed-off-by: Ramkumar Ramachandra > --- >

Re: [PATCH v4] Teach rm to remove submodules unless they contain a git directory

2012-09-29 Thread Jens Lehmann
Am 27.09.2012 18:53, schrieb Junio C Hamano: > Jens Lehmann writes: >> +/* >> + * Skip unmerged entries except for populated submodules >> + * that could loose history when removed. >> + */ > > s/loose/lose/, I think.

[PATCH] submodule: use abbreviated sha1 in 'status' output

2012-09-29 Thread Ramkumar Ramachandra
Signed-off-by: Ramkumar Ramachandra --- git-submodule.sh | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/git-submodule.sh b/git-submodule.sh index 1d61ebd..f8efc52 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -942,27 +942,28 @@ cmd_status()

[PATCH] submodule: make 'show' an alias for 'summary'

2012-09-29 Thread Ramkumar Ramachandra
Signed-off-by: Ramkumar Ramachandra --- Like 'git remote show', 'git stash show'. Documentation/git-submodule.txt |3 ++- git-submodule.sh|9 - 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/git-submodule.txt b/Documentation/git-sub

[PATCH] Remove the hard coded length limit on variable names in config files

2012-09-29 Thread Ben Walton
Previously while reading the variable names in config files, there was a 256 character limit with at most 128 of those characters being used by the section header portion of the variable name. This limitation was only enforced while reading the config files. It was possible to write a config file

Re: [RFC PATCH] add t3420-rebase-topology

2012-09-29 Thread Chris Webb
Martin von Zweigbergk writes: > For consistency, it seems like "git rebase -p --root" should always be > a no-op, while "git rebase [-i/-m] --root" should be no-op if the > history has no merges. Also, since "git rebase -i" tries to > fast-forward through existing commits, it seems like "git reba