Attention: E-mail Address Owner,

2018-11-18 Thread WESTERN UNION OFFICE
Website: www.westernunion.com Address: Plot 1261, Adela Hopewell Street CO/B/REP, Republic Of Benin. Email: westernunibe...@seznam.cz Attention: E-mail Address Owner, Sequel to the meeting held with Federal Bureau of Investigation, The International Monetary Fund (IMF) is compensating all the

Re: [PATCH v3 1/1] merge: add scissors line on merge conflict

2018-11-18 Thread SZEDER Gábor
On Sat, Nov 17, 2018 at 06:32:33PM -0500, Denton Liu wrote: > diff --git a/t/t7600-merge.sh b/t/t7600-merge.sh > index 106148254d..0d3db34f08 100755 > --- a/t/t7600-merge.sh > +++ b/t/t7600-merge.sh > @@ -247,6 +247,54 @@ test_expect_success 'merge --squash c3 with c7' ' > test_cmp expect

Cygwin Git with Windows paths

2018-11-18 Thread Steven Penny
Cygwin programs can handle Unix form paths: $ ls /var cache lib log run tmp and also Windows form paths: $ ls 'C:\cygwin64\var' cache lib log run tmp However current Cygwin Git cannot: $ git clone git://github.com/benhoyt/goawk 'C:\cygwin64\tmp\goawk' Cloning into

[PATCH v3 5/5] pretty: add support for separator option in %(trailers)

2018-11-18 Thread Anders Waldenborg
By default trailer lines are terminated by linebreaks ('\n'). By specifying the new 'separator' option they will instead be separated by user provided string and have separator semantics rather than terminator semantics. The separator string can contain the literal formatting codes %n and %xNN

[PATCH v3 3/5] pretty: add support for "valueonly" option in %(trailers)

2018-11-18 Thread Anders Waldenborg
With the new "key=" option to %(trailers) it often makes little sense to show the key, as it by definition already is know which trailer is printed there. This new "valueonly" option makes it omit the key when printing trailers. E.g.: $ git show -s

[PATCH v3 2/5] pretty: allow showing specific trailers

2018-11-18 Thread Anders Waldenborg
Adds a new "key=X" option to "%(trailers)" which will cause it to only print trailers lines which match the specified key. Signed-off-by: Anders Waldenborg --- Documentation/pretty-formats.txt | 17 +-- pretty.c | 31 ++-

[PATCH v3 0/5] %(trailers) improvements in pretty format

2018-11-18 Thread Anders Waldenborg
Updated since v2: * Allow trailing colon in 'key=' argument * Clarify documentation on how matching is done * Rename option to "valueonly" * Make trailing matching a callback function * Avoid copying match string * Simplify generation of "expected" in tests * Rename function to

[PATCH v3 1/5] pretty: single return path in %(trailers) handling

2018-11-18 Thread Anders Waldenborg
No functional change intended. This change may not seem useful on its own, but upcoming commits will do memory allocation in there, and a single return path makes deallocation easier. Signed-off-by: Anders Waldenborg --- pretty.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff

[PATCH v3 4/5] strbuf: separate callback for strbuf_expand:ing literals

2018-11-18 Thread Anders Waldenborg
Expanding '%n' and '%xNN' is generic functionality, so extract that from the pretty.c formatter into a callback that can be reused. No functional change intended Signed-off-by: Anders Waldenborg --- pretty.c | 16 +--- strbuf.c | 21 + strbuf.h | 8 3

Re: [PATCH v2] read-cache: write all indexes with the same permissions

2018-11-18 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 18 2018, Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: > >> Do you mean that you don't agree that following should always create >> both "foo" and e.g. ".git/refs/heads/master" with the same 644 >> (-rw-rw-r--) mode: >> >> ( >> rm -rf /tmp/repo && >>

[PATCH 0/1 v3] make stash work if user.name and user.email are not configured

2018-11-18 Thread Slavica Djukic
Changes since v2: * squash patch 1/2 and patch 2/2 into a single patch * modify first part of test when there is valid ident present: create a stash, grab %an and %ae out of the resulting commit object and compare to original ident Slavica Djukic

[PATCH 1/1 v3] stash: tolerate missing user identity

2018-11-18 Thread Slavica Djukic
The "git stash" command insists on having a usable user identity to the same degree as the "git commit-tree" and "git commit" commands do, because it uses the same codepath that creates commit objects as these commands. It is not strictly necesary to do so. Check if we will barf before creating

Re: Cygwin Git with Windows paths

2018-11-18 Thread Torsten Bögershausen
On Sun, Nov 18, 2018 at 07:21:58AM -0800, Steven Penny wrote: > Cygwin programs can handle Unix form paths: > >$ ls /var >cache lib log run tmp > > and also Windows form paths: > >$ ls 'C:\cygwin64\var' >cache lib log run tmp > > However current Cygwin Git cannot: > >

Re: Cygwin Git with Windows paths

2018-11-18 Thread Steven Penny
On Sun, Nov 18, 2018 at 9:41 AM Torsten Bögershausen wrote: > Thanks for the report > It seams as if "C:" is not recognized as an absolute path under > cygwin. > May be it should ? > > Does the following help ? (fully untested) that looks promising - but its not getting pulled in where it needs

Re: Cygwin Git with Windows paths

2018-11-18 Thread Torsten Bögershausen
On Sun, Nov 18, 2018 at 11:34:04AM -0600, Steven Penny wrote: > On Sun, Nov 18, 2018 at 11:15 AM Torsten Bögershausen wrote: > > But it may be that we need to pull in more stuff, similar to mingw, > > to get the C: stuff working, see > > "skip_dos_drive_prefix" > > > > And it may even be that we

2% Loan Offer

2018-11-18 Thread NORTON FINANCE
Loans for all kind of purpose We offer from a minimum amount of 10,000.00 dollars to 20 million dollars And at a low interest rate of 2% Loan Term: 25 years maximum depending on the loan amount you need. Customers should be above the age of 18 This loan transaction is 100% guarantee for serious

Re: [PATCH] msvc: Directly use MS version (_stricmp) of strcasecmp

2018-11-18 Thread Jeff King
On Sun, Nov 18, 2018 at 10:02:02PM +0100, Sven Strickroth wrote: > This also removes an implicit conversion from size_t (unsigned) to int > (signed). > > _stricmp as well as _strnicmp are both available since VS2012. Once upon a time we had problems with taking a function pointer of strcasecmp

Re: Cygwin Git with Windows paths

2018-11-18 Thread Steven Penny
On Sun, Nov 18, 2018 at 11:15 AM Torsten Bögershausen wrote: > But it may be that we need to pull in more stuff, similar to mingw, > to get the C: stuff working, see > "skip_dos_drive_prefix" > > And it may even be that we need a special handling for the "\" to be treated > as "/". > > If you

Re: [PATCH 0/5] Make :(attr) pathspec work with "git log"

2018-11-18 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 18 2018, Nguyễn Thái Ngọc Duy wrote: > When :(attr) was added, it supported one of the two main pathspec > matching functions, the one that works on a list of paths. The other > one works on a tree, tree_entry_interesting(), which gets :(attr) > support in this series. > > With

[PATCH v3] read-cache: make the split index obey umask settings

2018-11-18 Thread Ævar Arnfjörð Bjarmason
Make the split index write out its .git/sharedindex_* files with the same permissions as .git/index. This only changes the behavior when core.sharedRepository isn't set, i.e. the user's umask settings will be respected. This hasn't been the case ever since the split index was originally

Re: [PATCH 5/5] tree-walk: support :(attr) matching

2018-11-18 Thread Ævar Arnfjörð Bjarmason
On Sun, Nov 18 2018, Nguyễn Thái Ngọc Duy wrote: As noted in https://public-inbox.org/git/87d0r217vr@evledraar.gmail.com/ I'm happy to see this implemented. I have not read this patch in much detail... > [...] > Documentation/glossary-content.txt | 2 + > [...] > diff --git

[PATCH] grep: use grep_opt->repo instead of explict repo argument

2018-11-18 Thread Nguyễn Thái Ngọc Duy
This command is probably the first one that operates on a repository other than the_repository, in f9ee2fcdfa (grep: recurse in-process using 'struct repository' - 2017-08-02). An explicit 'struct repository *' was added in that commit to pass around the repository that we're supposed to grep

Re: Cygwin Git with Windows paths

2018-11-18 Thread Torsten Bögershausen
On Sun, Nov 18, 2018 at 10:23:19AM -0600, Steven Penny wrote: > On Sun, Nov 18, 2018 at 9:41 AM Torsten Bögershausen wrote: > > Thanks for the report > > It seams as if "C:" is not recognized as an absolute path under > > cygwin. > > May be it should ? > > > > Does the following help ? (fully

[no subject]

2018-11-18 Thread Major Dennis Hornbeck
I am in the military unit here in Afghanistan, we have some amount of funds that we want to move out of the country. My partners and I need a good partner someone we can trust. It is risk free and legal. Reply to this email: hornbeckmajordennis...@gmail.com Regards,Major Dennis Hornbeck.

[PATCH] msvc: Directly use MS version (_stricmp) of strcasecmp

2018-11-18 Thread Sven Strickroth
This also removes an implicit conversion from size_t (unsigned) to int (signed). _stricmp as well as _strnicmp are both available since VS2012. Signed-off-by: Sven Strickroth --- compat/msvc.h | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/compat/msvc.h

Re: Cygwin Git with Windows paths

2018-11-18 Thread Steven Penny
On Sun, Nov 18, 2018 at 12:28 PM Torsten Bögershausen wrote: > Thanks for testing. > It looks as if there is more work to be done then just a simple patch. > > My last question for today: > Does > > git clone '/cgdrive/c/my/dir' > > work ? yes - these all work and resolve to same path: git

Important

2018-11-18 Thread Reem Al-Hashimi
Hello, My name is ms. Reem Al-Hashimi. The UAE minister of state for international cooparation. I got your contact from a certain email database from your country while i was looking for someone to handle a huge financial transaction for me in confidence. Can you receive and invest on behalf

Git Test Coverage Report (Sunday, Nov 18th)

2018-11-18 Thread Derrick Stolee
Here is the test coverage report for today. Thanks, -Stolee [1] https://dev.azure.com/git/git/_build/results?buildId=257=logs --- pu: d02f4432dcda003413023869ebe412f03155f230 jch: af77f5458d76b45843ab70c577a54db24b4ea92f next: 6e8e63e21ad73680486866b4870b45db87c3d939 master:

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Stefan Xenos
> I don't think this counts as a typical modification and is probably hard to > detect automatically. Clever use of commands! (side: wouldn't it just be easier to just use git commit --amend, though?) Either way, I agree that there should be a way to manually create a change graph or modify one

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Junio C Hamano
Stefan Xenos writes: >> I don't think this counts as a typical modification and is probably hard to >> detect automatically. > > Clever use of commands! (side: wouldn't it just be easier to just use > git commit --amend, though?) When an original commit is mostly an early part of a feature,

Re: [PATCH 0/5] Make :(attr) pathspec work with "git log"

2018-11-18 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > But this also reveals an interesting thing: even though we walk on a > tree, we check attributes from _worktree_ (and optionally fall back to > the index). This is how attributes are implemented since forever. I > think this is not a big deal if we communicate

[RFC PATCH v2] technical doc: add a design doc for the evolve command

2018-11-18 Thread sxenos
From: Stefan Xenos This document describes what a change graph for git would look like, the behavior of the evolve command, and the changes planned for other commands. Signed-off-by: Stefan Xenos --- Documentation/technical/change-graph.txt | 928 +++ 1 file changed, 928

Re: [PATCH] msvc: Directly use MS version (_stricmp) of strcasecmp

2018-11-18 Thread Junio C Hamano
Jeff King writes: > And it seems we worked around this in de2f95ebed (mailmap: work around > implementations with pure inline strcasecmp, 2013-09-12). So I don't > think there is any blocker there. > > (Though of course I have no idea on other portability questions around > _stricmp(); I'll

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Junio C Hamano
Stefan Xenos writes: >> And the other half is that while I consider the "origin" thing is >> unnecessary for the above reasons, having it means we need to not >> just transfer the history reading to aa7ce555 and d664309ee (which >> are necessary anyway while we have histories to transplant from

[RFC PATCH v2] technical doc: add a design doc for the evolve command

2018-11-18 Thread sxenos
From: Stefan Xenos This document describes what a change graph for git would look like, the behavior of the evolve command, and the changes planned for other commands. Signed-off-by: Stefan Xenos --- Documentation/technical/change-graph.txt | 928 +++ 1 file changed, 928

Git Test Coverage Report (v2.20.0-rc0)

2018-11-18 Thread Derrick Stolee
Here is a test coverage report for the uncovered lines introduced in v2.20.0-rc0 compared to v2.19.1. Thanks, -Stolee [1] https://dev.azure.com/git/git/_build/results?buildId=263=logs --- apply.c eccb5a5f3d 4071) return get_oid_hex(p->old_oid_prefix, oid); 517fe807d6 4776)

Re: Cygwin Git with Windows paths

2018-11-18 Thread Junio C Hamano
"Randall S. Becker" writes: >> Torsten Bögershausen writes: >> >> > And it may even be that we need a special handling for the "\" to be >> > treated as "/". >> >> I do not do Windows, but is_dir_sep() needs to be tweaked if you want to do >> that. > > Heavy Cygwin user here. It is used in my

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Stefan Xenos
> I meant the project's history, not the meta-graph thing. In that case, we agree. The proposal suggests that "origin" should be reachable from the meta-graph for the cherry-picked commit, NOT the cherry-picked commit itself. Does that resolve our disagreement, or is reachability from the

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Junio C Hamano
Stefan Xenos writes: >> I meant the project's history, not the meta-graph thing. > > In that case, we agree. The proposal suggests that "origin" should be > reachable from the meta-graph for the cherry-picked commit, NOT the > cherry-picked commit itself. Does that resolve our disagreement, or

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Junio C Hamano
Stefan Xenos writes: > The scenario you describe would not produce an origin edge in the > metacommit graph. If the user amended X, there would be no origin > edges - just a replacement. If you cherry-picked Z you'd get no > replacements and just an origin. In neither case would you get both >

Re: Cygwin Git with Windows paths

2018-11-18 Thread Torsten Bögershausen
On 2018-11-19 04:33, Junio C Hamano wrote: > "Randall S. Becker" writes: > >>> Torsten Bögershausen writes: >>> And it may even be that we need a special handling for the "\" to be treated as "/". >>> >>> I do not do Windows, but is_dir_sep() needs to be tweaked if you want to do >>>

Re: [PATCH/RFC v1 1/1] Use size_t instead of unsigned long

2018-11-18 Thread Torsten Bögershausen
On 2018-11-19 00:40, Junio C Hamano wrote: > Derrick Stolee writes: > >>> This needs to go on top of pu, to cover all the good stuff >>>cooking here. >> >> Better to work on top of 'master', as the work in 'pu' will be >> rewritten several times, probably. > > We may not be able to find any

Re. Richard

2018-11-18 Thread Richard Thomas
Dear I am a contractor with shell petroleum here in the Uk and want to invest this $104M Dollars in real estate management and part in your company or any other area of business you know best that will be of good profit to both of us in your country kindly send to me your home or Office

Re: [RFC PATCH v2] technical doc: add a design doc for the evolve command

2018-11-18 Thread Stefan Xenos
Sorry, that should have been uploaded with a subject starting with [RFC PATCH v2]. I'm not sure why git send-email ignored my argument to --subject-prefix. I'm going to try to change the subject one more time. Please excuse me in advance if I accidentally spam the list by sending the same email

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Stefan Xenos
> This breaks the "git change" symmetry with "git branch", but after > responding to other messages regarding that command, I'm starting to > think that's not really a problem. Sorry, I appended that sentence to the wrong paragraph. It should have gone with the previous one that regarding the

Re: [PATCH/RFC v1 1/1] Use size_t instead of unsigned long

2018-11-18 Thread Junio C Hamano
Derrick Stolee writes: >> This needs to go on top of pu, to cover all the good stuff >>cooking here. > > Better to work on top of 'master', as the work in 'pu' will be > rewritten several times, probably. We may not be able to find any good moment to update some codepaths with deep

Re: [PATCH] technical doc: add a design doc for the evolve command

2018-11-18 Thread Stefan Xenos
> Am I correct to understand that the reason why a commit object is > (ab|re)used to represent a meta-commit is because by doing so we > would get connectivity (i.e. fetching & pushing would transfer all > the associated objects along) for free, and by not representing it > as a new and different

RE: Cygwin Git with Windows paths

2018-11-18 Thread Randall S. Becker
> -Original Message- > From: git-ow...@vger.kernel.org On Behalf Of > Junio C Hamano > Sent: November 18, 2018 19:07 > To: Torsten Bögershausen > Cc: Steven Penny ; git@vger.kernel.org > Subject: Re: Cygwin Git with Windows paths > > Torsten Bögershausen writes: > > > And it may even

Re: Cygwin Git with Windows paths

2018-11-18 Thread Junio C Hamano
Torsten Bögershausen writes: > And it may even be that we need a special handling for the "\" to be treated > as "/". I do not do Windows, but is_dir_sep() needs to be tweaked if you want to do that.

[PATCH 2/5] tree-walk.c: make tree_entry_interesting() take an index

2018-11-18 Thread Nguyễn Thái Ngọc Duy
In order to support :(attr) when matching pathspec on a tree, tree_entry_interesting() needs to take an index (because git_check_attr() needs it). This is the preparation step for it. This also makes it clearer what index we fall back to when looking up attributes during an unpack-trees operation:

[PATCH 3/5] pathspec.h: clean up "extern" in function declarations

2018-11-18 Thread Nguyễn Thái Ngọc Duy
"extern" on functions is not required and the trend has been removing it from header files. Signed-off-by: Nguyễn Thái Ngọc Duy --- pathspec.h | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/pathspec.h b/pathspec.h index a6525a6551..5fd781d695

[PATCH 5/5] tree-walk: support :(attr) matching

2018-11-18 Thread Nguyễn Thái Ngọc Duy
This lets us use :(attr) with "git grep " or "git log". :(attr) requires another round of checking before we can declare that a path is matched. This is done after path matching since we have lots of optimization to take a shortcut when things don't match. Note that if :(attr) is present, we

[PATCH 4/5] dir.c: move, rename and export match_attrs()

2018-11-18 Thread Nguyễn Thái Ngọc Duy
The function will be reused for matching attributes in pathspec when walking trees (currently it's used for matching pathspec when walking a list). pathspec.c would be a more neutral place for this. Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c | 41

[PATCH 0/5] Make :(attr) pathspec work with "git log"

2018-11-18 Thread Nguyễn Thái Ngọc Duy
When :(attr) was added, it supported one of the two main pathspec matching functions, the one that works on a list of paths. The other one works on a tree, tree_entry_interesting(), which gets :(attr) support in this series. With this, "git grep -- :(attr)" or "git log :(attr)" will not abort

[PATCH 1/5] tree.c: make read_tree*() take 'struct repository *'

2018-11-18 Thread Nguyễn Thái Ngọc Duy
These functions call tree_entry_interesting() which will soon require a 'struct index_state *' to be passed in. Instead of just changing the function signature to take an index, update to take a repo instead because these functions do need object database access. Signed-off-by: Nguyễn Thái Ngọc

Re: [PATCH/RFC v1 1/1] Use size_t instead of unsigned long

2018-11-18 Thread Derrick Stolee
On 11/17/2018 10:11 AM, tbo...@web.de wrote: From: Torsten Bögershausen Currently Git users can not commit files >4Gib under 64 bit Windows, where "long" is 32 bit but size_t is 64 bit. Improve the code base in small steps, as small as possible. What started with a small patch to replace