Re: sys/param.h

2012-12-19 Thread Erik Faye-Lund
On Tue, Dec 18, 2012 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote: Johannes Sixt j.s...@viscovery.net writes: Junio C Hamano wrote: It could turn out that we may be able to get rid of sys/param.h altogether, but one step at a time. Inputs from people on minority platforms are very

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Yann Dirson
On Tue, 18 Dec 2012 08:09:35 -0800 Junio C Hamano gits...@pobox.com wrote: Yann Dirson dir...@bertin.fr writes: On Mon, 17 Dec 2012 13:14:56 -0800 Junio C Hamano gits...@pobox.com wrote: Andreas Schwab sch...@linux-m68k.org writes: Christian Couder christian.cou...@gmail.com

Re: problem with BOINC repository and CR/LF

2012-12-19 Thread Toralf Förster
On 12/18/2012 01:15 PM, Torsten Bögershausen wrote: HTH /Torsten Thx Torsten - I forwarded this answer (and all the other answers) to the boinc alpha mailing list - there's now a discussion about that. -- MfG/Sincerely Toralf Förster pgp finger print: 7B1A 07F4 EC82 0F90 D4C2 8936 872A E508

Re: problem with BOINC repository and CR/LF

2012-12-19 Thread Toralf Förster
On 12/18/2012 05:41 PM, Jeff King wrote: I could reproduce it, too, on Linux. The reason it does not always happen is that git will not re-examine the file content unless the timestamp on the file is older than what's in the index. So it is a race condition for git to see whether the file is

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 08:13:21AM +0100, Johannes Sixt wrote: Am 12/18/2012 17:24, schrieb Jeff King: I am not really interested in pushing this forward myself, but I worked up this toy that somebody might find interesting (you can git replace HEAD~20 to get dumped in an editor). It

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Thomas Rast
Junio C Hamano gits...@pobox.com writes: I do not understand why you even want to go in the harder route in the first place, only to complicate things? All you want to do is to craft a commit object that records a specific tree shape, has a set of parents you want, and has the log

[PATCH 3/3] Convert all fnmatch() calls to wildmatch()

2012-12-19 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- builtin/apply.c| 3 ++- builtin/branch.c | 3 ++- builtin/describe.c | 3 ++- builtin/for-each-ref.c | 3 ++- builtin/ls-remote.c| 3 ++- builtin/name-rev.c | 3 ++- builtin/reflog.c | 3 ++-

Re: [PATCH] t9020: use configured Python to run test helper

2012-12-19 Thread Pete Wyckoff
gits...@pobox.com wrote on Tue, 18 Dec 2012 20:49 -0800: The test helper svnrdump_sim.py is used as svnrdump during the execution of this test, but the arrangement had a few undesirable things: - it relied on symbolic links; - unportable export VAR=VAL was used; - GIT_BUILD_DIR variable

Re: [PATCH] t0200: locale may not exist

2012-12-19 Thread Jeff King
On Tue, Dec 18, 2012 at 10:47:03PM -0800, Junio C Hamano wrote: On systems without locale installed, t0200-gettext-basic.sh leaked error messages when checking if some test locales are available. Hide them, as they are not very useful. Obviously correct, though there is another way: diff

Re: [PATCH/WIP 0/3] Bye bye fnmatch()

2012-12-19 Thread Nguyen Thai Ngoc Duy
On Wed, Dec 19, 2012 at 8:08 PM, Nguyễn Thái Ngọc Duy pclo...@gmail.com wrote: For those who have not followed, nd/wildmatch brings another fnmatch-like implementation which can nearly replace fnmatch. System fnmatch() seems to behave differently in some cases. It's better to stay away and use

[PATCH 1/3] wildmatch: make dowild() take arbitrary flags

2012-12-19 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- wildmatch.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/wildmatch.c b/wildmatch.c index 3972e26..9586ed9 100644 --- a/wildmatch.c +++ b/wildmatch.c @@ -55,7 +55,7 @@ typedef unsigned char uchar;

[PATCH 2/3] wildmatch: support no FNM_PATHNAME mode

2012-12-19 Thread Nguyễn Thái Ngọc Duy
By default wildmatch(,, 0) is equivalent with fnmatch(,, FNM_PATHNAME). This patch makes wildmatch behave more like fnmatch: FNM_PATHNAME behavior is always applied when FNM_PATHNAME is passed to wildmatch. Without FNM_PATHNAME, wildmatch accepts '/' in '?' and '[]' and treats '*' like '**' in

Re: [PATCH] t0200: locale may not exist

2012-12-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Tue, Dec 18, 2012 at 10:47:03PM -0800, Junio C Hamano wrote: On systems without locale installed, t0200-gettext-basic.sh leaked error messages when checking if some test locales are available. Hide them, as they are not very useful. Obviously correct,

[PATCH v8 0/3] submodule update: add --remote for submodule's upstream changes

2012-12-19 Thread wking
From: W. Trevor King wk...@tremily.us Comments on v7 seem to have petered out, so here's v8. Changes since v7: * Series based on gitster/master instead of v1.8.0. * In Documentation/config.txt, restored trailing line of submodule.name.update documentation, which I had accidentally removed

Re: [PATCH 1/3] wildmatch: make dowild() take arbitrary flags

2012-12-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Signed-off-by: Nguyễn Thái Ngọc Duy pclo...@gmail.com --- wildmatch.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/wildmatch.c b/wildmatch.c index 3972e26..9586ed9 100644 --- a/wildmatch.c +++

[RFC/PATCH] compat/fnmatch: update old-style definition to ANSI

2012-12-19 Thread Junio C Hamano
We usually try to avoid touching borrowed code, but we encourage people to code without old-style definition these days and compile with -Werror, and on platforms that need to use NO_FNMATCH, these three functions make the compilation fail. Signed-off-by: Junio C Hamano gits...@pobox.com ---

Re: [PATCH 2/3] wildmatch: support no FNM_PATHNAME mode

2012-12-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: By default wildmatch(,, 0) is equivalent with fnmatch(,, FNM_PATHNAME). Is this stating a fact before or after the patch? I think it is more like: So far, wildmatch() has always honoured directory boundary and there was no way to turn it

Re: [PATCH v8 3/3] submodule add: If --branch is given, record it in .gitmodules

2012-12-19 Thread Junio C Hamano
wk...@tremily.us writes: From: W. Trevor King wk...@tremily.us This allows you to easily record a submodule.name.branch option in .gitmodules when you add a new submodule. With this patch, $ git submodule add -b branch repository [path] $ git config -f .gitmodules

[PATCH] Remove duplicate entry in ./Documentation/Makefile

2012-12-19 Thread Thomas Ackermann
Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 3615504..7df75d0 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -31,7 +31,6 @@ SP_ARTICLES +=

Re: [PATCH] Remove duplicate entry in ./Documentation/Makefile

2012-12-19 Thread Junio C Hamano
Thomas Ackermann th.ac...@arcor.de writes: Signed-off-by: Thomas Ackermann th.ac...@arcor.de --- Documentation/Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 3615504..7df75d0 100644 --- a/Documentation/Makefile +++

Re: [PATCH 3/3] Convert all fnmatch() calls to wildmatch()

2012-12-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: diff --git a/tree-walk.c b/tree-walk.c index 492c7cd..c729e89 100644 --- a/tree-walk.c +++ b/tree-walk.c @@ -3,6 +3,7 @@ #include unpack-trees.h #include dir.h #include tree.h +#include wildmatch.h static const char *get_mode(const

Re: [PATCH] Remove duplicate entry in ./Documentation/Makefile

2012-12-19 Thread Matt Kraai
Hi, Junio C Hamano wrote: If not by eyeballing but with some mechanical process, did you spot any others? I found one other unnecessarily duplicated line in the top-level Makefile: LIB_H += xdiff/xdiff.h by running find -name Makefile | xargs grep += | sort | uniq -d and inspecting the

[PATCH v3] git-completion.bash: add support for path completion

2012-12-19 Thread Manlio Perillo
The git-completion.bash script did not implemented full, git aware, support to complete paths, for git commands that operate on files within the current working directory or the index. As an example: git add TAB will suggest all files in the current working directory, including ignored

Re: [PATCH v3] git-completion.bash: add support for path completion

2012-12-19 Thread Junio C Hamano
[jch: again, adding area experts to Cc] Manlio Perillo manlio.peri...@gmail.com writes: Changes from version 2: * Perl is no more used. * Fixed some coding style issues. * Refactorized code, to improve future path completion support for the git reset command.

Re: [BUG] Cannot push some grafted branches

2012-12-19 Thread Junio C Hamano
Thomas Rast tr...@student.ethz.ch writes: I still wouldn't recommend this approach in git-replace(1) for several reasons: * It does not generalize in any direction. For each field you may want to change, you have to know a _specific_ way of getting just the commit you want. * More to

[PATCH] add core.pathspecGlob config option

2012-12-19 Thread Jeff King
Git takes pathspec arguments in many places to limit the scope of an operation. These pathspecs are treated not as literal paths, but as glob patterns that can be fed to fnmatch. When a user is giving a specific pattern, this is a nice feature. However, when programatically providing pathspecs,

Re: What's cooking in git.git (Dec 2012, #05; Tue, 18)

2012-12-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The tip of the 'master' branch is a bit past 1.8.1-rc2; hopefully we can go final around the end

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: ... doing :(noglob) right would mean converting the whole codebase to use struct pathspec, as the usual const char **pathspec cannot represent extra per-item flags. As that is the longer-term direction we would want to go, I'd rather not to take the approach

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 12:54:04PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: ... doing :(noglob) right would mean converting the whole codebase to use struct pathspec, as the usual const char **pathspec cannot represent extra per-item flags. As that is the

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: diff --git a/dir.c b/dir.c index 5a83aa7..6e81d4f 100644 --- a/dir.c +++ b/dir.c @@ -126,7 +126,7 @@ static int match_one(const char *match, const char *name, int namelen) for (;;) { unsigned char c1 = tolower(*match);

[PATCH v2] Add directory pattern matching to attributes

2012-12-19 Thread Jean-Noël AVILA
The manpage of gitattributes says: The rules how the pattern matches paths are the same as in .gitignore files and the gitignore pattern matching has a pattern ending with / for directory matching. This rule is specifically relevant for the 'export-ignore' rule used for git archive.

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 01:30:57PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: diff --git a/dir.c b/dir.c index 5a83aa7..6e81d4f 100644 --- a/dir.c +++ b/dir.c @@ -126,7 +126,7 @@ static int match_one(const char *match, const char *name, int namelen)

Re: [PATCH v2] Add directory pattern matching to attributes

2012-12-19 Thread Junio C Hamano
Jean-Noël AVILA avila...@gmail.com writes: This patch was not reviewed when I submitted it for the second time. Did you miss this? http://thread.gmane.org/gmane.comp.version-control.git/211214/focus=211470 -- To unsubscribe from this list: send the line unsubscribe git in the body of a

[PATCH] add GIT_PATHSPEC_GLOB environment variable

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 04:09:19PM -0500, Jeff King wrote: It's perhaps a better match to make it an environment variable. Then it is tied to a particular flow of execution, rather than having it be a property of a system, user, or repo (which is what config does). So for my restricted

Re: [PATCH v3] git-completion.bash: add support for path completion

2012-12-19 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 19/12/2012 20:57, Junio C Hamano ha scritto: [jch: again, adding area experts to Cc] Manlio Perillo manlio.peri...@gmail.com writes: Changes from version 2: * Perl is no more used. * Fixed some coding style issues. *

Re: [PATCH] add GIT_PATHSPEC_GLOB environment variable

2012-12-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: I included the common_prefix fix you mentioned (I do not think it produced incorrect results as it was, but it did not take full advantage of an optimization). I do not think it would have affected the outcome; you would only have worked with more cycles.

Re: [PATCH] git-completion.bash: add support for path completion

2012-12-19 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 17/12/2012 20:42, Junio C Hamano ha scritto: [...] I am not sure how you would handle the last parameter to git mv, though. That is by definition a path that does not exist, i.e. cannot be completed. Right, the code should be changed. No

Re: [PATCH] add GIT_PATHSPEC_GLOB environment variable

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 02:00:03PM -0800, Junio C Hamano wrote: Subject: add GIT_PATHSPEC_GLOB environment variable Seems cleanly done from a quick look. Given that the normal mode of operation is to use globbing, I suspect that the names would have been more natural if the toggle were

Re: [PATCH] add GIT_PATHSPEC_GLOB environment variable

2012-12-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: Will queue; thanks. Do we want to change the variable name and invert the logic? That would be my preference. I am deep into today's integration cycle, and this PATHSPEC_GLOB version is sitting at the tip of 'pu', so today's pushout will contain that version,

Re: [PATCH] add GIT_PATHSPEC_GLOB environment variable

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 02:16:52PM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: Will queue; thanks. Do we want to change the variable name and invert the logic? That would be my preference. I am deep into today's integration cycle, and this PATHSPEC_GLOB version is

Re: [PATCH v2] Add directory pattern matching to attributes

2012-12-19 Thread Jean-Noël AVILA
Le mercredi 19 décembre 2012 22:44:59, vous avez écrit : Jean-Noël AVILA avila...@gmail.com writes: This patch was not reviewed when I submitted it for the second time. Did you miss this? Grml, I did. Sorry for the noise. -- To unsubscribe from this list: send the line unsubscribe

Re: [PATCH] add GIT_PATHSPEC_GLOB environment variable

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 05:20:35PM -0500, Jeff King wrote: Do we want to change the variable name and invert the logic? That would be my preference. [...] That's fine. I'll send out a revised version, and you can pick it up later. Here it is. -- 8 -- Subject: [PATCH] add global

Re: [PATCH] git-completion.bash: add support for path completion

2012-12-19 Thread Junio C Hamano
Manlio Perillo manlio.peri...@gmail.com writes: git mv COPYING README X Assuming X is a new untracked directory, do you think it is an usability problem if an user try to do: git mv COPYING README TAB and X does not appear in the completion list? It is hard to say. Will it

Re: [PATCH v2] Add directory pattern matching to attributes

2012-12-19 Thread Junio C Hamano
Jean-Noël AVILA avila...@gmail.com writes: Le mercredi 19 décembre 2012 22:44:59, vous avez écrit : Jean-Noël AVILA avila...@gmail.com writes: This patch was not reviewed when I submitted it for the second time. Did you miss this? Grml, I did. Sorry for the noise. That's OK. Your

Re: [PATCH v3] git-completion.bash: add support for path completion

2012-12-19 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 19/12/2012 20:57, Junio C Hamano ha scritto: [...] I just found a serious bug with git commit path completion. When doing the first commit on an empty repository, completion will cause an error: $git commit -m init TABfatal: ambiguous argument

Re: [PATCH] git-completion.bash: add support for path completion

2012-12-19 Thread Manlio Perillo
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Il 19/12/2012 23:49, Junio C Hamano ha scritto: Manlio Perillo manlio.peri...@gmail.com writes: git mv COPYING README X Assuming X is a new untracked directory, do you think it is an usability problem if an user try to do: git mv

Re: [RFC] test: Old shells and physical paths

2012-12-19 Thread Junio C Hamano
David Michael fedora@gmail.com writes: In working on a port, I have to tolerate an ancient shell. The cd and pwd commands don't understand the -P flag for physical paths, as some tests use. The biggest offender is cd -P causing a failure in t/test-lib.sh (since 1bd9c64), which is

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Nguyen Thai Ngoc Duy
On Thu, Dec 20, 2012 at 3:34 AM, Jeff King p...@peff.net wrote: Part of me thinks this is just gross, because :(noglob) is the right solution. But after spending a few hours trying it this morning, there is a ton of refactoring required to make it work correctly everywhere (although we could

Re: [PATCH 2/3] wildmatch: support no FNM_PATHNAME mode

2012-12-19 Thread Nguyen Thai Ngoc Duy
On Thu, Dec 20, 2012 at 12:24 AM, Junio C Hamano gits...@pobox.com wrote: When that happens, we should want to retain the same do not bother to descend into subdirectories that will never match optimization for a pattern like Doc*tion/**/*.txt. Because of FNM_PATHNAME, we can tell if a

Re: [RFC] test: Old shells and physical paths

2012-12-19 Thread David Michael
Hi, On Thu, Dec 20, 2012 at 12:17 AM, Junio C Hamano gits...@pobox.com wrote: Is here is a nickel, get a better shell an option? It is, somewhat. There is a pre-built port of GNU bash 2.03 for the platform, but I was trying to see how far things could go with the OS's supported shell before

Re: sys/param.h

2012-12-19 Thread Mark Levedahl
On 12/19/2012 02:59 AM, Erik Faye-Lund wrote: On Tue, Dec 18, 2012 at 6:01 PM, Junio C Hamano gits...@pobox.com wrote: Johannes Sixt j.s...@viscovery.net writes: Junio C Hamano wrote: It could turn out that we may be able to get rid of sys/param.h altogether, but one step at a time. Inputs

Re: sys/param.h

2012-12-19 Thread Junio C Hamano
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 http://vger.kernel.org/majordomo-info.html

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Jeff King
On Thu, Dec 20, 2012 at 08:28:57AM +0700, Nguyen Thai Ngoc Duy wrote: So I think this is a nice, simple approach for sites that want it, and noglob magic can come later (and will not be any harder to implement as a result of this patch). Any chance to make use of nd/pathspec-wildcard? It

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Thu, Dec 20, 2012 at 08:28:57AM +0700, Nguyen Thai Ngoc Duy wrote: So I think this is a nice, simple approach for sites that want it, and noglob magic can come later (and will not be any harder to implement as a result of this patch). Any chance to

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 07:51:16PM -0800, Junio C Hamano wrote: ++ if (limit_pathspec_to_literal()) ++ item-nowildcard_len = item-len; ++ else { ++ item-nowildcard_len = simple_length(path); ++ if (item-nowildcard_len

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 10:55:43PM -0500, Jeff King wrote: On Wed, Dec 19, 2012 at 07:51:16PM -0800, Junio C Hamano wrote: ++if (limit_pathspec_to_literal()) ++item-nowildcard_len = item-len; ++else { ++

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Jeff King
On Wed, Dec 19, 2012 at 11:06:02PM -0500, Jeff King wrote: I don't think we can make a change in simple_length. It gets used not only for pathspecs, but also for parsing exclude patterns, which I do not think should be affected by this option. Our test suite wouldn't catch such a

Re: [PATCH] mergetools/p4merge: Handle /dev/null

2012-12-19 Thread David Aguilar
On Sat, Oct 27, 2012 at 1:47 AM, Jeremy Morton ad...@game-point.net wrote: Sorry to be replying to this so late; I hadn't noticed the post until now! I've tried putting that code in my p4merge script and yes it does indeed work fine. However, it puts a temporary file in the working directory

[PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-19 Thread David Aguilar
Use mktemp to create the /dev/null placeholder for p4merge. This keeps it out of the current directory. Reported-by: Jeremy Morton ad...@game-point.net Signed-off-by: David Aguilar dav...@gmail.com --- I consider this a final finishing touch on a new 1.8.1 feature, so hopefully we can get this in

Re: [RFC] test: Old shells and physical paths

2012-12-19 Thread David Aguilar
On Wed, Dec 19, 2012 at 6:28 PM, David Michael fedora@gmail.com wrote: Hi, On Thu, Dec 20, 2012 at 12:17 AM, Junio C Hamano gits...@pobox.com wrote: Is here is a nickel, get a better shell an option? It is, somewhat. There is a pre-built port of GNU bash 2.03 for the platform, but I

Re: [PATCH] add core.pathspecGlob config option

2012-12-19 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Wed, Dec 19, 2012 at 07:51:16PM -0800, Junio C Hamano wrote: ++ if (limit_pathspec_to_literal()) ++ item-nowildcard_len = item-len; ++ else { ++ item-nowildcard_len = simple_length(path); ++

Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-19 Thread Junio C Hamano
David Aguilar dav...@gmail.com writes: Use mktemp to create the /dev/null placeholder for p4merge. This keeps it out of the current directory. Reported-by: Jeremy Morton ad...@game-point.net Signed-off-by: David Aguilar dav...@gmail.com --- I consider this a final finishing touch on a new

Re: [PATCH] mergetools/p4merge: Honor $TMPDIR for the /dev/null placeholder

2012-12-19 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: David Aguilar dav...@gmail.com writes: Use mktemp to create the /dev/null placeholder for p4merge. This keeps it out of the current directory. Reported-by: Jeremy Morton ad...@game-point.net Signed-off-by: David Aguilar dav...@gmail.com --- I