[PATCH] grep: correctly initialize help-all option
The help-all option is being initialized with a wrong value.
While being semantically wrong this can also cause a gcc
segmentation fault on ARMv7 hardfloat platforms with a hardened
toolchain. Fix this by initializing with the correct value.
---
builtin/grep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index abc4400..c0bf005 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char
*prefix)
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
OPT_BOOL(0, ext-grep, external_grep_allowed__ignored,
N_(allow calling of grep(1) (ignored by this
build))),
- { OPTION_CALLBACK, 0, help-all, options, NULL, N_(show
usage),
+ { OPTION_CALLBACK, 0, help-all, opt, NULL, N_(show usage),
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
OPT_END()
};
--
2.3.5
--
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 0/3] Make httpd tests run
On Apr 8, 2015, at 08:05, Michael J Gruber wrote: This series grew from an attempt at enlarging my personal test run coverage on a standard Fedora 21 64bit box. Aka chain-lint fall-out. With 1/3, I get all httpd tests to run (when port is set, of course). 2/3 and 3/3 are an attempt at getting git-svn over http tests to run. 2/3 is certainly correct but not sufficient. 3/3 gets httpd to run but svn does not connect. This is WIP and RFH, and maybe requires rewriting lib-git-svn to use a config which depends on the apache version (like lib-hhtpd does), or to leverage lib-httpd. Michael J Gruber (3): t/lib-httpd: load mod_unixd t/lib-git-svn: check same httpd module dirs as lib-httpd t/lib-git-svn: adjust config to apache 2.4 The changes in this series appear to break compatibility with Apache 2.2. Does that mean that Apache 2.2 is no longer supported for running these tests? Or am I missing something here... -Kyle -- 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: [RFC/PATCH 1/4] submodules: implement synchronizing of remotes.
On Wed, Apr 08, 2015 at 08:46:28AM -0700, Junio C Hamano wrote: On Wed, Apr 8, 2015 at 3:58 AM, Patrick Steinhardt p...@pks.im wrote: Previously it was not possible to specify custom remotes for submodules. This feature has now been implemented and can be I am not going to say whether it makes sense to add this feature or not, but I'll just react to Previously. Let's stop saying Previously we couldn't do X, now we can. Instead, let's consistently say We don't do X. Being able to do X is a good thing for such and such reasons. Make us capable of doing X by doing this and that. Some people even say Currently we cannot do X. Teach us to do so, which is equally bad but that is primarily because some people say Previously and they feel the need to clarify which reality they are talking about. Once we stop saying Previously, they will stop saying Currently, and the world would be a better place ;-). Thanks. Points taken, I'll reword the message if there is any interest in the proposed feature. ;) Patrick signature.asc Description: PGP signature
Re: [PATCH] fix global bash variable leak on __gitcompappend
2015-04-09 0:56 GMT-03:00 Junio C Hamano gits...@pobox.com:
Márcio Almada marcio.w...@gmail.com writes:
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Nicely found and corrected. Please sign-off your patch and Cc area
experts if you can find them (I'll do that this time for you).
Thanks.
Ok, I'll remember this next time. Thanks for your incredible work here.
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 661a829..1620546 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -186,7 +186,7 @@ fi
__gitcompappend ()
{
- local i=${#COMPREPLY[@]}
+ local x i=${#COMPREPLY[@]}
for x in $1; do
if [[ $x == $3* ]]; then
COMPREPLY[i++]=$2$x$4
--
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: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4
Michael J Gruber g...@drmicha.warpmail.net wrote: So debian stable has apache 2.2? That explains why many don't see these problems. Right. So, before 3/3, t9118 and such do run the web server and test git-svn against that for you? Yes. -- 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: A good time to pull from your gitk tree?
On 15-03-24 07:06 PM, Paul Mackerras wrote: On Mon, Mar 23, 2015 at 12:03:37PM -0700, Junio C Hamano wrote: Is it a good time for me to pull from you, or do you recommend me to wait for a bit, expecting more? We'll go in the pre-release freeze soon-ish, so I thought I should ping. Now is a good time to pull from the usual place, thanks. Hi Paul, Is the usual place still git://ozlabs.org/~paulus/gitk ? The latest commit I get from there is commit c846920f23704ece225cc5b6c7566777fb561502 Author: Paul Mackerras pau...@samba.org Date: Sun Mar 15 17:25:02 2015 +1100 gitk: Update .po files Signed-off-by: Paul Mackerras pau...@samba.org It seems to be missing some of the changes you accepted earlier this week. Thanks! M. -- 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: [msysGit] Re:
I was not cross posting. Posted on this thread after you mentioned in your post that writing on msysgit user group is futile. Thought I wouldn't get further replies on my questions there. Plus I got a feeling that I will get more in depth information here. Sorry if I sent a wrong message On Apr 9, 2015, at 6:27 AM, Konstantin Khomoutov flatw...@users.sourceforge.net wrote: On Wed, 08 Apr 2015 23:58:58 +0200 Thomas Braun thomas.br...@virtuell-zuhause.de wrote: [...] I am trying to run the latest git 1.9.5 installer on windows. When I run strings on libneon-25.dll it shows this: ./libneon-25.dll:OpenSSL 1.0.1h 5 Jun 2014 But when I load this dll in dependency walker, it picks up msys-openssl 1.0.1m and has no trace of openssl-1.0.1h. My questions to you: 1. Is libneon-25.dll statically linked with openssl-1.0.1h? 2. If not, where is the reference to 1.0.1h coming from? I would be suprised if we link openssl statically into libneon. I guess libneon just reports against which openssl version it was *built*. I am asked to rebuild git with libneon-25.dll linked against openssl-1.0.1m. But I am having a feeling that this is not needed, since libneon is already picking the latest openssl version. Can you please confirm? You can download the development enviroment for git for windows here [1]. After installation, checkout the msys branch and then you can try to recomplile libneon using /src/subversion/release.sh. [1]: https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/msysGit-netinstall-1.9.5-preview20150319.exe [...] JFTR, the discussion about the same issue has been brought up on git-users as well [2]. (People should really somehow use the basics of netiquette and mention in their posts where they cross-post things.) 2. https://groups.google.com/d/topic/git-users/WXyWE5_JfNc/discussion -- 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: [msysGit] Re:
On Wed, 08 Apr 2015 23:58:58 +0200 Thomas Braun thomas.br...@virtuell-zuhause.de wrote: [...] I am trying to run the latest git 1.9.5 installer on windows. When I run strings on libneon-25.dll it shows this: ./libneon-25.dll:OpenSSL 1.0.1h 5 Jun 2014 But when I load this dll in dependency walker, it picks up msys-openssl 1.0.1m and has no trace of openssl-1.0.1h. My questions to you: 1. Is libneon-25.dll statically linked with openssl-1.0.1h? 2. If not, where is the reference to 1.0.1h coming from? I would be suprised if we link openssl statically into libneon. I guess libneon just reports against which openssl version it was *built*. I am asked to rebuild git with libneon-25.dll linked against openssl-1.0.1m. But I am having a feeling that this is not needed, since libneon is already picking the latest openssl version. Can you please confirm? You can download the development enviroment for git for windows here [1]. After installation, checkout the msys branch and then you can try to recomplile libneon using /src/subversion/release.sh. [1]: https://github.com/msysgit/msysgit/releases/download/Git-1.9.5-preview20150319/msysGit-netinstall-1.9.5-preview20150319.exe [...] JFTR, the discussion about the same issue has been brought up on git-users as well [2]. (People should really somehow use the basics of netiquette and mention in their posts where they cross-post things.) 2. https://groups.google.com/d/topic/git-users/WXyWE5_JfNc/discussion -- 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
[PATCH v2] grep: correctly initialize help-all option
The help-all option is being initialized with a wrong value.
While being semantically wrong this can also cause a segmentation
fault in gcc on ARMv7 hardfloat platforms with a hardened
toolchain. Fix this by initializing with a NULL value.
Signed-off-by: Patrick Steinhardt p...@pks.im
---
Added missing sign-off and changed initialization with opts to
initialization with NULL according to Eric's comment as the value
is not being used anyway.
builtin/grep.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/grep.c b/builtin/grep.c
index abc4400..d04f440 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char
*prefix)
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
OPT_BOOL(0, ext-grep, external_grep_allowed__ignored,
N_(allow calling of grep(1) (ignored by this
build))),
- { OPTION_CALLBACK, 0, help-all, options, NULL, N_(show
usage),
+ { OPTION_CALLBACK, 0, help-all, NULL, NULL, N_(show usage),
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
OPT_END()
};
--
2.3.5
--
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] fix global bash variable leak on __gitcompappend
Quoting Junio C Hamano gits...@pobox.com:
Márcio Almada marcio.w...@gmail.com writes:
---
contrib/completion/git-completion.bash | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Nicely found and corrected. Please sign-off your patch and Cc area
experts if you can find them (I'll do that this time for you).
Thanks.
diff --git a/contrib/completion/git-completion.bash
b/contrib/completion/git-completion.bash
index 661a829..1620546 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -186,7 +186,7 @@ fi
__gitcompappend ()
{
- local i=${#COMPREPLY[@]}
+ local x i=${#COMPREPLY[@]}
for x in $1; do
if [[ $x == $3* ]]; then
COMPREPLY[i++]=$2$x$4
Looks good and obviously correct, imho even at -rc2 time.
Not sure whether it's maint-worthy, but just in case: it was
introduced in v1.8.3-rc0~59^2~2.
--
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] fix global bash variable leak on __gitcompappend
On Thu, Apr 9, 2015 at 9:52 AM, Marcio Almada marcio.w...@gmail.com wrote: 2015-04-09 0:56 GMT-03:00 Junio C Hamano gits...@pobox.com: Márcio Almada marcio.w...@gmail.com writes: contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) Nicely found and corrected. Please sign-off your patch and Cc area experts if you can find them (I'll do that this time for you). Ok, I'll remember this next time. Thanks for your incredible work here. Junio's implication was that you should reply to his message with: Signed-off-by: Your Name your@email Or re-send the patch with your sign-off added. -- 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 0/3] Make httpd tests run
On Apr 9, 2015, at 06:04, Kyle J. McKay wrote: On Apr 8, 2015, at 08:05, Michael J Gruber wrote: This series grew from an attempt at enlarging my personal test run coverage on a standard Fedora 21 64bit box. Aka chain-lint fall-out. With 1/3, I get all httpd tests to run (when port is set, of course). 2/3 and 3/3 are an attempt at getting git-svn over http tests to run. 2/3 is certainly correct but not sufficient. 3/3 gets httpd to run but svn does not connect. This is WIP and RFH, and maybe requires rewriting lib-git-svn to use a config which depends on the apache version (like lib-hhtpd does), or to leverage lib- httpd. Michael J Gruber (3): t/lib-httpd: load mod_unixd t/lib-git-svn: check same httpd module dirs as lib-httpd t/lib-git-svn: adjust config to apache 2.4 The changes in this series appear to break compatibility with Apache 2.2. Does that mean that Apache 2.2 is no longer supported for running these tests? Or am I missing something here... Never mind. I see the IfVersion... they're wrapped in now. Would have been nice if they were indented so there was a hint about that in the diff, or the diff included enough context to see that. But that file formatting has nothing to do with your change. Sorry for the noise. -Kyle -- 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: [WIP/RFH/PATCH 3/3] t/lib-git-svn: adjust config to apache 2.4
Eric Wong venit, vidit, dixit 08.04.2015 22:26: Michael J Gruber g...@drmicha.warpmail.net wrote: The current config is tailored to apache 2.2. Apache 2.4 fails to start with it. Adjust the config to apache 2.4. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- 1/3 and 2/3 tested fine on Debian stable (wheezy). You can add my Tested-by to 1/3 and my S-o-b to 2/3. Thanks, that's good to know. ...but not this one. Notes: This is WIP and RFH. Apache does not start without mpm, and the lock mechanism has changed. It will run with these changes, but svn fails to connect. Again, I'm wondering who is running these tests at all, but also: Why do we leverage lib-httpd so little from lib-git-svn? I'm only testing on Apache 2.2 (from Debian stable (wheezy)). So debian stable has apache 2.2? That explains why many don't see these problems. I doubt anybody here, myself included, likes dealing with SVN, and would rather ignore the tests than try to fix them. lib-git-svn predates lib-httpd, and it isn't very interesting work to port and cleanup. I agree with everything above. But if (and that's a big if) the tests don't run for anyone I'd rather remove them if there's no way to port them. +LoadModule mpm_prefork_module $SVN_HTTPD_MODULE_PATH/mod_mpm_prefork.so I think you need an IfModule guard around this? I have no mod_mpm_prefork.so file with the apache2-mpm-prefork (2.2.22-13+deb7u4) package on Debian wheezy. Sure, the changes in 3/3 are for apache 2.4 only and should be guarded by a version check the same way as the ones in lib-httpd. I'm just trying to figure out how to run them at all first. So, before 3/3, t9118 and such do run the web server and test git-svn against that for you? Michael -- 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 1/3] t/lib-httpd: load mod_unixd
Torsten Bögershausen venit, vidit, dixit 08.04.2015 23:47: On 2015-04-08 17.05, Michael J Gruber wrote: With the current config, apache 2.4.10 will not be started and the httpd tests will not run. Enable mod_unixd to make the httpd tests run. Signed-off-by: Michael J Gruber g...@drmicha.warpmail.net --- Notes: Basically, this is required since the switch from 2.2 to 2.4. I'm wondering whether noone is running these tests, or other distros (than Fedora) use different default configs. Do you have any special test numbers in mind ? The following are running under Debian: *** t5541-http-push-smart.sh *** *** t5542-push-http-shallow.sh *** *** t5550-http-fetch-dumb.sh *** *** t5551-http-fetch-smart.sh *** *** t5560-http-backend-noserver.sh *** (Then I stopped digging) And this under Mac OS, *** t5541-http-push-smart.sh *** You do not seem to have gpg installed ok 1 - setup remote repository Is this with apache 2.4? In my case (apache 2.4, fedora 21), t/lib-http.sh failed to start the web server, so the tests above would (succeed trivially but) not run. Maybe debian is using an apache default config that has mod_unixd built in, to ease the transition from apache 2.2? Many were bitten by these new requirements after the switch to 2.4, and some distros may have worked around that. Do your tests run with this patch applied? Michael -- 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] grep: correctly initialize help-all option
On Thu, Apr 9, 2015 at 9:41 AM, Patrick Steinhardt p...@pks.im wrote:
The help-all option is being initialized with a wrong value.
While being semantically wrong this can also cause a gcc
segmentation fault on ARMv7 hardfloat platforms with a hardened
toolchain. Fix this by initializing with the correct value.
Missing sign-off.
---
diff --git a/builtin/grep.c b/builtin/grep.c
index abc4400..c0bf005 100644
--- a/builtin/grep.c
+++ b/builtin/grep.c
@@ -738,7 +738,7 @@ int cmd_grep(int argc, const char **argv, const char
*prefix)
PARSE_OPT_OPTARG, NULL, (intptr_t)default_pager },
OPT_BOOL(0, ext-grep, external_grep_allowed__ignored,
N_(allow calling of grep(1) (ignored by this
build))),
- { OPTION_CALLBACK, 0, help-all, options, NULL, N_(show
usage),
+ { OPTION_CALLBACK, 0, help-all, opt, NULL, N_(show
usage),
This dates back to 3e230fa1 (grep: use parseopt; 2009-05-07).
builtin/show-ref.c just passes NULL for that argument in the same situation.
PARSE_OPT_HIDDEN | PARSE_OPT_NOARG, help_callback },
OPT_END()
};
--
2.3.5
--
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
