Greetings!!!!!

2017-06-24 Thread Dr. Paul Benk
Greetings! I have a proposal for you, this however is not mandatory nor will I in any manner compel you to honor against your will. I am Dr.Paul Benk a former executive director with Arab Tunisian Bank here in Tunis; I retired 1 year 7 months ago after putting in 28 years of meticulous service.

Re: [PATCH v2 1/3] read-cache: use shared perms when writing shared index

2017-06-24 Thread Christian Couder
On Sat, Jun 24, 2017 at 12:02 AM, Junio C Hamano wrote: > Christian Couder writes: >> Because of that, on repositories created with `git init --shared=all` >> and using the split index feature, one gets an error like: >> >> fatal:

Re: [PATCH v2 3/3] t1700: make sure split-index respects core.sharedrepository

2017-06-24 Thread Christian Couder
On Sat, Jun 24, 2017 at 12:20 AM, Junio C Hamano wrote: > Christian Couder writes: > >> Add a few tests to check that both the split-index file and the >> shared-index file are created using the right permissions when >> core.sharedrepository is

[PATCH v3 2/3] t1301: move modebits() to test-lib-functions.sh

2017-06-24 Thread Christian Couder
As the modebits() function can be useful outside t1301, let's move it into test-lib-functions.sh, and while at it let's rename it test_modebits(). Signed-off-by: Christian Couder --- t/t1301-shared-repo.sh | 18 +++--- t/test-lib-functions.sh | 5 + 2

[PATCH v3 3/3] t1700: make sure split-index respects core.sharedrepository

2017-06-24 Thread Christian Couder
Add a few tests to check that both the split-index file and the shared-index file are created using the right permissions when core.sharedrepository is set. Signed-off-by: Christian Couder --- t/t1700-split-index.sh | 30 ++ 1 file changed,

[PATCH v3 1/3] read-cache: use shared perms when writing shared index

2017-06-24 Thread Christian Couder
Since f6ecc62dbf (write_shared_index(): use tempfile module, 2015-08-10) write_shared_index() has been using mks_tempfile() to create the temporary file that will become the shared index. But even before that, it looks like the functions used to create this file didn't call adjust_shared_perm(),

What's cooking in git.git (Jun 2017, #07; Sat, 24)

2017-06-24 Thread Junio C Hamano
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 ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. A new maintenance release v2.13.2

A note from the maintainer

2017-06-24 Thread Junio C Hamano
Welcome to the Git development community. This message is written by the maintainer and talks about how Git project is managed, and how you can work with it. * Mailing list and the community The development is primarily done on the Git mailing list. Help requests, feature proposals, bug reports

[ANNOUNCE] Git v2.13.2

2017-06-24 Thread Junio C Hamano
The latest maintenance release Git v2.13.2 is now available at the usual places. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.13.2' tag and the 'maint' branch that the tag points at: url =

Re: EOL LF Windows auto.crlf issue

2017-06-24 Thread Torsten Bögershausen
On 24/06/17 18:56, Filip Kucharczyk wrote: I'm on Windows 10. auto.crlf in .gitconfig is set to [core] autocrlf = true I've got a git (git version 2.13.1.windows.2) repo. A linux guy emails me a text with with line endings LF. I paste this file into my repo. Now every time I introduce changes

Re: [PATCH v4 7/8] sha1_file: do not access pack if unneeded

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 11:41:39AM -0700, Junio C Hamano wrote: > > The other nice thing about whence_only is that it flips the logic. So > > any existing callers which depend on filling the union automatically > > will not be affected (though I would be surprised if there are any such > >

Re: [PATCH v5 5/5] convert: add "status=delayed" to filter process protocol

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 11:51:49AM -0700, Junio C Hamano wrote: > >> if ((CAP_DELAY & entry->supported_capabilities) && > >> dco && dco->state == CE_CAN_DELAY)) > > > > Agreed! > > Why wasn't this caught earlier? I thought this is something gcc warns about. I thought so, too. If it

Re: [PATCH v5 5/5] convert: add "status=delayed" to filter process protocol

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 07:22:40PM +0200, Lars Schneider wrote: > > It might be worth giving a reason in this last paragraph. I think the > > reason is "because it's more complicated for the caller, as they have to > > be OK with out-of-order processing and remembering to go back and handle > >

Re: Crash in t3507-cherry-pick-conflict.sh with GIT_TEST_SPLIT_INDEX set

2017-06-24 Thread Junio C Hamano
Christian Couder writes: > It bisects to f9d7abec2a (split-index: add and use > unshare_split_index(), 2017-05-05) that is fixing memory leaks when > discarding the index. > It looks like we are freeing some cache entries that we shouldn't free. Ouch. Let's revert

Re: [PATCH v5 5/5] convert: add "status=delayed" to filter process protocol

2017-06-24 Thread Junio C Hamano
Lars Schneider writes: >> On 24 Jun 2017, at 16:19, Jeff King wrote: >> >> Speaking of which, _are_ we OK with out-of-order processing in things >> like checkout? Certainly we care about deleting items before checking >> out new ones (so getting rid of

Crash in t3507-cherry-pick-conflict.sh with GIT_TEST_SPLIT_INDEX set

2017-06-24 Thread Christian Couder
Git from the master branch currently segfaults when running t3507-cherry-pick-conflict.sh with GIT_TEST_SPLIT_INDEX set: expecting success: pristine_detach initial && test_must_fail git cherry-pick -s picked-signed && git commit -a -s && test $(git show -s |grep -c

Re: [PATCH v4 7/8] sha1_file: do not access pack if unneeded

2017-06-24 Thread Junio C Hamano
Jeff King writes: > On Wed, Jun 21, 2017 at 11:15:01AM -0700, Junio C Hamano wrote: > >> > + if (!oi->typep && !oi->sizep && !oi->disk_sizep && >> > + !oi->delta_base_sha1 && !oi->typename && !oi->contentp && >> > + !oi->populate_u) { >> > + oi->whence =

Re: [PATCH v2] die(): stop hiding errors due to overzealous recursion guard

2017-06-24 Thread Junio C Hamano
Jeff King writes: >> One case I'd be worried about would be that the race is so bad that >> die-is-recursing-builtin never returns 0 even once. Everybody will >> just say "recursing" and die, without giving any useful information. > > I was trying to think how that would happen.

Re: [PATCH] doc: clarify syntax for %C(auto,...) in pretty formats

2017-06-24 Thread Junio C Hamano
Andreas Heiduk writes: > The change actually adds only > > (e.g. `%C(auto,red)`) > > but reflowing the paragraph blows it up a little. In such a case, you can avoid re-flowing and make the resulting lines of a-bit uneven lengths. The end result can be checked with

Re: [PATCH v5 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Junio C Hamano
René Scharfe writes: > Am 24.06.2017 um 14:14 schrieb Ævar Arnfjörð Bjarmason: >> Change the code for deciding what's to be done about %Z to stop >> passing always either a NULL or "" char * to >> strbuf_addftime(). Instead pass a boolean int to indicate whether the >> strftime()

Re: [RFC/PATCH 2/3] wildmatch: add interface for precompiling wildmatch() patterns

2017-06-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Sat, Jun 24 2017, Junio C. Hamano jotted: > >> Is the far-in-the-future vision to make this the other way around? >> That is, this being scaffolding, wildmatch_match() which is supposed >> to be precompiled match actually uses wildmatch() as

Re: [PATCH] git-p4: changelist template with p4 -G change -o

2017-06-24 Thread Lars Schneider
> On 24 Jun 2017, at 13:49, Luke Diamand wrote: > > On 22 June 2017 at 18:32, Junio C Hamano wrote: >> Miguel Torroja writes: >> >>> The option -G of p4 (python marshal output) gives more context about the >>> data being output.

Re: [PATCH v5 5/5] convert: add "status=delayed" to filter process protocol

2017-06-24 Thread Lars Schneider
> On 24 Jun 2017, at 16:19, Jeff King wrote: > > On Thu, Jun 01, 2017 at 10:22:03AM +0200, Lars Schneider wrote: > >> Some `clean` / `smudge` filters might require a significant amount of >> time to process a single blob (e.g. the Git LFS smudge filter might >> perform network

Re: Using '--help' for aliases

2017-06-24 Thread brian m. carlson
On Thu, Jun 22, 2017 at 12:11:29AM +0530, Kaartic Sivaraam wrote: > I am yet another user of 'git alias' (who wouldn't ?). It has become so > natural to me to use the aliased version that at some point of time I > tried the following, > > > $ git co --help > > `git co' is aliased to `checkout' >

EOL LF Windows auto.crlf issue

2017-06-24 Thread Filip Kucharczyk
I'm on Windows 10. auto.crlf in .gitconfig is set to [core] autocrlf = true I've got a git (git version 2.13.1.windows.2) repo. A linux guy emails me a text with with line endings LF. I paste this file into my repo. Now every time I introduce changes to this file and stage it, git tell me:

Re: [PATCH v5 0/5] convert: add "status=delayed" to filter process protocol

2017-06-24 Thread Jeff King
On Thu, Jun 01, 2017 at 10:21:58AM +0200, Lars Schneider wrote: > here is the 5th iteration of my "status delayed" topic. Patch 1 to 3 are > minor t0021 test adjustments and haven't been changed since v3. Patch 4 > is a minor "extract method" refactoring in convert. Patch 5 is the new > feature.

Re: [PATCH v5 5/5] convert: add "status=delayed" to filter process protocol

2017-06-24 Thread Jeff King
On Thu, Jun 01, 2017 at 10:22:03AM +0200, Lars Schneider wrote: > Some `clean` / `smudge` filters might require a significant amount of > time to process a single blob (e.g. the Git LFS smudge filter might > perform network requests). During this process the Git checkout > operation is blocked

Re: [PATCH] sha1_name: cache readdir(3) results in find_short_object_filename()

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 04:09:39PM +0200, René Scharfe wrote: > Am 24.06.2017 um 14:20 schrieb Jeff King: > > On Sat, Jun 24, 2017 at 02:12:30PM +0200, René Scharfe wrote: > > > >>> That's redundant with "subdir_nr". Should we push that logic down into > >>> the function, and basically do: > >>>

Re: [PATCH] sha1_name: cache readdir(3) results in find_short_object_filename()

2017-06-24 Thread René Scharfe
Am 24.06.2017 um 14:20 schrieb Jeff King: > On Sat, Jun 24, 2017 at 02:12:30PM +0200, René Scharfe wrote: > >>> That's redundant with "subdir_nr". Should we push that logic down into >>> the function, and basically do: >>> >>> if (subdir_nr < 0 || subdir_nr > 256) >>> BUG("object subdir

Re: [PATCH v5 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread René Scharfe
Am 24.06.2017 um 14:14 schrieb Ævar Arnfjörð Bjarmason: Change the code for deciding what's to be done about %Z to stop passing always either a NULL or "" char * to strbuf_addftime(). Instead pass a boolean int to indicate whether the strftime() %Z format should be suppressed by converting it to

Re: [PATCH v4 0/8] Improvements to sha1_file

2017-06-24 Thread Jeff King
On Mon, Jun 19, 2017 at 06:03:07PM -0700, Jonathan Tan wrote: > > I had the same thoughts (both on the name and the "vocabularies"). IMHO > > we should consider allocating the bits from the same set. There's only > > one HAS_SHA1 flag, and it has an exact match in OBJECT_INFO_QUICK. > > Agreed -

Re: [PATCH v4 7/8] sha1_file: do not access pack if unneeded

2017-06-24 Thread Jeff King
On Wed, Jun 21, 2017 at 11:15:01AM -0700, Junio C Hamano wrote: > > + if (!oi->typep && !oi->sizep && !oi->disk_sizep && > > + !oi->delta_base_sha1 && !oi->typename && !oi->contentp && > > + !oi->populate_u) { > > + oi->whence = OI_PACKED; > > + return 0; > > +

Re: [PATCH v4 6/8] sha1_file: improve sha1_object_info_extended

2017-06-24 Thread Jeff King
On Mon, Jun 19, 2017 at 06:03:13PM -0700, Jonathan Tan wrote: > Subject: [PATCH v4 6/8] sha1_file: improve sha1_object_info_extended > Improve sha1_object_info_extended() by supporting additional flags. This > allows has_sha1_file_with_flags() to be modified to use > sha1_object_info_extended()

Re: [PATCH] git-p4: changelist template with p4 -G change -o

2017-06-24 Thread miguel torroja
You are right about the "# add"comment. I couldn't find any extra info in the marshaled output that I can use to add the change action comment after the path. That's one downside of that change. On Sat, Jun 24, 2017 at 1:49 PM, Luke Diamand wrote: > On 22 June 2017 at 18:32,

Re: [PATCH v2] die(): stop hiding errors due to overzealous recursion guard

2017-06-24 Thread Jeff King
On Wed, Jun 21, 2017 at 02:32:16PM -0700, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > > > So let's just set the recursion limit to a number higher than the > > number of threads we're ever likely to spawn. Now we won't lose > > errors, and if we have a recursing

Re: [PATCH v5 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 12:14:52PM +, Ævar Arnfjörð Bjarmason wrote: > On Sat, Jun 24, 2017 at 2:10 PM, Ævar Arnfjörð Bjarmason > wrote: > > Thanks. Docs fixed per your suggestion. I sent a v4 of 1/2 too, but > > that's unchanged, just thought it was simpler than having

Re: [PATCH] sha1_name: cache readdir(3) results in find_short_object_filename()

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 02:12:30PM +0200, René Scharfe wrote: > > That's redundant with "subdir_nr". Should we push that logic down into > > the function, and basically do: > > > >if (subdir_nr < 0 || subdir_nr > 256) > > BUG("object subdir number out of range"); > > Hmm. I don't

[PATCH v5 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Ævar Arnfjörð Bjarmason
Change the code for deciding what's to be done about %Z to stop passing always either a NULL or "" char * to strbuf_addftime(). Instead pass a boolean int to indicate whether the strftime() %Z format should be suppressed by converting it to an empty string, which is what this code is actually

[PATCH v5 1/2] strbuf.h comment: discuss strbuf_addftime() arguments in order

2017-06-24 Thread Ævar Arnfjörð Bjarmason
Change the comment documenting the strbuf_addftime() function to discuss the parameters in the order in which they appear, which makes this easier to read than discussing them out of order. Signed-off-by: Ævar Arnfjörð Bjarmason --- strbuf.h | 2 +- 1 file changed, 1

Re: [PATCH] sha1_name: cache readdir(3) results in find_short_object_filename()

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 02:12:07PM +0200, René Scharfe wrote: > Am 23.06.2017 um 01:10 schrieb Jeff King: > > On Thu, Jun 22, 2017 at 08:19:48PM +0200, René Scharfe wrote: > > > >> Read each loose object subdirectory at most once when looking for unique > >> abbreviated hashes. This speeds up

Re: [PATCH] sha1_name: cache readdir(3) results in find_short_object_filename()

2017-06-24 Thread René Scharfe
Am 23.06.2017 um 01:10 schrieb Jeff King: > On Thu, Jun 22, 2017 at 08:19:48PM +0200, René Scharfe wrote: >> @@ -1811,6 +1822,12 @@ typedef int each_loose_cruft_fn(const char *basename, >> typedef int each_loose_subdir_fn(int nr, >> const char *path, >>

Re: [PATCH v4 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 12:10:23PM +, Ævar Arnfjörð Bjarmason wrote: > > I couldn't quite parse "let suppress". I'm not sure if it was supposed > > to be "let's". Probably "means to suppress the strftime..." would be > > more clear. I'd probably have written it more like: > > > >  

Re: [PATCH] sha1_name: cache readdir(3) results in find_short_object_filename()

2017-06-24 Thread René Scharfe
Am 23.06.2017 um 01:10 schrieb Jeff King: > On Thu, Jun 22, 2017 at 08:19:48PM +0200, René Scharfe wrote: > >> Read each loose object subdirectory at most once when looking for unique >> abbreviated hashes. This speeds up commands like "git log --pretty=%h" >> considerably, which previously

[PATCH v4 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Ævar Arnfjörð Bjarmason
Change the code for deciding what's to be done about %Z to stop passing always either a NULL or "" char * to strbuf_addftime(). Instead pass a boolean int to indicate whether the strftime() %Z format should be suppressed by converting it to an empty string, which is what this code is actually

[PATCH v4 1/2] strbuf.h comment: discuss strbuf_addftime() arguments in order

2017-06-24 Thread Ævar Arnfjörð Bjarmason
Change the comment documenting the strbuf_addftime() function to discuss the parameters in the order in which they appear, which makes this easier to read than discussing them out of order. Signed-off-by: Ævar Arnfjörð Bjarmason --- strbuf.h | 2 +- 1 file changed, 1

Re: [PATCH v3 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 11:36:35AM +, Ævar Arnfjörð Bjarmason wrote: > >> extern void strbuf_addftime(struct strbuf *sb, const char *fmt, > >>const struct tm *tm, int tz_offset, > >> - const char *tz_name); > >> + const int

Re: [PATCH v2 22/29] commit_packed_refs(): use a staging file separate from the lockfile

2017-06-24 Thread Jeff King
On Sat, Jun 24, 2017 at 01:43:09PM +0200, Michael Haggerty wrote: > >> out: > >> + rollback_lock_file(>lock); > > > > We always rollback the lockfile regardless, because committing it would > > overwrite our new content with an empty file. There's no real safety > > against somebody calling

Re: [PATCH] git-p4: changelist template with p4 -G change -o

2017-06-24 Thread Luke Diamand
On 22 June 2017 at 18:32, Junio C Hamano wrote: > Miguel Torroja writes: > >> The option -G of p4 (python marshal output) gives more context about the >> data being output. That's useful when using the command "change -o" as >> we can distinguish

Re: [PATCH v2 22/29] commit_packed_refs(): use a staging file separate from the lockfile

2017-06-24 Thread Michael Haggerty
On 06/23/2017 09:46 PM, Jeff King wrote: > On Fri, Jun 23, 2017 at 09:01:40AM +0200, Michael Haggerty wrote: > >> @@ -522,10 +529,16 @@ int lock_packed_refs(struct ref_store *ref_store, int >> flags) >> timeout_configured = 1; >> } >> >> +/* >> + * Note that we close

[PATCH v3 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Ævar Arnfjörð Bjarmason
Change the code for deciding what's to be done about %Z to stop passing always either a NULL or "" char * to strbuf_addftime(). Instead pass a boolean int to indicate whether the strftime() %Z format should be suppressed by converting it to an empty string, which is what this code is actually

[PATCH v3 1/2] strbuf.h comment: discuss strbuf_addftime() arguments in order

2017-06-24 Thread Ævar Arnfjörð Bjarmason
Change the comment documenting the strbuf_addftime() function to discuss the parameters in the order in which they appear, which makes this easier to read than discussing them out of order. Signed-off-by: Ævar Arnfjörð Bjarmason --- I though it was more readable to split out

Re: [PATCH v2 00/29] Create a reference backend for packed refs

2017-06-24 Thread Michael Haggerty
On 06/24/2017 03:11 AM, Jeff King wrote: > On Fri, Jun 23, 2017 at 02:47:01PM -0700, Junio C Hamano wrote: > >>> Speculating on my own question. I guess it would prepare us for a day >>> when a possible ref store is to use a packed-refs _without_ loose refs. >>> IOW, the property is defined on

Re: [PATCH] strbuf: change an always NULL/"" strbuf_addftime() param to bool

2017-06-24 Thread Ævar Arnfjörð Bjarmason
On Fri, Jun 23 2017, René Scharfe jotted: > Am 23.06.2017 um 17:23 schrieb Jeff King: >> On Fri, Jun 23, 2017 at 05:13:38PM +0200, Ævar Arnfjörð Bjarmason wrote: >> The idea was that eventually the caller might be able to come up with a TZ that is not blank, but is also not what

Re: [RFC/PATCH 2/3] wildmatch: add interface for precompiling wildmatch() patterns

2017-06-24 Thread Ævar Arnfjörð Bjarmason
On Sat, Jun 24 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> +struct wildmatch_compiled *wildmatch_compile(const char *pattern, unsigned >> int flags) >> +{ >> +struct wildmatch_compiled *code = xmalloc(sizeof(struct >> wildmatch_compiled)); >> +

this is urgent reply.

2017-06-24 Thread Mr. zaki ibrahim.
Greetings My Dear Friend, Before I introduce myself, I wish to inform you that this letter is not a hoax mail and I urge you to treat it serious. This letter must come to you as a big surprise, but I believe it is only a day that people meet and become great friends and business partners. Please

Re: My Second Email to You, Pls Reply Me Soon

2017-06-24 Thread Fani Investment
Hello Dear, How are you doing? I hope you are doing well. I am writing as I have written to you previously without any response from you. I hope all is well with you.I will appreciate if you will acknowledge your receipt of this mail. Thank you and have a good day. Mrs Fatma. Please Write Me

[PATCH] doc: clarify syntax for %C(auto,...) in pretty formats

2017-06-24 Thread Andreas Heiduk
The change actually adds only (e.g. `%C(auto,red)`) but reflowing the paragraph blows it up a little. 8< The manual correctly describes the syntax with `auto,` but the trailing `,` is hard to spot in a terminal. The HTML format does not have this problem. Adding an