Re: [RFC] On watchman support

2014-11-18 Thread Duy Nguyen
On Tue, Nov 18, 2014 at 7:25 AM, David Turner dtur...@twopensource.com wrote: So we got a few options: 1) Convince watchman devs to add something to make it work Based on the thread on the watchman github it looks like this won't happen. Yeah. I came to the conclusion that I needed an extra

Re: [PATCH v3 00/14] ref-transactions-reflog

2014-11-18 Thread Michael Haggerty
On 11/18/2014 02:35 AM, Stefan Beller wrote: The following patch series updates the reflog handling to use transactions. This patch series has previously been sent to the list[1]. [...] I was reviewing this patch series (I left some comments in Gerrit about the first few patches) when I

Re: [PATCH] l10n: de.po: translate 2 new messages

2014-11-18 Thread Ralf Thielow
Hi Phillip, 2014-11-16 16:54 GMT+01:00 Phillip Sz phillip.sze...@gmail.com: Phillip There's no need for writing your name in the commit message body. Signed-off-by: Phillip Sz phillip.sze...@gmail.com --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH v3 0/1] Don't make $GIT_DIR/config executable

2014-11-18 Thread Michael Haggerty
Here is a new, svelte version of the patch to avoid setting the u+x bit on $GIT_DIR/config. Thanks to the many people who reviewed versions v1 [1] and v2 [2]. This time there is no attempt to fix the permissions in existing repositories; it only avoids creating new problems. It also includes a

[PATCH v3 1/1] create_default_files(): don't set u+x bit on $GIT_DIR/config

2014-11-18 Thread Michael Haggerty
Since time immemorial, the test of whether to set core.filemode has been done by trying to toggle the u+x bit on $GIT_DIR/config and then testing whether the change took. I find it somewhat odd to use the config file for this test, but whatever. The test code didn't set the u+x bit back to its

Re: [PATCH] l10n: de.po: translate 2 new messages

2014-11-18 Thread phillip
Hi, There's no need for writing your name in the commit message body. I know, it was a mistake. Your message has a different style than other messages of this type. I wouldn't address the user directly and would write it as: msgstr ebenso Pakete und alternative Objekte betrachten What do

Re: [PATCH] copy.c: make copy_fd preserve meaningful errno

2014-11-18 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Do any callers care about errno? Does the function's API documentation say it will make errno meaningful on error, so people making changes to copy_fd in the future know to maintain that property? *searches* Looks like callers are:

Re: [PATCH] Introduce a hook to run after formatting patches

2014-11-18 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Do we have similar filters somewhere in place already, so I could have a look at the code architecture, the api, and how the user would operate that? The clean/smudge filters interacts with the payload data and the end user configuration in a similar

Re: [PATCH] copy.c: make copy_fd preserve meaningful errno

2014-11-18 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: In short I am not a very big fan of passing around strbuf *err to low level helper API functions myself. But the approach does not make things much worse than it currently is, other than code churns to pass an extra pointer around. Sorry I left the

[PATCH] gitweb: hack around CGI's list-context param() handling

2014-11-18 Thread Jeff King
As of CGI.pm's 4.08 release, the behavior to call CGI::param() in a list context is deprecated (because it can be potentially unsafe if called inside a hash constructor). This cause gitweb to issue a warning for some of our code, which in turn causes the tests to fail. Our use is in fact _not_

Re: [PATCH v3 1/1] create_default_files(): don't set u+x bit on $GIT_DIR/config

2014-11-18 Thread Stefan Beller
Reviewed-by: Stefan Beller sbel...@google.com On Tue, Nov 18, 2014 at 5:50 AM, Michael Haggerty mhag...@alum.mit.edu wrote: Since time immemorial, the test of whether to set core.filemode has been done by trying to toggle the u+x bit on $GIT_DIR/config and then testing whether the change took.

[PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Jeff King
The add-interactive system is built in perl. If you build with NO_PERL, running git commit --interactive will exit with an error and the test will fail. Signed-off-by: Jeff King p...@peff.net --- Noticed by Michael while working around gitweb failures by setting NO_PERL. :) It didn't reproduce

[PATCH] t960[34]: mark cvsimport tests as requiring perl

2014-11-18 Thread Jeff King
Git-cvsimport is written in perl, which understandably causes the tests to fail if you build with NO_PERL (which will avoid building cvsimport at all). The earlier cvsimport tests in t9600-t9602 are all marked with a PERL prerequisite, but these ones are not. The one in t9603 was likely not

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 12:22:31PM -0500, Jeff King wrote: The add-interactive system is built in perl. If you build with NO_PERL, running git commit --interactive will exit with an error and the test will fail. Signed-off-by: Jeff King p...@peff.net --- Noticed by Michael while working

[PATCH] builtin/push.c: fix description of --recurse-submodules option

2014-11-18 Thread Ralf Thielow
The description of the option for argument recurse-submodules is marked for translation even if it expects the untranslated string and it's missing the option on-demand which was introduced in eb21c73 (2014-03-29, push: teach --recurse-submodules the on-demand option). Fix this by unmark the

Re: ag, **, and the GPL

2014-11-18 Thread David Turner
On Mon, 2014-11-17 at 20:50 -0800, Matthew Kaniaris wrote: The Silver Search (https://github.com/ggreer/the_silver_searcher), is a small, open source, cross platform searching utility written as a replacement for ack. One of the major benefits of Ag (and a source for much of its speed) is

Re: [PATCH] gitweb: hack around CGI's list-context param() handling

2014-11-18 Thread Junio C Hamano
Jeff King p...@peff.net writes: As of CGI.pm's 4.08 release, the behavior to call CGI::param() in a list context is deprecated (because it can be potentially unsafe if called inside a hash constructor). This cause gitweb to issue a warning for some of our code, which in turn causes the tests

Re: [PATCH] gitweb: hack around CGI's list-context param() handling

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 09:58:26AM -0800, Junio C Hamano wrote: Jeff King p...@peff.net writes: As of CGI.pm's 4.08 release, the behavior to call CGI::param() in a list context is deprecated (because it can be potentially unsafe if called inside a hash constructor). This cause gitweb

[PATCH] l10n: de.po: translate 2 new messages

2014-11-18 Thread Ralf Thielow
Signed-off-by: Phillip Sz phillip.sze...@gmail.com Signed-off-by: Ralf Thielow ralf.thie...@gmail.com --- po/de.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/po/de.po b/po/de.po index 0597cb2..5ad705b 100644 --- a/po/de.po +++ b/po/de.po @@ -5638,7 +5638,7 @@ msgstr

Re: [RFC] On watchman support

2014-11-18 Thread David Turner
On Tue, 2014-11-18 at 17:48 +0700, Duy Nguyen wrote: My patches are not the world's most beautiful, but they do work. I think some improvement might be possible by keeping info about tracked files in the index, and only storing the tree of ignored and untracked files separately. But I

Fix Penguin Penalty 17th October2014 ( mail-archive.com )

2014-11-18 Thread mexicans33064
Dear Sir Did your website get hit by Google Penguin update on October 17th 2014? What basically is Google Penguin Update? It is actually a code name for Google algorithm which aims at decreasing your websites search engine rankings that violate Google’s guidelines by using black hat SEO

Re: [PATCH v3 00/14] ref-transactions-reflog

2014-11-18 Thread Ronnie Sahlberg
On Tue, Nov 18, 2014 at 3:26 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 11/18/2014 02:35 AM, Stefan Beller wrote: The following patch series updates the reflog handling to use transactions. This patch series has previously been sent to the list[1]. [...] I was reviewing this patch

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: Subject: Makefile: have perl scripts depend on NO_PERL setting [...] --- Makefile | 3 +++ 1 file changed, 3 insertions(+) Gah. Good catch. Reviewed-by: Jonathan Nieder jrnie...@gmail.com [...] --- a/Makefile +++ b/Makefile @@ -1676,6 +1676,9 @@ git.res: git.rc

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Jonathan Nieder
Jonathan Nieder wrote: Jeff King wrote: Subject: Makefile: have perl scripts depend on NO_PERL setting [...] --- Makefile | 3 +++ 1 file changed, 3 insertions(+) Gah. Good catch. Reviewed-by: Jonathan Nieder jrnie...@gmail.com ... and here's a patch on top to give git-p4 the same

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 10:38:38AM -0800, Jonathan Nieder wrote: Reviewed-by: Jonathan Nieder jrnie...@gmail.com Thanks. +# This makes sure we depend on the NO_PERL setting itself. +$(patsubst %.perl,%,$(SCRIPT_PERL)): GIT-BUILD-OPTIONS + ifndef NO_PERL $(patsubst

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 10:43:47AM -0800, Jonathan Nieder wrote: ... and here's a patch on top to give git-p4 the same treatment. -- 8 -- Subject: Makefile: have python scripts depend on NO_PYTHON setting Like the perl scripts, python scripts need a dependency to ensure they are rebuilt

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: The add-interactive system is built in perl. If you build with NO_PERL, running git commit --interactive will exit with an error and the test will fail. Signed-off-by: Jeff King p...@peff.net --- Noticed by Michael while working around gitweb failures by setting NO_PERL.

Re: [PATCH] t960[34]: mark cvsimport tests as requiring perl

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: It would probably make sense to have these scripts just skip_all if NO_PERL is set, but I opted to follow the pattern set by t9600, etc. If somebody feels like spending time refactoring the cvsimport test harness, be my guest. Wouldn't it be a matter of the following, plus

Reachability lists in git

2014-11-18 Thread Alan Stern
The git rev-list A ^B command lists all the commits that are reachable from A but not from B. Is there a comparable command for the converse relation, that is, a command to list all the commits that A is reachable from but B isn't? And if there is such a command, can the output be limited to

Re: ag, **, and the GPL

2014-11-18 Thread Jonathan Nieder
Hi, Matthew Kaniaris wrote: Ag is licensed under the Apache License Version 2.0 which to the best of my understanding is incompatible with the GPLv2. Would you grant me permission to reuse wildmatch.c (and necessary includes)

Re: [PATCH] t960[34]: mark cvsimport tests as requiring perl

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 10:56:22AM -0800, Jonathan Nieder wrote: Jeff King wrote: It would probably make sense to have these scripts just skip_all if NO_PERL is set, but I opted to follow the pattern set by t9600, etc. If somebody feels like spending time refactoring the cvsimport test

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Paul Smith
Junio C Hamano gits...@pobox.com writes: Paul Smith p...@mad-scientist.net writes: No need to resend only to correct the above, even though there may be comments on the patch itself from me or others that may make you want to reroll this patch, in which case I'd like to see these nits gone.

[PATCH] date.c: phrase a comment gender neutral

2014-11-18 Thread Stefan Beller
When looking for suitable functions to print dates, I found this gem. Let's make it gender neutral as nowadays people get upset by this gender debate. Signed-off-by: Stefan Beller sbel...@google.com --- date.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/date.c b/date.c

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Junio C Hamano
Paul Smith p...@mad-scientist.net writes: + if test $(ls -a1 $new_workdir/. | wc -l) -ne 2 I wonder if this check is portable for all platforms we care about, but that is OK, as it should be so for the ones I think of and care about ;-) Do you mean . and .. representing an empty

Re: Reachability lists in git

2014-11-18 Thread Jonathan Nieder
Hi, Alan Stern wrote: The git rev-list A ^B command lists all the commits that are reachable from A but not from B. Is there a comparable command for the converse relation, that is, a command to list all the commits that A is reachable from but B isn't? And if there is such a command, can

[PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Paul Smith
Allow new workdirs to be created in an empty directory (similar to git clone). Provide more error checking and clean up on failure. Signed-off-by: Paul Smith p...@mad-scientist.net --- Getting rid of ls/wc was not as simple as I'd hoped, due to glob pathname expansion (can't rely on nullglob

Re: [PATCH] date.c: phrase a comment gender neutral

2014-11-18 Thread Jonathan Nieder
Stefan Beller wrote: When looking for suitable functions to print dates, I found this gem. Let's make it gender neutral as nowadays people get upset by this gender debate. Eh, I'm not upset. Hope that helps, Jonathan -- To unsubscribe from this list: send the line unsubscribe git in the body

Re: [PATCH v3 00/14] ref-transactions-reflog

2014-11-18 Thread Michael Haggerty
On 11/18/2014 07:36 PM, Ronnie Sahlberg wrote: On Tue, Nov 18, 2014 at 3:26 AM, Michael Haggerty mhag...@alum.mit.edu wrote: On 11/18/2014 02:35 AM, Stefan Beller wrote: The following patch series updates the reflog handling to use transactions. This patch series has previously been sent to

Re: [PATCH] date.c: phrase a comment gender neutral

2014-11-18 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: When looking for suitable functions to print dates, I found this gem. Let's make it gender neutral as nowadays people get upset by this gender debate. For some time I used to use she/her on Mondays, Wednesdays and Fridays and he/his on other days to

Re: [PATCH] date.c: phrase a comment gender neutral

2014-11-18 Thread Stefan Beller
ok. I'll stop sending such gender related nits. On Tue, Nov 18, 2014 at 12:03 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: When looking for suitable functions to print dates, I found this gem. Let's make it gender neutral as nowadays people get upset

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Junio C Hamano
Paul Smith p...@mad-scientist.net writes: Getting rid of ls/wc was not as simple as I'd hoped, I didn't say ls/wc was not portable. Assuming that a directory for which the output from ls -a has two entries is empty may be. -- To unsubscribe from this list: send the line unsubscribe git in the

Re: Reachability lists in git

2014-11-18 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: --ancestry-path is my current favorite tool for walking-forward needs. Curious. I often want to answer this question: Commit 982ac87 was reported to be faulty. What topic was it on and at which point was it merged to 'master'? - What

Re: Reachability lists in git

2014-11-18 Thread Jonathan Nieder
Jonathan Nieder wrote: Junio C Hamano wrote: - Were there follow-up fixes and enhancements on the topic after the topic was merged to 'master' (this is harder)? There's only one line coming out of the-merge^2 in the ancestry-path graph, so there were no such follow-up fixes. Or

Re: Reachability lists in git

2014-11-18 Thread Alan Stern
On Tue, 18 Nov 2014, Jonathan Nieder wrote: Hi, Alan Stern wrote: The git rev-list A ^B command lists all the commits that are reachable from A but not from B. Is there a comparable command for the converse relation, that is, a command to list all the commits that A is reachable

Re: [PATCH v3 00/14] ref-transactions-reflog

2014-11-18 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: I'm still not convinced. For me, reflog_expire() is an unusual outlier operation, much like git gc or git pack-refs or git fsck. None of these are part of the beautiful Git data model; they are messy maintenance operations. Forcing reference

Re: Reachability lists in git

2014-11-18 Thread Jonathan Nieder
Alan Stern wrote: Tracking down regressions. Bisection isn't perfect. Suppose a bisection run ends up saying that B is the first bad commit. It's easy enough to build B and test it, to verify that it really is bad. But to be sure that B introduced the fault, it would help to find the

Re: Reachability lists in git

2014-11-18 Thread Junio C Hamano
Jonathan Nieder jrnie...@gmail.com writes: Junio C Hamano wrote: Jonathan Nieder jrnie...@gmail.com writes: --ancestry-path is my current favorite tool for walking-forward needs. Curious. I often want to answer this question: [...] And my experiments with --ancestry-path has been less

Re: Reachability lists in git

2014-11-18 Thread Alan Stern
On Tue, 18 Nov 2014, Jonathan Nieder wrote: Alan Stern wrote: Tracking down regressions. Bisection isn't perfect. Suppose a bisection run ends up saying that B is the first bad commit. It's easy enough to build B and test it, to verify that it really is bad. But to be sure that B

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Paul Smith
On Tue, 2014-11-18 at 12:15 -0800, Junio C Hamano wrote: Paul Smith p...@mad-scientist.net writes: Getting rid of ls/wc was not as simple as I'd hoped, I didn't say ls/wc was not portable. Assuming that a directory for which the output from ls -a has two entries is empty may be. Yes, I

Re: [RFC] On watchman support

2014-11-18 Thread Junio C Hamano
David Turner dtur...@twopensource.com writes: On Tue, 2014-11-18 at 17:48 +0700, Duy Nguyen wrote: My patches are not the world's most beautiful, but they do work. I think some improvement might be possible by keeping info about tracked files in the index, and only storing the tree of

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Junio C Hamano
Paul Smith p...@mad-scientist.net writes: I can't find a clear statement that both are required and that ls -a must show them. I've used a wide range of UNIX-en and filesystems for 30 years or so and never seen one that didn't provide them. It seems like it would break quite a few scripts,

Re: Reachability lists in git

2014-11-18 Thread Junio C Hamano
Alan Stern st...@rowland.harvard.edu writes: On Tue, 18 Nov 2014, Jonathan Nieder wrote: Alan Stern wrote: Tracking down regressions. Bisection isn't perfect. Suppose a bisection run ends up saying that B is the first bad commit. It's easy enough to build B and test it, to verify

Re: Reachability lists in git

2014-11-18 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Alan Stern st...@rowland.harvard.edu writes: On Tue, 18 Nov 2014, Jonathan Nieder wrote: Alan Stern wrote: Tracking down regressions. Bisection isn't perfect. Suppose a bisection run ends up saying that B is the first bad commit. It's easy

Re: [RFC] On watchman support

2014-11-18 Thread David Turner
On Tue, 2014-11-18 at 12:55 -0800, Junio C Hamano wrote: David Turner dtur...@twopensource.com writes: On Tue, 2014-11-18 at 17:48 +0700, Duy Nguyen wrote: My patches are not the world's most beautiful, but they do work. I think some improvement might be possible by keeping info about

Re: [PATCH v3 00/14] ref-transactions-reflog

2014-11-18 Thread Michael Haggerty
On 11/18/2014 09:30 PM, Junio C Hamano wrote: Michael Haggerty mhag...@alum.mit.edu writes: I'm still not convinced. For me, reflog_expire() is an unusual outlier operation, much like git gc or git pack-refs or git fsck. None of these are part of the beautiful Git data model; they are messy

Re: Reachability lists in git

2014-11-18 Thread Alan Stern
On Tue, 18 Nov 2014, Junio C Hamano wrote: Alan Stern st...@rowland.harvard.edu writes: On Tue, 18 Nov 2014, Jonathan Nieder wrote: Alan Stern wrote: Tracking down regressions. Bisection isn't perfect. Suppose a bisection run ends up saying that B is the first bad commit.

Re: Reachability lists in git

2014-11-18 Thread Junio C Hamano
Alan Stern st...@rowland.harvard.edu writes: No. Here's a simple example: Y / / X--B In this diagram, X = B^. But B isn't reachable from either X or Y, whereas it is reachable from one of X's children (namely Y). ... Thus, if B

Re: [RFC] On watchman support

2014-11-18 Thread Junio C Hamano
David Turner dtur...@twopensource.com writes: On Tue, 2014-11-18 at 12:55 -0800, Junio C Hamano wrote: I vaguely recall that the reason why we dropped it was because it was too much code churn in an area that was being worked on in parallel, but you may need to go back to the list archive for

Re: [PATCH v3 00/14] ref-transactions-reflog

2014-11-18 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Sorry, but I lost track---which one is inside and which one is outside? By inside I mean the code that would be within the reference-handling library if we had such a thing; i.e., implemented in refs.c. By outside I mean in the code that calls

Re: Reachability lists in git

2014-11-18 Thread Alan Stern
On Tue, 18 Nov 2014, Junio C Hamano wrote: Alan Stern st...@rowland.harvard.edu writes: No. Here's a simple example: Y / / X--B In this diagram, X = B^. But B isn't reachable from either X or Y, whereas it is reachable

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Paul Smith
On Tue, 2014-11-18 at 12:58 -0800, Junio C Hamano wrote: Doesn't the description of the -A option I quoted upthread hint a simpler and clearer solution? I.e. test $(ls -A | wc -l) = 0? Yes, but unfortunately for us the -A flag was added to POSIX Issue 7. It's not present in the previous

[PATCH] refs.c: use a stringlist for repack_without_refs

2014-11-18 Thread Stefan Beller
This patch was heavily inspired by a part of the ref-transactions-rename series[1], but people tend to dislike large series and this part is relatively easy to take out and unrelated, so I'll send it as a single patch. This patch doesn't intend any functional changes. It is just a refactoring,

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Junio C Hamano
OK, thanks for digging. Let's go with this version, then. On Tue, Nov 18, 2014 at 2:25 PM, Paul Smith p...@mad-scientist.net wrote: On Tue, 2014-11-18 at 12:58 -0800, Junio C Hamano wrote: Doesn't the description of the -A option I quoted upthread hint a simpler and clearer solution? I.e.

Re: [PATCH] refs.c: use a stringlist for repack_without_refs

2014-11-18 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: This patch was heavily inspired by a part of the ref-transactions-rename series[1], but people tend to dislike large series and this part is relatively easy to take out and unrelated, so I'll send it as a single patch. This patch doesn't intend any

Subject: [PATCH/RFC] Documentation/git-stripspace: Update synopsis

2014-11-18 Thread Slavomir Vlcek
Add synopsis with the '--comment-lines' option. Signed-off-by: Slavomir Vlcek s...@inventati.org --- Hi, there were no mention of '--comment-lines' in the synopsis. ('--comment-lines' and '--strip-comments' options are mutually exclusive). I solved this by adding an extra (second) synopsis

[PATCH] refs.c: handle locking failure during transaction better

2014-11-18 Thread Stefan Beller
Change lock_ref_sha1_basic to return an error instead of dying, when we fail to lock a file during a transaction. This function is only called from transaction_commit() and it knows how to handle these failures. Signed-off-by: Ronnie Sahlberg sahlb...@google.com Signed-off-by: Jonathan Nieder

Re: [PATCH] t0090: mark add-interactive test with PERL prerequisite

2014-11-18 Thread Pete Wyckoff
jrnie...@gmail.com wrote on Tue, 18 Nov 2014 10:43 -0800: ... and here's a patch on top to give git-p4 the same treatment. -- 8 -- Subject: Makefile: have python scripts depend on NO_PYTHON setting Like the perl scripts, python scripts need a dependency to ensure they are rebuilt when

Re: Subject: [PATCH/RFC] Documentation/git-stripspace: Update synopsis

2014-11-18 Thread Slavomir Vlcek
On 11/19/2014 12:16 AM, Slavomir Vlcek wrote: b) In the documentation there is: -s, --strip-comments Skip and remove all lines starting with comment character (default #). part. This default word somehow suggests some new command option that would allow to change the comment

Re: [PATCH] refs.c: handle locking failure during transaction better

2014-11-18 Thread Stefan Beller
I messed up authorship on this one. This was of course found and authored by Ronnie. On Tue, Nov 18, 2014 at 3:17 PM, Stefan Beller sbel...@google.com wrote: Change lock_ref_sha1_basic to return an error instead of dying, when we fail to lock a file during a transaction. This function is only

Re: [PATCH] refs.c: use a stringlist for repack_without_refs

2014-11-18 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: Stefan Beller sbel...@google.com writes: This patch was heavily inspired by a part of the ref-transactions-rename series[1], but people tend to dislike large series and this part is relatively easy to take out and unrelated, so I'll send it as a

Re: [PATCH] refs.c: use a stringlist for repack_without_refs

2014-11-18 Thread Jonathan Nieder
Stefan Beller wrote: This patch was heavily inspired by a part of the ref-transactions-rename series[1], but people tend to dislike large series and this part is relatively easy to take out and unrelated, so I'll send it as a single patch. [1]

Re: [PATCH] refs.c: use a stringlist for repack_without_refs

2014-11-18 Thread Stefan Beller
On Tue, Nov 18, 2014 at 3:45 PM, Jonathan Nieder jrnie...@gmail.com wrote: The above is a useful kind of comment to put below the three-dashes. It doesn't explain what the intent behind the patch is, why I should want this patch when considering whether to upgrade git, or what is going to

Re: [PATCH] builtin/push.c: fix description of --recurse-submodules option

2014-11-18 Thread Jiang Xin
2014-11-19 1:57 GMT+08:00 Ralf Thielow ralf.thie...@gmail.com: The description of the option for argument recurse-submodules is marked for translation even if it expects the untranslated string and it's missing the option on-demand which was introduced in eb21c73 (2014-03-29, push: teach

Re: ag, **, and the GPL

2014-11-18 Thread Duy Nguyen
On Wed, Nov 19, 2014 at 12:57 AM, David Turner dtur...@twopensource.com wrote: On Mon, 2014-11-17 at 20:50 -0800, Matthew Kaniaris wrote: The Silver Search (https://github.com/ggreer/the_silver_searcher), is a small, open source, cross platform searching utility written as a replacement for

Re: ag, **, and the GPL

2014-11-18 Thread Duy Nguyen
On Wed, Nov 19, 2014 at 2:09 AM, Jonathan Nieder jrnie...@gmail.com wrote: Duy, what would you think of making git's wildmatch.c GPL v2 or v3, at your option? wildmatch.c is not really owned by me (latest change is from Anthony Ramine), but I would be ok with that. -- Duy -- To unsubscribe

Re: [PATCH] git-new-workdir: Don't fail if the target directory is empty

2014-11-18 Thread Paul Smith
On Tue, 2014-11-18 at 14:51 -0800, Junio C Hamano wrote: OK, thanks for digging. Let's go with this version, then. Thanks for your attention, Junio! -- 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

[PATCH] refs.c: use a stringlist for repack_without_refs

2014-11-18 Thread Stefan Beller
This patch doesn't intend any functional changes. It is just a refactoring, which replaces a char** array by a stringlist in the function repack_without_refs. This is easier to read and maintain as it delivers the same functionality with less lines of code less pointers. Signed-off-by: Ronnie

[PATCH] refs.c: handle locking failure during transaction better

2014-11-18 Thread Stefan Beller
From: Ronnie Sahlberg sahlb...@google.com Change lock_ref_sha1_basic to return an error instead of dying, when we fail to lock a file during a transaction. This function is only called from transaction_commit() and it knows how to handle these failures. [sb: This was part of a larger patch

[PATCH 0/4] error cleanups in lock_ref_sha1_basic

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 05:13:17PM -0800, Stefan Beller wrote: From: Ronnie Sahlberg sahlb...@google.com Change lock_ref_sha1_basic to return an error instead of dying, when we fail to lock a file during a transaction. This function is only called from transaction_commit() and it knows how

[PATCH 1/4] error: save and restore errno

2014-11-18 Thread Jeff King
It's common to use error() to return from a function, like: if (open(...) 0) return error(open failed); Unfortunately this may clobber the errno from the open() call. So we often end up with code like this: if (open(...) 0) { int saved_errno =

[PATCH 3/4] lock_ref_sha1_basic: simplify error code path

2014-11-18 Thread Jeff King
For most errors, we jump to a goto label that unlocks the ref and returns NULL. However, in none of these error paths would we ever have actually locked the ref. By the time we actually take the lock, we follow a different path that does not ever hit this goto (we rely on verify_lock to unlock if

[PATCH 2/4] lock_ref_sha1_basic: simplify errno handling

2014-11-18 Thread Jeff King
Now that error() does not clobber errno, we do not have to take pains to save it ourselves. Signed-off-by: Jeff King p...@peff.net --- refs.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/refs.c b/refs.c index 5ff457e..169a46d 100644 --- a/refs.c +++ b/refs.c @@

[PATCH 4/4] lock_ref_sha1_basic: do not die on locking errors

2014-11-18 Thread Jeff King
From: Ronnie Sahlberg sahlb...@google.com lock_ref_sha1_basic is inconsistent about when it calls die() and when it returns NULL to signal an error. This is annoying to any callers that want to recover from a locking error. This seems to be mostly historical accident. It was added in 4bd18c4

Re: [PATCH 1/4] error: save and restore errno

2014-11-18 Thread Stefan Beller
This one makes my day. A really good fix as it minimizes maintenance burden for checking incoming patches for that pattern. Reviewed-by: Stefan Beller sbel...@google.com On Tue, Nov 18, 2014 at 5:37 PM, Jeff King p...@peff.net wrote: It's common to use error() to return from a function, like:

Re: [PATCH 1/4] error: save and restore errno

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: It's common to use error() to return from a function, like: if (open(...) 0) return error(open failed); Unfortunately this may clobber the errno from the open() call. So we often end up with code like this: if (open(...) 0) {

Re: [RFC] On watchman support

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 01:26:56PM -0800, Junio C Hamano wrote: It is not check_refname_format() that is the real problem. It's the fact that we do O(# of refs) work whenever we have to access the packed-refs file. check_refname_format() is part of that, surely, but so is reading the file,

Re: [PATCH 1/4] error: save and restore errno

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 05:43:44PM -0800, Jonathan Nieder wrote: Jeff King wrote: It's common to use error() to return from a function, like: if (open(...) 0) return error(open failed); Unfortunately this may clobber the errno from the open() call. So we often

Re: [PATCH 2/4] lock_ref_sha1_basic: simplify errno handling

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: Now that error() does not clobber errno, we do not have to take pains to save it ourselves. Signed-off-by: Jeff King p...@peff.net --- refs.c | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/refs.c b/refs.c index 5ff457e..169a46d 100644 ---

Re: [PATCH 3/4] lock_ref_sha1_basic: simplify error code path

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: For most errors, we jump to a goto label that unlocks the ref and returns NULL. However, in none of these error paths would we ever have actually locked the ref. By the time we actually take the lock, we follow a different path that does not ever hit this goto (we rely on

Re: [PATCH 4/4] lock_ref_sha1_basic: do not die on locking errors

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: From: Ronnie Sahlberg sahlb...@google.com lock_ref_sha1_basic is inconsistent about when it calls die() and when it returns NULL to signal an error. This is annoying to any callers that want to recover from a locking error. And in addition to the modern transaction stuff,

Re: [PATCH 3/4] lock_ref_sha1_basic: simplify error code path

2014-11-18 Thread Jeff King
On Tue, Nov 18, 2014 at 06:00:09PM -0800, Jonathan Nieder wrote: Jeff King wrote: For most errors, we jump to a goto label that unlocks the ref and returns NULL. However, in none of these error paths would we ever have actually locked the ref. By the time we actually take the lock, we

Re: [PATCH 3/4] lock_ref_sha1_basic: simplify error code path

2014-11-18 Thread Jonathan Nieder
Jeff King wrote: Hmph. Should we just abandon my series in favor of taking Ronnie's original patch, then? We can apply the save/restore errno in error() patch independently if we like. I liked patches 1 and 2 and the explanation from patch 4. Perhaps patch 3 should be replaced with a patch

Re: Getting a commit sha1 from fast-import in a remote-helper

2014-11-18 Thread Mike Hommey
On Tue, Nov 18, 2014 at 12:11:47PM +0900, Mike Hommey wrote: Oh, so `ls dataref` would print out what dataref is? That would definitely help, although with the trick above, I probably wouldn't actually need it anymore. So, in the end, I was able to do everything with what's currently provided

Re: Getting a commit sha1 from fast-import in a remote-helper

2014-11-18 Thread Jonathan Nieder
Mike Hommey wrote: So, in the end, I was able to do everything with what's currently provided by git fast-import, but one thing would probably make life easier for me: being able to initialize a commit tree from a commit that's not one of the direct parents. IIRC then 'M 04' wants a tree

Re: Getting a commit sha1 from fast-import in a remote-helper

2014-11-18 Thread Mike Hommey
On Tue, Nov 18, 2014 at 06:21:22PM -0800, Jonathan Nieder wrote: Mike Hommey wrote: So, in the end, I was able to do everything with what's currently provided by git fast-import, but one thing would probably make life easier for me: being able to initialize a commit tree from a commit

Re: Getting a commit sha1 from fast-import in a remote-helper

2014-11-18 Thread Jonathan Nieder
On Wed, Nov 19, 2014 at 11:27:59AM +0900, Mike Hommey wrote: On Tue, Nov 18, 2014 at 06:21:22PM -0800, Jonathan Nieder wrote: IIRC then 'M 04' wants a tree object, not a commit object, so you'd have to do ls commit M 04 tree That's what I'm planning to try ; Would

git-fetch: default globally to --no-tags

2014-11-18 Thread Brian Norris
Hi, I have one main concern, and I can envision a few ways that git could solve it. I also see that there has been some previous discussion on reltaed topics over the years, but as far as I can tell, nothing has actually been implemented to address my concern. --- My concern --- When I fetch

.gitignore sub-dir exclusions not overriding '*'

2014-11-18 Thread Phil Pennock
The behaviour below is seen with both git 1.8.3.2 and git 2.1.3; I am not subscribed to the vger list, please keep me in the CC list. Use-case: git repo which only holds PGP-encrypted files with a .asc extension, no matter which sub-directory they're in, or if in the top directory. Simple