Re: [PATCH] config doc: add missing list separator for checkout.optimizeNewBranch

2018-09-18 Thread Ævar Arnfjörð Bjarmason
On Tue, Sep 18 2018, Jeff King wrote: > On Tue, Sep 18, 2018 at 05:34:49AM +, Ævar Arnfjörð Bjarmason wrote: > >> The documentation added in fa655d8411 ("checkout: optimize "git >> checkout -b "", 2018-08-16) didn't add the double-colon >> needed for the labeled list separator, as a result

Greeting

2018-09-18 Thread Danny Chan
Dear, I am working in financial firm in Asia. I have a business to transfer the sum of $19.000.000.00 of abandon fund in my office. If you are,interested in the transaction reply on my email for more details. Best Regards Danny Chan.

[PATCH] pack-objects: handle island check for "external" delta base

2018-09-18 Thread Jeff King
On Fri, Sep 14, 2018 at 02:56:36PM -0700, Junio C Hamano wrote: > * cc/delta-islands (2018-08-16) 7 commits > (merged to 'next' on 2018-08-27 at cf3d7bd93f) > + pack-objects: move 'layer' into 'struct packing_data' > + pack-objects: move tree_depth into 'struct packing_data' > + t5320: tests

Re: Subject: [PATCH 0/9] hdr-check

2018-09-18 Thread Elijah Newren
Hi Ramsay, On Tue, Sep 18, 2018 at 5:09 PM Ramsay Jones wrote; > This series follows on from a quick "just before bedtime" exercise > recently[1]. The new 'hdr-check' target essentially automates what > Elijah did by hand. Cool, thanks for doing this. I believe I only tried to directly check

Re: [PATCH] Add an EditorConfig file

2018-09-18 Thread Junio C Hamano
"brian m. carlson" writes: > To make automatically configuring one's editor easier, provide an > EditorConfig file. This is an INI-style configuration file that can be > used to specify editor settings and can be understood by a wide variety > of editors. Some editors include this support

Re: [PATCH v2 6/6] t9109-git-svn-props.sh: split up several pipes

2018-09-18 Thread Matthew DeVore
On Mon, Sep 17, 2018 at 6:57 PM Eric Sunshine wrote: > > On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote: > > t9109-git-svn-props.sh: split up several pipes > > Similar to my comment about 5/6, this title talks about the mechanical > changes made by the patch but not the intent. Perhaps

Re: [PATCH v2 5/6] tests: split up pipes

2018-09-18 Thread Matthew DeVore
On Mon, Sep 17, 2018 at 6:30 PM Eric Sunshine wrote: > > On Mon, Sep 17, 2018 at 6:25 PM Matthew DeVore wrote: > > tests: split up pipes > > This title explains the mechanical changes the patch is making but not > the intent. Perhaps reword it to say something like: > > tests: avoid

Re: [PATCH v2 1/6] CodingGuidelines: add shell piping guidelines

2018-09-18 Thread Matthew DeVore
On Mon, Sep 17, 2018 at 5:16 PM Eric Sunshine wrote: > > On Mon, Sep 17, 2018 at 6:24 PM Matthew DeVore wrote: > > diff --git a/Documentation/CodingGuidelines b/Documentation/CodingGuidelines > > @@ -163,6 +163,35 @@ For shell scripts specifically (not exhaustive): > > + - In a piped sequence

Letter from Andrew A. Schachter

2018-09-18 Thread Mr. Andrew Schachter (ESQ)
-- Andrew A. Schachter Attorney At Law General Parts Inc 2808 Falbrook Dr. NE Cedar Rapids, IA 52402 E-mail; andrewazaz...@aol.com My name is Andrew A. Schachter Attorney “Agricultural Development Bank. I’m writing on behalf of Mrs. Tracy Mills of West Side Auto Parts 604 Libby Lane

[PATCH] userdiff.h: add missing declaration (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, ... and this is the patch I needed for the current 'pu' branch. ATB, Ramsay Jones userdiff.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/userdiff.h b/userdiff.h index dad3fc03c1..b072bfe89a 100644 --- a/userdiff.h +++ b/userdiff.h @@ -3,6

[PATCH] fetch-object.h: add missing declaration (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- Hi Junio, This is the patch I needed for the current 'next' branch to get a clean 'hdr-check' ATB, Ramsay Jones fetch-object.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fetch-object.h b/fetch-object.h index d2f996d4e8..d6444caa5a 100644 ---

[PATCH 9/9] commit-reach.h: add missing declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- commit-reach.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/commit-reach.h b/commit-reach.h index 7d313e2975..f41d8f6ba3 100644 --- a/commit-reach.h +++ b/commit-reach.h @@ -1,12 +1,13 @@ #ifndef __COMMIT_REACH_H__ #define

[PATCH 8/9] delta-islands.h: add missing forward declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- delta-islands.h | 4 1 file changed, 4 insertions(+) diff --git a/delta-islands.h b/delta-islands.h index f9725730f4..b635cd07d8 100644 --- a/delta-islands.h +++ b/delta-islands.h @@ -1,6 +1,10 @@ #ifndef DELTA_ISLANDS_H #define DELTA_ISLANDS_H +struct

[PATCH 7/9] midx.h: add missing forward declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- midx.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/midx.h b/midx.h index a210f1af2a..622ddac472 100644 --- a/midx.h +++ b/midx.h @@ -3,6 +3,9 @@ #include "repository.h" +struct object_id; +struct pack_entry; + struct multi_pack_index {

[PATCH 6/9] refs/refs-internal.h: add missing declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- refs/refs-internal.h | 4 1 file changed, 4 insertions(+) diff --git a/refs/refs-internal.h b/refs/refs-internal.h index 04425d6d1e..44d53672c7 100644 --- a/refs/refs-internal.h +++ b/refs/refs-internal.h @@ -1,8 +1,12 @@ #ifndef REFS_REFS_INTERNAL_H

[PATCH 5/9] refs/packed-backend.h: add missing declaration (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- refs/packed-backend.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/refs/packed-backend.h b/refs/packed-backend.h index 640245d3b9..a01a0aff9c 100644 --- a/refs/packed-backend.h +++ b/refs/packed-backend.h @@ -1,6 +1,8 @@ #ifndef REFS_PACKED_BACKEND_H

[PATCH 4/9] refs/ref-cache.h: add missing declarations (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- refs/ref-cache.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/refs/ref-cache.h b/refs/ref-cache.h index eda65e73ed..3bfb89d2b3 100644 --- a/refs/ref-cache.h +++ b/refs/ref-cache.h @@ -1,7 +1,10 @@ #ifndef REFS_REF_CACHE_H #define REFS_REF_CACHE_H

[PATCH 3/9] ewah/ewok_rlw.h: add missing include (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- ewah/ewok_rlw.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ewah/ewok_rlw.h b/ewah/ewok_rlw.h index 7cdfdd0c02..d487966935 100644 --- a/ewah/ewok_rlw.h +++ b/ewah/ewok_rlw.h @@ -19,6 +19,8 @@ #ifndef __EWOK_RLW_H__ #define __EWOK_RLW_H__ +#include

[PATCH 2/9] json-writer.h: add missing include (hdr-check)

2018-09-18 Thread Ramsay Jones
Signed-off-by: Ramsay Jones --- json-writer.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/json-writer.h b/json-writer.h index fc18acc7d9..83906b09c1 100644 --- a/json-writer.h +++ b/json-writer.h @@ -42,6 +42,8 @@ * of the given strings. */ +#include "strbuf.h" + struct

[PATCH 1/9] Makefile: add a hdr-check target

2018-09-18 Thread Ramsay Jones
Commit ef3ca95475 ("Add missing includes and forward declarations", 2018-08-15) resulted from the author employing a manual method to create a C file consisting of a pair of pre-processor #include lines (for 'git-compat-util.h' and a given toplevel header), and fixing any resulting compiler

Subject: [PATCH 0/9] hdr-check

2018-09-18 Thread Ramsay Jones
This series follows on from a quick "just before bedtime" exercise recently[1]. The new 'hdr-check' target essentially automates what Elijah did by hand. I tend to run: $ make -h hdr-check >hcout 2>&1 $ vim hcout ... and I only just realised that if somebody wanted to add this to an

[PATCH v3 5/5] preload-index: update GIT_FORCE_PRELOAD_TEST support

2018-09-18 Thread Ben Peart
Rename GIT_FORCE_PRELOAD_TEST to GIT_TEST_PRELOAD_INDEX for consistency with the other GIT_TEST_ special setups and properly document its use. Add logic in t/test-lib.sh to give a warning when the old variable is set to let people know they need to update their environment to use the new

[PATCH v3 3/5] fsmonitor: update GIT_TEST_FSMONITOR support

2018-09-18 Thread Ben Peart
Rename GIT_FSMONITOR_TEST to GIT_TEST_FSMONITOR for consistency with the other GIT_TEST_ special setups and properly document its use. Add logic in t/test-lib.sh to give a warning when the old variable is set to let people know they need to update their environment to use the new variable.

[PATCH v3 4/5] read-cache: update TEST_GIT_INDEX_VERSION support

2018-09-18 Thread Ben Peart
Rename TEST_GIT_INDEX_VERSION to GIT_TEST_INDEX_VERSION for consistency with the other GIT_TEST_ special setups and properly document its use. Add logic in t/test-lib.sh to give a warning when the old variable is set to let people know they need to update their environment to use the new

[PATCH v3 2/5] preload-index: use git_env_bool() not getenv() for customization

2018-09-18 Thread Ben Peart
GIT_FORCE_PRELOAD_TEST is only checked for presence by using getenv(). Use git_env_bool() instead so that GIT_FORCE_PRELOAD_TEST=false can work as expected. Signed-off-by: Ben Peart --- preload-index.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/preload-index.c

[PATCH v3 0/5] Cleanup pass on special test setups

2018-09-18 Thread Ben Peart
This round has one code change based on feedback. Other changes are just rewording commit messages. Base Ref: v2.19.0 Web-Diff: https://github.com/benpeart/git/commit/043246d936 Checkout: git fetch https://github.com/benpeart/git git-test-cleanup-v3 && git checkout 043246d936 ### Interdiff

[PATCH v3 1/5] t/README: correct spelling of "uncommon"

2018-09-18 Thread Ben Peart
Correct a spelling error in the documentation for GIT_TEST_OE_DELTA_SIZE. Signed-off-by: Ben Peart --- t/README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/t/README b/t/README index 9028b47d92..56a417439c 100644 --- a/t/README +++ b/t/README @@ -315,7 +315,7 @@ packs on

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-18 Thread Jeff King
On Tue, Sep 18, 2018 at 12:36:06PM -0700, Jacob Keller wrote: > > I like that, too. It's a little more costly just because it may involve > > object-db writes, but I think in most cases it would be fine. I almost > > always "git stash" away discarded changes these days instead of "git > > reset

Greetings

2018-09-18 Thread Public Figure
TO WHOM IT MAY CONCERN Greetings, Opportunity for you, I am well recognized and Public Figure occupying a top Government position in Federal Republic of Nigerian. I am hereby requiring An International expatriates with professional experience in

Bonjour, J'attends toujours votre réponse s'il vous plaît

2018-09-18 Thread Mme Cécile PULON
"bonjour mon bien aimé en christ" Mon nom est Cécile PULON née en Juin 1941, je suis actuellement à l’hôpital (Edmonton Alberta de canada) à cause de mon état de santé dégradé, je vous contact pour un projet de Donation que je compte faire à une personne de bonne Moralité qui pourra savoir

Bonjour, J'attends toujours votre réponse s'il vous plaît

2018-09-18 Thread Mme Cécile PULON
"bonjour mon bien aimé en christ" Mon nom est Cécile PULON née en Juin 1941, je suis actuellement à l’hôpital (Edmonton Alberta de canada) à cause de mon état de santé dégradé, je vous contact pour un projet de Donation que je compte faire à une personne de bonne Moralité qui pourra savoir

Bonjour, J'attends toujours votre réponse s'il vous plaît

2018-09-18 Thread Mme Cécile PULON
"bonjour mon bien aimé en christ" Mon nom est Cécile PULON née en Juin 1941, je suis actuellement à l’hôpital (Edmonton Alberta de canada) à cause de mon état de santé dégradé, je vous contact pour un projet de Donation que je compte faire à une personne de bonne Moralité qui pourra savoir

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-18 Thread Eckhard Maaß
On Tue, Sep 18, 2018 at 12:41:30PM -0700, Jacob Keller wrote: > I think having both is good. There are a lot of ways to accidentally > throw away work, and it's pretty frustrating to have it happen. But > the reflog is also somewhat complicated, and I've definitely seen a > lot of developers

Re: Cannot negate `*` ignore pattern for directory with space in the name

2018-09-18 Thread Victor Engmark
On 19/09/2018 05:59, Duy Nguyen wrote: > On Tue, Sep 18, 2018 at 6:13 AM Victor Engmark > wrote: […] >> $ cat > .gitignore << EOF >>> * >>> !foo bar >>> !foo\ bar >>> !"foo bar" > > No need to quote, either with double quotes or backslashes. They are > interpreted as literal " and \ Thanks! I

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-18 Thread Jacob Keller
On Mon, Sep 17, 2018 at 12:26 PM Junio C Hamano wrote: > FWIW, I didn't mean to say that we should give users a way to > recover. Your "commit -a" or "commit $path" protection just > prevents the situation from happening, and I think it is sufficient. > > The sole point I wanted to raise by

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-18 Thread Jacob Keller
On Mon, Sep 17, 2018 at 11:15 AM Jeff King wrote: > > On Mon, Sep 17, 2018 at 07:29:26PM +0200, Duy Nguyen wrote: > > > > On the other hand, if I am keeping some change that should never be > > > in a commit in the working tree file, and building the contents in > > > the index using "add -p" to

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-18 Thread Jacob Keller
On Mon, Sep 17, 2018 at 10:09 AM Junio C Hamano wrote: > > It usually is safer (simply because you do not have to think about > it) to start a behaviour change like this as a strict opt-in to gain > confidence. I tend to agree, however.. in this case it could be considered safer to err on the

Re: Git trademark status and policy

2018-09-18 Thread Jeff King
On Mon, Sep 17, 2018 at 06:58:43AM -0700, Junio C Hamano wrote: > I can undertand the sentiment that we may not want to appear drawing > lines among friends, but ultimately the policy is about protecting > our friends from non-friends, so whether we like it or not, we may > have to be more

Re: Git trademark status and policy

2018-09-18 Thread Jeff King
On Mon, Sep 17, 2018 at 11:25:31AM +0200, Christian Couder wrote: > > (Also, to be clear, this is all _only_ about "Git Cola". The "git-cola" > > command is explicitly OK in the policy because that's how commands > > work). > > I agree about "git-cola" though I wonder about "git-dag" as this is

Re: [PATCH v2 2/6] test-reach: add run_three_modes method

2018-09-18 Thread SZEDER Gábor
On Mon, Sep 17, 2018 at 09:08:44PM -0700, Derrick Stolee via GitGitGadget wrote: > From: Derrick Stolee > > The 'test_three_modes' method assumes we are using the 'test-tool > reach' command for our test. However, we may want to use the data > shape of our commit graph and the three modes (no

Re: Cannot negate `*` ignore pattern for directory with space in the name

2018-09-18 Thread Duy Nguyen
On Tue, Sep 18, 2018 at 6:13 AM Victor Engmark wrote: > > To reproduce (from ): > > $ cd "$(mktemp --directory)" > $ mkdir foo\ bar > $ touch foo\ bar/test > $ git init > Initialized empty Git repository in /tmp/tmp.iGmBR6y2xR/.git/ > $ git status

Re: [PATCH] t3701-add-interactive: tighten the check of trace output

2018-09-18 Thread Taylor Blau
On Mon, Sep 10, 2018 at 10:18:34AM -0400, Taylor Blau wrote: > Signed-off-by: Taylor Blau Oops, this should be: Reviewed-by: Taylor Blau Thanks, Taylor

Re: [PATCH 3/3] doc/Makefile: drop doc-diff worktree and temporary files on "make clean"

2018-09-18 Thread Jeff King
On Mon, Sep 17, 2018 at 12:48:51PM -0700, Junio C Hamano wrote: > Jonathan Nieder writes: > > > I'd rather that we revert this change altogether. I have nothing > > against a convenient command to do this kind of non build related > > cleanup, but it shouldn't be spelled as "make clean". > >

Re: [PATCH v2 0/1] Make 'git commit' not accidentally lose staged content

2018-09-18 Thread Jeff King
On Mon, Sep 17, 2018 at 08:41:36PM +0200, Duy Nguyen wrote: > > I think the reflog approach has been successful: give these intermediate > > states a name. So in theory I could do something like: > > > > git checkout -p :@{2.minutes.ago} > > > > though it would probably be useful to be able to

[PATCH] add: do not accept pathspec magic 'attr'

2018-09-18 Thread Nguyễn Thái Ngọc Duy
Commit b0db704652 (pathspec: allow querying for attributes - 2017-03-13) adds new pathspec magic 'attr' but only with match_pathspec(). "git add" has some pathspec related code that still does not know about 'attr' and will bail out: $ git add ':(attr:foo)' fatal: BUG:dir.c:1584:

Re: [PATCH 2/3] gc: exit with status 128 on failure

2018-09-18 Thread Jeff King
On Mon, Sep 17, 2018 at 11:40:12AM -0700, Jonathan Nieder wrote: > > There's discussion elsewhere[1] of applying just up to patch 2. > > > > Do we still want to convert these cases to die() as their end-state? > > IMHO yes, we do. die() is the function that you can use to exit with > a fatal

Re: [PATCH] config doc: add missing list separator for checkout.optimizeNewBranch

2018-09-18 Thread Taylor Blau
On Tue, Sep 18, 2018 at 01:16:43PM -0400, Jeff King wrote: > On Tue, Sep 18, 2018 at 12:57:07PM -0400, Taylor Blau wrote: > > > Hi Ævar, > > > > On Tue, Sep 18, 2018 at 05:34:49AM +, Ævar Arnfjörð Bjarmason wrote: > > > The documentation added in fa655d8411 ("checkout: optimize "git > > >

Re: [PATCH] config doc: add missing list separator for checkout.optimizeNewBranch

2018-09-18 Thread Jeff King
On Tue, Sep 18, 2018 at 12:57:07PM -0400, Taylor Blau wrote: > Hi Ævar, > > On Tue, Sep 18, 2018 at 05:34:49AM +, Ævar Arnfjörð Bjarmason wrote: > > The documentation added in fa655d8411 ("checkout: optimize "git > > checkout -b "", 2018-08-16) didn't add the double-colon > > needed for the

Re: [PATCH v5 9/9] submodule: support reading .gitmodules when it's not in the working tree

2018-09-18 Thread SZEDER Gábor
Hi Antonio, it appears that this patch (and its previous versions as well) is responsible for triggering occasional test failures in 't7814-grep-recurse-submodules.sh', more frequently, about once in every ten runs, on macOS on Travis CI, less frequently, about once in a couple of hundred runs on

Re: [PATCH] config doc: add missing list separator for checkout.optimizeNewBranch

2018-09-18 Thread Jeff King
On Tue, Sep 18, 2018 at 05:34:49AM +, Ævar Arnfjörð Bjarmason wrote: > The documentation added in fa655d8411 ("checkout: optimize "git > checkout -b "", 2018-08-16) didn't add the double-colon > needed for the labeled list separator, as a result the added > documentation all got squashed into

Re: [PATCH] config doc: add missing list separator for checkout.optimizeNewBranch

2018-09-18 Thread Taylor Blau
Hi Ævar, On Tue, Sep 18, 2018 at 05:34:49AM +, Ævar Arnfjörð Bjarmason wrote: > The documentation added in fa655d8411 ("checkout: optimize "git > checkout -b "", 2018-08-16) didn't add the double-colon > needed for the labeled list separator, as a result the added > documentation all got

Re: Hash algorithm analysis

2018-09-18 Thread Linus Torvalds
On Tue, Sep 18, 2018 at 8:18 AM Joan Daemen wrote: > > 3) The relatively large state in the sponge construction increases the > generic strength against attacks when the input contains redundancy or > has a certain form. For instance, if the input is restricted to be text in > ASCII (such as

Re: Hash algorithm analysis

2018-09-18 Thread Jonathan Nieder
Hi, A quick note. Joan Daemen wrote: > when going over my todo list I was confronted with the mail of Dan > Shumow on the successor of SHA-1 for git. I know the decision was > made and it is not my intention to change it, but please see below > some comments on Dan's arguments. When the time

Re: Hash algorithm analysis

2018-09-18 Thread Joan Daemen
Dear all, when going over my todo list I was confronted with the mail of Dan Shumow on the successor of SHA-1 for git. I know the decision was made and it is not my intention to change it, but please see below some comments on Dan's arguments. In short, I argue below that SHA256 has no serious

Contact this Email for your payment; info...@consultant.com

2018-09-18 Thread UBA CONSULTANT
This is to officially inform you that we have verified your contract file presently on my desk, and I found out that you have not received your payment due to your lack of co-operation and not fulfilling the obligations giving to you in respect to your contract payment.Secondly, you are

[PATCH 1/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo

2018-09-18 Thread Shulhan
When issuing interactive rebase, git will open a text editor with list of commits to rebase and documentation on how to edit it. At the end of documentation it display, # However, if you remove everything, the rebase will be aborted. # #\t # Note that empty commits are commented out

[PATCH 0/1] git-rebase--interactive.sh: fix trailing spaces on empty $todo

2018-09-18 Thread Shulhan
For someone who use editor that display trailing white spaces, issuing interactive rebase will print two empty lines at the end of rebase with the last line contains tab, # However, if you remove everything, the rebase will be aborted. # #\t # Note that empty commits are commented out

Re: [PATCH 3/3] fetch doc: correct grammar in --force docs

2018-09-18 Thread Eric Sunshine
On Tue, Sep 18, 2018 at 1:48 AM Ævar Arnfjörð Bjarmason wrote: > "Work the same" is incorrect and needs to be "Works the same > way". Fixes grammar in document anion I added in the recently landed I, too, find those "document anions" problematic. Perhaps the physicists around here can do

Re: [PATCH v2 0/6] Use generation numbers for --topo-order

2018-09-18 Thread Ævar Arnfjörð Bjarmason
On Tue, Sep 18 2018, Derrick Stolee via GitGitGadget wrote: Thanks. Good to see the commit graph used for more stuff. > On the Linux repository, I got the following performance results when > comparing to the previous version with or without a commit-graph: > > Test: git rev-list --topo-order