Junio C Hamano writes:
> David Aguilar writes:
>
>> Use mktemp to create the /dev/null placeholder for p4merge.
>> This keeps it out of the current directory.
>>
>> Reported-by: Jeremy Morton
>> Signed-off-by: David Aguilar
>> ---
>> I consider this a final finishing touch on a new 1.8.1 featu
David Aguilar writes:
> Use mktemp to create the /dev/null placeholder for p4merge.
> This keeps it out of the current directory.
>
> Reported-by: Jeremy Morton
> Signed-off-by: David Aguilar
> ---
> I consider this a final finishing touch on a new 1.8.1 feature,
> so hopefully we can get this
Jeff King 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);
>> > ++
On Wed, Dec 19, 2012 at 6:28 PM, David Michael wrote:
> Hi,
>
> On Thu, Dec 20, 2012 at 12:17 AM, Junio C Hamano 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 thin
Use mktemp to create the /dev/null placeholder for p4merge.
This keeps it out of the current directory.
Reported-by: Jeremy Morton
Signed-off-by: David Aguilar
---
I consider this a final finishing touch on a new 1.8.1 feature,
so hopefully we can get this in before 1.8.1.
mergetools/p4merge |
On Sat, Oct 27, 2012 at 1:47 AM, Jeremy Morton 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 which
> I'm not s
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
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 {
> > > ++
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->no
Jeff King 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 m
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-wildc
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
On 12/19/2012 02:59 AM, Erik Faye-Lund wrote:
On Tue, Dec 18, 2012 at 6:01 PM, Junio C Hamano wrote:
Johannes Sixt 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
Hi,
On Thu, Dec 20, 2012 at 12:17 AM, Junio C Hamano 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 having to bring i
On Thu, Dec 20, 2012 at 12:24 AM, Junio C Hamano 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 subdirectory is
On Thu, Dec 20, 2012 at 3:34 AM, Jeff King 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 die() if
David Michael 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 sourced by ever
-BEGIN PGP SIGNED MESSAGE-
Hash: SHA1
Il 19/12/2012 23:49, Junio C Hamano ha scritto:
> Manlio Perillo 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 READM
-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 fatal: ambiguous argument '
"Jean-Noël AVILA" writes:
> Le mercredi 19 décembre 2012 22:44:59, vous avez écrit :
>> "Jean-Noël AVILA" 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 previous one, with
Manlio Perillo 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
>
> and X does not appear in the completion list?
It is hard to say. Will it show "Documentation/"
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
Le mercredi 19 décembre 2012 22:44:59, vous avez écrit :
> "Jean-Noël AVILA" 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 git" in
th
On Wed, Dec 19, 2012 at 02:16:52PM -0800, Junio C Hamano wrote:
> Jeff King 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
Jeff King 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, though.
--
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
-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
Jeff King 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.
> Subject: add
-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 writes:
>
>> Changes from version 2:
>>
>> * Perl is no more used.
>> * Fixed some coding style issues.
>> * Refactorized cod
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 env
"Jean-Noël AVILA" 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 message to majord
On Wed, Dec 19, 2012 at 01:30:57PM -0800, Junio C Hamano wrote:
> Jeff King 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)
> >
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.
Signed-off-
Jeff King 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);
>
On Wed, Dec 19, 2012 at 12:54:04PM -0800, Junio C Hamano wrote:
> Jeff King 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 lon
Jeff King 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 in th
Junio C Hamano 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 of the week
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, it
Thomas Rast 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 the point of
[jch: again, adding area experts to Cc]
Manlio Perillo 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.
Thanks. Will replac
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
will suggest all files in the current working directory, including
ignored file
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
Nguyễn Thái Ngọc Duy 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
Thomas Ackermann writes:
> Signed-off-by: Thomas Ackermann
> ---
> 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
> @@ -3
Signed-off-by: Thomas Ackermann
---
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 += howto/separating-
wk...@tremily.us writes:
> From: "W. Trevor King"
>
> This allows you to easily record a submodule..branch option in
> .gitmodules when you add a new submodule. With this patch,
>
> $ git submodule add -b []
> $ git config -f .gitmodules submodule..branch
>
> reduces to
>
> $ git submod
Nguyễn Thái Ngọc Duy 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 off. Make it be
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
---
compat/fnmatch/fnmatc
Nguyễn Thái Ngọc Duy writes:
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
> 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 @@ ty
From: "W. Trevor King"
Several submodule configuration variables
(e.g. fetchRecurseSubmodules) are read from .gitmodules with local
overrides from the usual git config files. This shell function mimics
that logic to help initialize configuration variables in
git-submodule.sh.
Signed-off-by: W.
From: "W. Trevor King"
This allows you to easily record a submodule..branch option in
.gitmodules when you add a new submodule. With this patch,
$ git submodule add -b []
$ git config -f .gitmodules submodule..branch
reduces to
$ git submodule add -b []
This means that future call
From: "W. Trevor King"
The current `update` command incorporates the superproject's gitlinked
SHA-1 ($sha1) into the submodule HEAD ($subsha1). Depending on the
options you use, it may checkout $sha1, rebase the $subsha1 onto
$sha1, or merge $sha1 into $subsha1. This helps you keep up with
chan
From: "W. Trevor King"
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..update documentation, which I had accidentally
removed in v7.
* In Document
Tomi Belan writes:
> Thanks. Here's one more bump. Avery? David?
Thanks for your persistence.
I am moderately dissapointed by the inaction on the subtree part so
far. It was merged hoping that it will have more exposure to the
end-users if it were in my tree, and it obviously is gettng that,
b
Thanks. Here's one more bump. Avery? David?
(Apologies if my bumping is annoying -- because there's no bug
tracker, it feels like the bug will be lost in the ML archives forever
unless I keep calling attention to it. How can I help to get this
issue fixed?)
Tomi
On Mon, Dec 3, 2012 at 4:42 PM, T
On Wed, Dec 19, 2012 at 07:28:24AM -0800, Junio C Hamano wrote:
> > +test_expect_success GETTEXT,!GETTEXT_POISON 'setup locale' '
> > # is_IS.UTF-8 on Solaris and FreeBSD, is_IS.utf8 on Debian
> > - is_IS_locale=$(locale -a | sed -n '/^is_IS\.[uU][tT][fF]-*8$/{
> > + is_IS_locale=$(locale
Jeff King 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, thoug
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 the
Signed-off-by: Nguyễn Thái Ngọc Duy
---
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;
#define ISXDIGIT(c) (I
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 one implementation for all.
I just wanted to see how much work there may be if we
On Wed, Dec 19, 2012 at 8:08 PM, Nguyễn Thái Ngọc Duy 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 one implement
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:
> di
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_DI
Signed-off-by: Nguyễn Thái Ngọc Duy
---
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 ++-
builtin/replace.c | 3 ++-
Junio C Hamano 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
> information you want.
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).
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 fil
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 E50
On Tue, 18 Dec 2012 08:09:35 -0800
Junio C Hamano wrote:
> Yann Dirson writes:
>
> > On Mon, 17 Dec 2012 13:14:56 -0800
> > Junio C Hamano wrote:
> >
> >> Andreas Schwab writes:
> >>
> >> > Christian Couder writes:
> >> >
> >> >> Yeah, at one point I wanted to have a command that created to
On Tue, Dec 18, 2012 at 6:01 PM, Junio C Hamano wrote:
> Johannes Sixt 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 much appreciated---does
70 matches
Mail list logo
