[PATCH v3 0/1] doc: Add a note about ~/.zsh/_git file

2019-10-15 Thread Max Belsky via GitGitGadget
Hey, Today I've spent a few hours to understand why git-completion doesn't work in my zsh shell. It was because I thought ~/.zsh/_git should be a dictionary with git-completion.zsh file. I think this change may save some hours for someone else. Maxim Belsky (1): doc: Change zsh git completion

[PATCH v2 0/1] doc: Add a note about ~/.zsh/_git file

2019-10-11 Thread Max Belsky via GitGitGadget
Hey, Today I've spent a few hours to understand why git-completion doesn't work in my zsh shell. It was because I thought ~/.zsh/_git should be a dictionary with git-completion.zsh file. I think this change may save some hours for someone else. Maxim Belsky (1): doc: Change zsh git completion

[PATCH 0/1] doc: Add a note about ~/.zsh/_git file

2019-10-10 Thread Max Belsky via GitGitGadget
Hey, Today I've spent a few hours to understand why git-completion doesn't work in my zsh shell. It was because I thought ~/.zsh/_git should be a dictionary with git-completion.zsh file. I think this change may save some hours for someone else. Maxim Belsky (1): doc: Change zsh git completion

[PATCH v4 07/11] gc docs: note how --aggressive impacts --window & --depth

2019-04-07 Thread Ævar Arnfjörð Bjarmason
expense of runtime performance, which is usually the opposite of someone who'd like "aggressive gc" wants. But that's left us with a mostly-redundant configuration variable, so let's clearly note in its documentation that it doesn't change the default.

[PATCH v4 09/11] gc docs: note "gc --aggressive" in "fast-import"

2019-04-07 Thread Ævar Arnfjörð Bjarmason
Amend the "PACKFILE OPTIMIZATION" section in "fast-import" to explain that simply running "git gc --aggressive" after a "fast-import" should properly optimize the repository. This is simpler and more effective than the existing "repack" advice (which I'm keeping as it helps explain things) because

[PATCH v3 07/11] gc docs: note how --aggressive impacts --window & --depth

2019-03-22 Thread Ævar Arnfjörð Bjarmason
expense of runtime performance, which is usually the opposite of someone who'd like "aggressive gc" wants. But that's left us with a mostly-redundant configuration variable, so let's clearly note in its documentation that it doesn't change the default.

[PATCH v3 09/11] gc docs: note "gc --aggressive" in "fast-import"

2019-03-22 Thread Ævar Arnfjörð Bjarmason
Amend the "PACKFILE OPTIMIZATION" section in "fast-import" to explain that simply running "git gc --aggressive" after a "fast-import" should properly optimize the repository. This is simpler and more effective than the existing "repack" advice (which I'm keeping as it helps explain things) because

[PATCH v2 08/10] gc docs: note "gc --aggressive" in "fast-import"

2019-03-21 Thread Ævar Arnfjörð Bjarmason
Amend the "PACKFILE OPTIMIZATION" section in "fast-import" to explain that simply running "git gc --aggressive" after a "fast-import" should properly optimize the repository. This is simpler and more effective than the existing "repack" advice (which I'm keeping as it helps explain things) because

[PATCH v2 06/10] gc docs: note how --aggressive impacts --window & --depth

2019-03-21 Thread Ævar Arnfjörð Bjarmason
expense of runtime performance, which is usually the opposite of someone who'd like "aggressive gc" wants. But that's left us with a mostly-redundant configuration variable, so let's clearly note in its documentation that it doesn't change the default.

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-21 Thread Elijah Newren
On Wed, Mar 20, 2019 at 7:58 AM Duy Nguyen wrote: > > On Wed, Mar 20, 2019 at 8:53 PM Elijah Newren wrote: > > So, I think we do need something (eventually at least). Would you > > prefer we dropped this patch from Duy and instead made 'checkout -m' > > abort when the index is dirty? > > I have

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-20 Thread Junio C Hamano
Elijah Newren writes: > On Tue, Mar 19, 2019 at 7:50 PM Junio C Hamano wrote: >> >> Duy Nguyen writes: >> >> > Kinda. But "--force --merge" makes no sense. --force discards all >> > local changes by definition, which means you can't have conflicts and >> > will not need --merge. I think this is

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-20 Thread Duy Nguyen
On Wed, Mar 20, 2019 at 8:53 PM Elijah Newren wrote: > So, I think we do need something (eventually at least). Would you > prefer we dropped this patch from Duy and instead made 'checkout -m' > abort when the index is dirty? I have no problem with this. Still scratching my head wondering if t720

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-20 Thread Elijah Newren
On Tue, Mar 19, 2019 at 7:50 PM Junio C Hamano wrote: > > Duy Nguyen writes: > > > Kinda. But "--force --merge" makes no sense. --force discards all > > local changes by definition, which means you can't have conflicts and > > will not need --merge. I think this is the reason why we die() out > >

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-19 Thread Junio C Hamano
Duy Nguyen writes: > Kinda. But "--force --merge" makes no sense. --force discards all > local changes by definition, which means you can't have conflicts and > will not need --merge. I think this is the reason why we die() out > when both are specified. So we need something like > --discard-stag

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-19 Thread Duy Nguyen
On Wed, Mar 20, 2019 at 8:19 AM Junio C Hamano wrote: > > Duy Nguyen writes: > > >> I think "checkout -m " with a dirty index should refuse > >> to run; there is nothing to "continue" after such a failure, so I am > >> not sure what you mean by "an option to continue" (iow, I do not see > >> a ne

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-19 Thread Junio C Hamano
Duy Nguyen writes: >> I think "checkout -m " with a dirty index should refuse >> to run; there is nothing to "continue" after such a failure, so I am >> not sure what you mean by "an option to continue" (iow, I do not see >> a need for such an option, and if that option makes the whole notion >>

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-19 Thread Duy Nguyen
On Wed, Mar 20, 2019 at 7:24 AM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > If you have staged changes in path A and perform 'checkout > > --merge' (which could result in conflicts in a totally unrelated path > > B), changes in A will be gone. Which is unexpected. We are suppose

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-19 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > If you have staged changes in path A and perform 'checkout > --merge' (which could result in conflicts in a totally unrelated path > B), changes in A will be gone. Which is unexpected. We are supposed > to keep all changes, or kick and scream otherwise. > > This is

Re: [PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-19 Thread Phillip Wood
ue --merge is very weird. Such an option would keep worktree changes, but drop staged changes. Because the problem has been with us since the introduction of --merge and everybody has been pretty happy (except Phillip, who found this problem), I'll just take a note here to acknowledge it and

[PATCH] checkout.txt: note about losing staged changes with --merge

2019-03-19 Thread Nguyễn Thái Ngọc Duy
ee changes, but drop staged changes. Because the problem has been with us since the introduction of --merge and everybody has been pretty happy (except Phillip, who found this problem), I'll just take a note here to acknowledge it and wait for merge wizards to come in and work their magic. The

Re: [PATCH 1/3] doc: note config file restrictions for completion.commands

2019-03-17 Thread Duy Nguyen
Poking this thread before it goes completely dead... On Sat, Mar 2, 2019 at 12:34 AM Todd Zullinger wrote: > > The completion.commands config var must be set in either the system-wide > or global config file. The completion script does not read a local > repository config. After the last discus

Re: [PATCH v2] Documentation/config: note trailing newline with --type=color

2019-03-06 Thread Junio C Hamano
Jeff King writes: > On Wed, Mar 06, 2019 at 03:52:38PM -0800, Taylor Blau wrote: > >> In 63e2a0f8e9 (builtin/config: introduce `color` type specifier, >> 2018-04-09), `--type=color` was introduced and preferred to the >> old-style `--get-color`. >> >> The two behave the same in almost every way,

Re: [PATCH v2] Documentation/config: note trailing newline with --type=color

2019-03-06 Thread Jeff King
On Wed, Mar 06, 2019 at 03:52:38PM -0800, Taylor Blau wrote: > In 63e2a0f8e9 (builtin/config: introduce `color` type specifier, > 2018-04-09), `--type=color` was introduced and preferred to the > old-style `--get-color`. > > The two behave the same in almost every way, save for the fact that > `-

[PATCH v2] Documentation/config: note trailing newline with --type=color

2019-03-06 Thread Taylor Blau
d, if there is no color configured for `name`. + -`--type=color [--default=]` is preferred over `--get-color`. +`--type=color [--default=]` is preferred over `--get-color` +(but note that `--get-color` will omit the trailing newline printed by +`--type=color`). -e:: --edit:: -- 2.20.1

[PATCH 1/3] doc: note config file restrictions for completion.commands

2019-03-01 Thread Todd Zullinger
The completion.commands config var must be set in either the system-wide or global config file. The completion script does not read a local repository config. Signed-off-by: Todd Zullinger --- Documentation/config/completion.txt | 3 ++- Documentation/git.txt | 3 ++- 2 files chan

A note from the maintainer

2019-02-26 Thread Junio C Hamano
ly part of the "pu" branch; that branch contains all topics that are in "next" and a bit more (but not all of "pu") and is used by the maintainer for his daily work. The two branches "master" and "maint" are never rewound, and "next" u

Re: [PATCH] git-rebase.txt: update note about directory rename detection and am

2018-12-08 Thread Junio C Hamano
gt;> probably should have also been updated to note the stronger >> incompatibility between git-am and directory rename detection. Update >> it now. >> >> Signed-off-by: Elijah Newren >> Signed-off-by: Johannes Sixt >> --- >> Documentation/git-r

Re: [PATCH] git-rebase.txt: update note about directory rename detection and am

2018-12-07 Thread Elijah Newren
On Fri, Dec 7, 2018 at 9:51 AM Johannes Sixt wrote: > > From: Elijah Newren > > In commit 6aba117d5cf7 ("am: avoid directory rename detection when > calling recursive merge machinery", 2018-08-29), the git-rebase manpage > probably should have also been

[PATCH] git-rebase.txt: update note about directory rename detection and am

2018-12-07 Thread Johannes Sixt
From: Elijah Newren In commit 6aba117d5cf7 ("am: avoid directory rename detection when calling recursive merge machinery", 2018-08-29), the git-rebase manpage probably should have also been updated to note the stronger incompatibility between git-am and directory rename detection.

Re: [PATCH] config.txt: correct the note about uploadpack.packObjectsHook

2018-09-28 Thread Jeff King
Filter is added in [2], it's > added in between the two paragraphs. This makes the "this is non-repo > level config" note incorrectly apply to allowFilter instead of > packObjectsHook. Move allowFilter paragraph down to fix this. Nice catch, and the patch looks obviously correct. Thanks. -Peff

[PATCH] config.txt: correct the note about uploadpack.packObjectsHook

2018-09-28 Thread Nguyễn Thái Ngọc Duy
s non-repo level config" note incorrectly apply to allowFilter instead of packObjectsHook. Move allowFilter paragraph down to fix this. [1] 20b20a22f8 (upload-pack: provide a hook for running pack-objects - 2016-05-18) [2] 10ac85c785 (upload-pack: add object filtering for partial clone -

Re: [PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Martin Ågren
Hi Taylor, On Wed, 19 Sep 2018 at 19:21, Taylor Blau wrote: > I could take or leave 2/2, since I usually write ", (see: above)", but > I'm not sure if that's grammatically correct or not. Well, I sure ain't no grammar expert too... This is not a patch I feel strongly about, so I'll be happy to d

Re: [PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Taylor Blau
Hi Martin, On Wed, Sep 19, 2018 at 06:38:19PM +0200, Martin Ågren wrote: > Rather than saying "(see: above)", drop the colon. Also drop the comma > before this note. > > Signed-off-by: Martin Ågren Thanks for both of these. I should have at least taken care of 1/2 myself,

[PATCH 2/2] git-config.txt: fix 'see: above' note

2018-09-19 Thread Martin Ågren
Rather than saying "(see: above)", drop the colon. Also drop the comma before this note. Signed-off-by: Martin Ågren --- Documentation/git-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-config.txt b/Documentation/git-config

[PATCH v2 2/2] rerere: add note about files with existing conflict markers

2018-08-28 Thread Thomas Gummerer
a/Documentation/git-rerere.txt +++ b/Documentation/git-rerere.txt @@ -211,6 +211,12 @@ would conflict the same way as the test merge you resolved earlier. 'git rerere' will be run by 'git rebase' to help you resolve this conflict. +[NOTE] 'git rerere' relies on the conflic

[PATCH 09/24] unpack-trees: add a note about path invalidation

2018-08-13 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- unpack-trees.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/unpack-trees.c b/unpack-trees.c index f9efee0836..c07a6cd646 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1552,6 +1552,17 @@ static int verify_uptodate_sparse(const stru

[PATCH 1/2] doc hash-function-transition: note the lack of a changelog

2018-07-25 Thread Ævar Arnfjörð Bjarmason
have been worthy of including in this changelog (but weren't). Instead of amending it to include these, just note that future changes will be noted in the log. Signed-off-by: Ævar Arnfjörð Bjarmason --- Documentation/technical/hash-function-transition.txt | 6 ++ 1 file changed, 6 inse

Re: [PATCH 03/20] blame doc: explicitly note how --abbrev=40 gives 39 chars

2018-06-12 Thread Junio C Hamano
as the > abbreviated object name, use +1 digits. Note that 1 column > is used for a caret to mark the boundary commit. This is outside the scope of this patch, but is the above 7+1 still current or do we need updating it for the (not so) recent change to auto-scale the default ab

[PATCH 03/20] blame doc: explicitly note how --abbrev=40 gives 39 chars

2018-06-08 Thread Ævar Arnfjörð Bjarmason
ecimal digits as the abbreviated object name, use +1 digits. Note that 1 column is used for a caret to mark the boundary commit. ++ +Because of this UI design, the only way to get the full SHA-1 of the +boundary commit is to use the `--porcelain` format. With `--abbrev=40` +only 39 characters of the

[PATCH v4 02/23] unpack-trees: add a note about path invalidation

2018-06-06 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- unpack-trees.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/unpack-trees.c b/unpack-trees.c index 3a85a02a77..5d06aa9c98 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1545,6 +1545,17 @@ static int verify_uptodate_sparse(const stru

[PATCH v3 02/20] unpack-trees: add a note about path invalidation

2018-06-06 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- unpack-trees.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/unpack-trees.c b/unpack-trees.c index 3a85a02a77..5d06aa9c98 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1545,6 +1545,17 @@ static int verify_uptodate_sparse(const stru

[PATCH v2 2/5] unpack-trees: add a note about path invalidation

2018-06-05 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- unpack-trees.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/unpack-trees.c b/unpack-trees.c index 3a85a02a77..5d06aa9c98 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1545,6 +1545,17 @@ static int verify_uptodate_sparse(const stru

[PATCH 2/6] unpack-trees: add a note about path invalidation

2018-06-05 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- unpack-trees.c | 11 +++ 1 file changed, 11 insertions(+) diff --git a/unpack-trees.c b/unpack-trees.c index 3a85a02a77..5d06aa9c98 100644 --- a/unpack-trees.c +++ b/unpack-trees.c @@ -1545,6 +1545,17 @@ static int verify_uptodate_sparse(const stru

Re: [PATCH] RelNotes: remove duplicate release note

2018-05-31 Thread Junio C Hamano
Elijah Newren writes: > In the 2.18 cycle, directory rename detection was merged, then reverted, > then reworked in such a way to fix another prominent bug in addition to > the original problem causing it to be reverted. When the reworked series > was merged, we ended up with two nearly duplicat

Re: [PATCH v2 2/2] note git-secur...@googlegroups.com in more places

2018-05-31 Thread Thomas Gummerer
On 05/30, brian m. carlson wrote: > On Wed, May 30, 2018 at 09:52:55PM +0100, Thomas Gummerer wrote: > > Add a mention of the security mailing list to the README, and to > > Documentation/SubmittingPatches.. 2caa7b8d27 ("git manpage: note > > git-secur...@googlegroups

[PATCH] RelNotes: remove duplicate release note

2018-05-30 Thread Elijah Newren
In the 2.18 cycle, directory rename detection was merged, then reverted, then reworked in such a way to fix another prominent bug in addition to the original problem causing it to be reverted. When the reworked series was merged, we ended up with two nearly duplicate release notes. Remove the sec

Re: [PATCH v2 2/2] note git-secur...@googlegroups.com in more places

2018-05-30 Thread brian m. carlson
On Wed, May 30, 2018 at 09:52:55PM +0100, Thomas Gummerer wrote: > Add a mention of the security mailing list to the README, and to > Documentation/SubmittingPatches.. 2caa7b8d27 ("git manpage: note > git-secur...@googlegroups.com", 2018-03-08) already added it to the

[PATCH v2 2/2] note git-secur...@googlegroups.com in more places

2018-05-30 Thread Thomas Gummerer
Add a mention of the security mailing list to the README, and to Documentation/SubmittingPatches.. 2caa7b8d27 ("git manpage: note git-secur...@googlegroups.com", 2018-03-08) already added it to the man page, but for developers either the README, or the documentation on how to

Re: [PATCH] README: note git-secur...@googlegroups.com

2018-05-27 Thread Jonathan Nieder
Thomas Gummerer wrote: > Add a mention of the security mailing list to the README. > 2caa7b8d27 ("git manpage: note git-secur...@googlegroups.com", > 2018-03-08) already added it to the man page, but I suspect that for > many developers, such as myself, the README would be t

[PATCH] README: note git-secur...@googlegroups.com

2018-05-27 Thread Thomas Gummerer
Add a mention of the security mailing list to the README. 2caa7b8d27 ("git manpage: note git-secur...@googlegroups.com", 2018-03-08) already added it to the man page, but I suspect that for many developers, such as myself, the README would be the first place to go looking for it. Us

[PATCH v3 12/15] show-branch: note about its object flags usage

2018-05-18 Thread Nguyễn Thái Ngọc Duy
This is another candidate for commit-slab. Keep Junio's observation in code so we can search it later on when somebody wants to improve the code. --- builtin/show-branch.c | 5 + object.h | 1 + 2 files changed, 6 insertions(+) diff --git a/builtin/show-branch.c b/builtin/show-br

[PATCH v3 6/7] doc: add note about shell quoting to revision.txt

2018-05-03 Thread Andreas Heiduk
/revisions.txt @@ -7,6 +7,10 @@ syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit. +NOTE: This document shows the "raw" syntax as seen by git. The shell +and other UIs might require additional

Re: [PATCH v2 6/6] doc: add note about shell quoting to revision.txt

2018-04-27 Thread Andreas Heiduk
Am 27.04.2018 um 19:36 schrieb Eric Sunshine: > On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: >> Signed-off-by: Andreas Heiduk >> Reviewed-by: Junio C Hamano >> --- >> diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt >> @@ -186,6 +190,8 @@ existing tag object. >> +

Re: [PATCH v2 6/6] doc: add note about shell quoting to revision.txt

2018-04-27 Thread Eric Sunshine
On Fri, Apr 27, 2018 at 1:04 PM, Andreas Heiduk wrote: > Signed-off-by: Andreas Heiduk > Reviewed-by: Junio C Hamano > --- > diff --git a/Documentation/revisions.txt b/Documentation/revisions.txt > @@ -186,6 +190,8 @@ existing tag object. > + Depending on the given text the shell's word splitti

[PATCH v2 6/6] doc: add note about shell quoting to revision.txt

2018-04-27 Thread Andreas Heiduk
/revisions.txt @@ -7,6 +7,10 @@ syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit. +NOTE: This document shows the "raw" syntax as seen by git. The shell +and other UIs might require additional

Re: [PATCH 6/6] doc: add note about shell quoting to revision.txt

2018-04-10 Thread Junio C Hamano
on/revisions.txt > +++ b/Documentation/revisions.txt > @@ -7,6 +7,10 @@ syntax. Here are various ways to spell object names. The > ones listed near the end of this list name trees and > blobs contained in a commit. > > +NOTE: This document shows the "raw" syntax as s

[PATCH 6/6] doc: add note about shell quoting to revision.txt

2018-04-10 Thread Andreas Heiduk
@@ syntax. Here are various ways to spell object names. The ones listed near the end of this list name trees and blobs contained in a commit. +NOTE: This document shows the "raw" syntax as seen by git. The shell +and other UIs might require additional quoting to protect special +char

Re: [PATCH] git manpage: note git-secur...@googlegroups.com

2018-03-08 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Add a mention of the security mailing list to the "Reporting Bugs" > section. There's a mention of this list at > https://git-scm.com/community but none in git.git itself. This is quite a sensible thing to do. > > The copy is pasted from the git-scm.com websit

[PATCH] git manpage: note git-secur...@googlegroups.com

2018-03-08 Thread Ævar Arnfjörð Bjarmason
Add a mention of the security mailing list to the "Reporting Bugs" section. There's a mention of this list at https://git-scm.com/community but none in git.git itself. The copy is pasted from the git-scm.com website. Let's use the same wording in both places. Signed-off-by: Ævar Arnfjörð Bjarmaso

[PATCH/RFC v3 05/12] pack-objects: note about in_pack_header_size

2018-03-08 Thread Nguyễn Thái Ngọc Duy
; /* note: spare bits available! */ unsigned type:TYPE_BITS; unsigned in_pack_type:TYPE_BITS; /* could be delta */ unsigned preferred_base:1; /* -- 2.16.2.873.g32ff258c87

[PATCH/RFC v2 5/9] pack-objects: note about in_pack_header_size

2018-03-02 Thread Nguyễn Thái Ngọc Duy
; /* note: spare bits available! */ unsigned type:TYPE_BITS; unsigned in_pack_type:TYPE_BITS; /* could be delta */ unsigned preferred_base:1; /* -- 2.16.1.435.g8f24da2e1a

[PATCH 05/11] pack-objects: note about in_pack_header_size

2018-03-01 Thread Nguyễn Thái Ngọc Duy
; /* note: spare bits available! */ unsigned type:TYPE_BITS; unsigned in_pack_type:TYPE_BITS; /* could be delta */ unsigned preferred_base:1; /* -- 2.16.1.435.g8f24da2e1a

[PATCH 10/11] t/README: add a note about don't saving stderr of compound commands

2018-02-23 Thread SZEDER Gábor
te with '-x' without needing a Bash version supporting BASH_XTRACEFD, remove the now outdated caution note about non-Bash shells from the description of the '-x' option. Signed-off-by: SZEDER Gábor --- t/README | 20 +--- 1 file changed, 17 insertions(+), 3

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >>> Will queue with the above typofix, together with the other one. I >>> am not sure if we want to say "Before 2.17", though. >> >> I'm just keeping in mind the user who later on upgrades git from say >> 2.14 to 2

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> Will queue with the above typofix, together with the other one. I >> am not sure if we want to say "Before 2.17", though. > > I'm just keeping in mind the user who later on upgrades git from say > 2.14 to 2.18 or something, and is able to find in the docs when/

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> +Before 2.17, the untracked cache had a bug where replacing a directory >> +with a symlink to another directory could cause it to incorrectly show >> +files tracked by git as untracked. See the "status: add a fa

Re: [PATCH 0/2] update-index doc: note new caveats in 2.17

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> When users upgrade to 2.17 they're going to have git yelling at them >> (as my users did) on existing checkouts, with no indication whatsoever >> that it's due to the UC or how to fix it. > > Wait. Are you sayi

Re: [PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > +Before 2.17, the untracked cache had a bug where replacing a directory > +with a symlink to another directory could cause it to incorrectly show > +files tracked by git as untracked. See the "status: add a failing test > +showing a core.untrackedCache bug" comm

Re: [PATCH 0/2] update-index doc: note new caveats in 2.17

2018-02-09 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > When users upgrade to 2.17 they're going to have git yelling at them > (as my users did) on existing checkouts, with no indication whatsoever > that it's due to the UC or how to fix it. Wait. Are you saying that the new warning is "warning" against a condition

[PATCH 1/2] update-index doc: note a fixed bug in the untracked cache

2018-02-09 Thread Ævar Arnfjörð Bjarmason
Document the bug tested for in my "status: add a failing test showing a core.untrackedCache bug" and fixed in Duy's "dir.c: fix missing dir invalidation in untracked code". Since this is very likely something others will encounter in the future on older versions, and it's not obvious how to fix it

[PATCH 0/2] update-index doc: note new caveats in 2.17

2018-02-09 Thread Ævar Arnfjörð Bjarmason
ilar ones when a newer iteration of the > feature introduces, no? Fair enough. I just wanted to make sure it had been seen. It wasn't obvious whether it had just been missed since there was no follow-up there or note in WC. We were disagreeing to the extent that some of this should be docum

[PATCH 2/2] update-index doc: note the caveat with "could not open..."

2018-02-09 Thread Ævar Arnfjörð Bjarmason
Note the caveat where 2.17 is stricter about index validation potentially causing "could not open directory" warnings when git is upgraded. See the preceding "dir.c: stop ignoring opendir() error in open_cached_dir()" change. This caused some mayhem when I upgraded git to

[PATCH 4/5] update-index doc: note a fixed bug in the untracked cache

2018-01-24 Thread Nguyễn Thái Ngọc Duy
From: Ævar Arnfjörð Bjarmason Document the bug tested for in my "status: add a failing test showing a core.untrackedCache bug" and fixed in Duy's "dir.c: fix missing dir invalidation in untracked code". Since this is very likely something others will encounter in the future on older versions, an

NOTE

2018-01-08 Thread Ahmed Zama
-- Greetings, Can you handle a transaction that involves the transfer of fund valued 15 million Euros into a foreign account. I will give you the full detailed information as soon as I hear from you. Send me the followings if you are willing and ready to work with me. 1)Full Names (2)Occupation (

[PATCH v2 4/5] update-index doc: note a fixed bug in the untracked cache

2018-01-03 Thread Ævar Arnfjörð Bjarmason
Document the bug tested for in my "status: add a failing test showing a core.untrackedCache bug" and fixed in Duy's "dir.c: fix missing dir invalidation in untracked code". Since this is very likely something others will encounter in the future on older versions, and it's not obvious how to fix it

Re: [PATCH 3/1] update-index doc: note a fixed bug in the untracked cache

2017-12-27 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Document the bug tested for in my "status: add a failing test showing > a core.untrackedCache bug" and fixed in Duy's "dir.c: fix missing dir > invalidation in untracked code". > > Since this is very likely something others will encounter in the > future on olde

[PATCH 3/1] update-index doc: note a fixed bug in the untracked cache

2017-12-27 Thread Ævar Arnfjörð Bjarmason
Document the bug tested for in my "status: add a failing test showing a core.untrackedCache bug" and fixed in Duy's "dir.c: fix missing dir invalidation in untracked code". Since this is very likely something others will encounter in the future on older versions, and it's not obvious how to fix it

A note from the maintainer

2017-11-28 Thread Junio C Hamano
and "next" usually will not be either. After a feature release is made from "master", however, "next" will be rebuilt from the tip of "master" using the topics that didn't make the cut in the feature release. A natural consequence of how "next&q

Re: [PATCH 3/3] Documentation: revisions: add note about 3dots usages as continuation indications

2017-11-05 Thread Junio C Hamano
r notation 'r1\...r2' is called symmetric difference > of 'r1' and 'r2' and is defined as > 'r1 r2 --not $(git merge-base --all r1 r2)'. > @@ -285,6 +285,15 @@ is a shorthand for 'HEAD..origin' and asks "What did the > origin d

[PATCH 3/3] Documentation: revisions: add note about 3dots usages as continuation indications

2017-11-05 Thread Ann T Ropea
as 'r1 r2 --not $(git merge-base --all r1 r2)'. @@ -285,6 +285,15 @@ is a shorthand for 'HEAD..origin' and asks "What did the origin do since I forked from them?" Note that '..' would mean 'HEAD..HEAD' which is an empty range that is both reach

Re: A note from the maintainer

2017-10-30 Thread Johannes Schindelin
ng quietly dropped, and it caused more than just minor frustration. Maybe mention this in your maintainer's note, to help stave off such problems? Ciao, Dscho

A note from the maintainer

2017-10-29 Thread Junio C Hamano
work. The two branches "master" and "maint" are never rewound, and "next" usually will not be either. After a feature release is made from "master", however, "next" will be rebuilt from the tip of "master" using the topics that didn

A note from the maintainer

2017-08-04 Thread Junio C Hamano
work. The two branches "master" and "maint" are never rewound, and "next" usually will not be either. After a feature release is made from "master", however, "next" will be rebuilt from the tip of "master" using the topics that didn

NOTE

2017-07-20 Thread Bong Phang
BCEAO BANK TOGO has agreed to wire USD$ 7,500.000.00,get in touch with me by my private email immediately: (myemailcham...@gmail.com)for more details

A note from the maintainer

2017-07-13 Thread Junio C Hamano
work. The two branches "master" and "maint" are never rewound, and "next" usually will not be either. After a feature release is made from "master", however, "next" will be rebuilt from the tip of "master" using the topics that didn

A note from the maintainer

2017-06-24 Thread Junio C Hamano
work. The two branches "master" and "maint" are never rewound, and "next" usually will not be either. After a feature release is made from "master", however, "next" will be rebuilt from the tip of "master" using the topics that didn

[PATCH v6 10/11] run-command: add note about forking and threading

2017-04-19 Thread Brandon Williams
has acquired a lock and didn't get around to releasing it before the fork. This leaves the lock in a locked state in the resulting process with no hope of it ever being released. Add a note describing this potential pitfall before the call to 'fork()' so people working in this section

[PATCH v5 10/11] run-command: add note about forking and threading

2017-04-18 Thread Brandon Williams
has acquired a lock and didn't get around to releasing it before the fork. This leaves the lock in a locked state in the resulting process with no hope of it ever being released. Add a note describing this potential pitfall before the call to 'fork()' so people working in this section

[PATCH v4 09/10] run-command: add note about forking and threading

2017-04-17 Thread Brandon Williams
has acquired a lock and didn't get around to releasing it before the fork. This leaves the lock in a locked state in the resulting process with no hope of it ever being released. Add a note describing this potential pitfall before the call to 'fork()' so people working in this section

[PATCH v3 09/10] run-command: add note about forking and threading

2017-04-14 Thread Brandon Williams
has acquired a lock and didn't get around to releasing it before the fork. This leaves the lock in a locked state in the resulting process with no hope of it ever being released. Add a note describing this potential pitfall before the call to 'fork()' so people working in this section

[PATCH v2 6/6] run-command: add note about forking and threading

2017-04-13 Thread Brandon Williams
has acquired a lock and didn't get around to releasing it before the fork. This leaves the lock in a locked state in the resulting process with no hope of it ever being released. Add a note describing this potential pitfall before the call to 'fork()' so people working in this section

Re: [PATCH 5/5] run-command: add note about forking and threading

2017-04-11 Thread Eric Wong
Brandon Williams wrote: > On 04/11, Eric Wong wrote: > > On the other hand, I believe we should make run-command > > vfork-compatible (and Brandon's series is a big (but incomplete) > > step in the (IMHO) right direction); as anything which is > > vfork-safe would also be safe in the presence of t

Re: [PATCH 5/5] run-command: add note about forking and threading

2017-04-11 Thread Brandon Williams
On 04/11, Eric Wong wrote: > Jonathan Nieder wrote: > > Why can't git use e.g. posix_spawn to avoid this? > > posix_spawn does not support chdir, and it seems we run non-git > commands so no using "git -C" for those. This is actually the biggest reason why I didn't go down that route from the st

Re: [PATCH 5/5] run-command: add note about forking and threading

2017-04-11 Thread Jonathan Nieder
Eric Wong wrote: > Jonathan Nieder wrote: >> Why can't git use e.g. posix_spawn to avoid this? > > posix_spawn does not support chdir, and it seems we run non-git > commands so no using "git -C" for those. On the other hand, a number of the non-git commands we run are in a shell. At the cost of

Re: [PATCH 5/5] run-command: add note about forking and threading

2017-04-10 Thread Eric Wong
Jonathan Nieder wrote: > Hi, > > Brandon Williams wrote: > > > --- a/run-command.c > > +++ b/run-command.c > > @@ -458,6 +458,14 @@ int start_command(struct child_process *cmd) > > argv_array_pushv(&argv, cmd->argv); > > } >

Re: [PATCH 5/5] run-command: add note about forking and threading

2017-04-10 Thread Jonathan Nieder
Hi, Brandon Williams wrote: > --- a/run-command.c > +++ b/run-command.c > @@ -458,6 +458,14 @@ int start_command(struct child_process *cmd) > argv_array_pushv(&argv, cmd->argv); > } > > + /* > + * NOTE: In order to prevent deadloc

[PATCH 5/5] run-command: add note about forking and threading

2017-04-10 Thread Brandon Williams
and.c @@ -458,6 +458,14 @@ int start_command(struct child_process *cmd) argv_array_pushv(&argv, cmd->argv); } + /* + * NOTE: In order to prevent deadlocking when using threads special +* care should be taken with the function calls made in

[PATCH v7 28/28] refs.h: add a note about sorting order of for_each_ref_*

2017-03-25 Thread Nguyễn Thái Ngọc Duy
Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.h | 4 ++-- t/t1405-main-ref-store.sh | 6 ++ t/t1406-submodule-ref-store.sh | 6 ++ 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/refs.h b/refs.h index 1a07f9d86f..49e97d7d5f 100644 --- a/refs.h +

A note from the maintainer

2017-03-24 Thread Junio C Hamano
work. The two branches "master" and "maint" are never rewound, and "next" usually will not be either. After a feature release is made from "master", however, "next" will be rebuilt from the tip of "master" using the topics that didn

A note from the maintainer

2017-03-20 Thread Junio C Hamano
work. The two branches "master" and "maint" are never rewound, and "next" usually will not be either. After a feature release is made from "master", however, "next" will be rebuilt from the tip of "master" using the topics that didn

  1   2   3   4   >