Re: [PATCH 2/8] sequencer: introduce the `merge` command

2018-01-31 Thread Jacob Keller
On Wed, Jan 31, 2018 at 5:48 AM, Johannes Schindelin wrote: > Hi Jake & Phillip, > > On Mon, 29 Jan 2018, Johannes Schindelin wrote: > >> On Sat, 20 Jan 2018, Jacob Keller wrote: >> >> > On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood >> >

Re: [PATCH v2 00/10] rebase -i: offer to recreate merge commits

2018-01-31 Thread Jacob Keller
On Wed, Jan 31, 2018 at 5:29 AM, Johannes Schindelin wrote: > I think I may want to introduce a bigger change, still. I forgot who > exactly came up with the suggestion to use `merge -C > ` (I think it was Jake), and I reacted too forcefully in > rejecting it. > I

Assalam Alaikum

2018-01-31 Thread Eiman Yousef M A Al-muzafar
Assalam Alaikum, I am Eiman Yousef M A Al-muzafar, a Muslim woman from Qatar, I am contacting you regarding a relationship of trust and confidence for an inheritance. Please contact me on my private email for more details: eiman.y...@hotmail.com

Re: [PATCH v2 00/14] Serialized Git Commit Graph

2018-01-31 Thread Stefan Beller
>> Finally, I tried to clean up my incorrect style as I was recreating >> these commits. Feel free to be merciless in style feedback now that the >> architecture is more stable. > > ok, will do. I reviewed all patches and found no nits worth mentioning. The whole series has been reviewed by me.

Re: [PATCH 0/2] Add "git rebase --show-patch"

2018-01-31 Thread Tim Landscheidt
Junio C Hamano wrote: >> The pseudo ref certainly has an appeal. For people very familiar with >> Git's peculiarities such as FETCH_HEAD. Such as myself. >> For users, it is probably substantially worse an experience than having a >> cmdmode like --show-patch in the very

[PATCH v2 05/12] sha1_file: switch uses of SHA-1 to the_hash_algo

2018-01-31 Thread brian m. carlson
Switch various uses of explicit calls to SHA-1 into references to the_hash_algo for better abstraction. Convert some calls to use struct object_id. Signed-off-by: brian m. carlson --- sha1_file.c | 52 ++-- 1 file

[PATCH v2 10/12] csum-file: rename sha1file to hashfile

2018-01-31 Thread brian m. carlson
Rename struct sha1file to struct hashfile, along with all of its related functions. The transformation in this commit was made by global search-and-replace. --- builtin/index-pack.c | 20 +-- builtin/pack-objects.c | 52 +-

[PATCH v2 09/12] read-cache: abstract away uses of SHA-1

2018-01-31 Thread brian m. carlson
Convert various uses of direct calls to SHA-1 and 20- and 40-based constants to use the_hash_algo instead. Don't yet convert the on-disk data structures, which will be handled in a future commit. Adjust some comments so as not to refer explicitly to SHA-1. Signed-off-by: brian m. carlson

[PATCH v2 04/12] builtin/unpack-objects: switch uses of SHA-1 to the_hash_algo

2018-01-31 Thread brian m. carlson
Switch various uses of explicit calls to SHA-1 into references to the_hash_algo to better abstract away the various uses of it. Signed-off-by: brian m. carlson --- builtin/unpack-objects.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-)

[PATCH v2 01/12] hash: move SHA-1 macros to hash.h

2018-01-31 Thread brian m. carlson
Most of the other code dealing with SHA-1 and other hashes is located in hash.h, which is in turn loaded by cache.h. Move the SHA-1 macros to hash.h as well, so we can use them in additional hash-related items in the future. Signed-off-by: brian m. carlson ---

[PATCH v2 12/12] bulk-checkin: abstract SHA-1 usage

2018-01-31 Thread brian m. carlson
Convert uses of the direct SHA-1 functions to use the_hash_algo instead. Signed-off-by: brian m. carlson --- bulk-checkin.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/bulk-checkin.c b/bulk-checkin.c index 5f79ed6ea3..8bcd1c8665

[PATCH v2 08/12] pack-write: switch various SHA-1 values to abstract forms

2018-01-31 Thread brian m. carlson
Convert various uses of hardcoded 20- and 40-based numbers to use the_hash_algo, along with direct calls to SHA-1. Adjust the names of variables to refer to "hash" instead of "sha1". Signed-off-by: brian m. carlson --- pack-write.c | 49

[PATCH v2 11/12] csum-file: abstract uses of SHA-1

2018-01-31 Thread brian m. carlson
Convert several direct uses of SHA-1 to use the_hash_algo instead. Convert one use of the constant 20 as well. Signed-off-by: brian m. carlson --- csum-file.c | 10 +- csum-file.h | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git

[PATCH v2 06/12] fast-import: switch various uses of SHA-1 to the_hash_algo

2018-01-31 Thread brian m. carlson
Switch various uses of explicit calls to SHA-1 to use the_hash_algo. Convert various uses of 20 and the GIT_SHA1 constants as well. Signed-off-by: brian m. carlson --- fast-import.c | 42 ++ 1 file changed, 22 insertions(+),

[PATCH v2 02/12] hash: create union for hash context allocation

2018-01-31 Thread brian m. carlson
In various parts of our code, we want to allocate a structure representing the internal state of a hash algorithm. The original implementation of the hash algorithm abstraction assumed we would do that using heap allocations, and added a context size element to struct git_hash_algo. However,

[PATCH v2 00/12] object_id part 11 (the_hash_algo)

2018-01-31 Thread brian m. carlson
This series includes various changes to adopt the use of the_hash_algo for abstracting hash algorithms away. Changes from v1: * Fix comments referring to SHA-1. * Switch hash function wrappers to take git_hash_ctx *. * Use a const int variable for a constant value. * Wrap an overly long line.

[PATCH v2 07/12] pack-check: convert various uses of SHA-1 to abstract forms

2018-01-31 Thread brian m. carlson
Convert various explicit calls to use SHA-1 functions and constants to references to the_hash_algo. Make several strings more generic with respect to the hash algorithm used. Signed-off-by: brian m. carlson --- pack-check.c | 32 1

[PATCH v2 03/12] builtin/index-pack: improve hash function abstraction

2018-01-31 Thread brian m. carlson
Convert several uses of unsigned char [20] to struct object_id and convert various hard-coded constants and uses of SHA-1 functions to use the_hash_algo. Signed-off-by: brian m. carlson --- builtin/index-pack.c | 90

Re: [RFC PATCH 0/2] alternate hash test

2018-01-31 Thread brian m. carlson
On Tue, Jan 30, 2018 at 05:04:52PM -0800, Stefan Beller wrote: > Thanks for writing this, I chose a slightly different approach at > https://public-inbox.org/git/20170728171817.21458-2-sbel...@google.com/ > which might be quicker for local testing. I'm actually going to rework the patches to be

What's cooking in git.git (Jan 2018, #04; Wed, 31)

2018-01-31 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. Many new topics appeared and are

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

2018-01-31 Thread Duy Nguyen
On Thu, Feb 1, 2018 at 4:04 AM, Eric Sunshine wrote: > On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy > wrote: >> This option is designed to be used by git-completion.bash. For many >> simple cases, what we do in there is usually >> >>

Re: [PATCH] gitignore.txt: elaborate shell glob syntax

2018-01-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > `.gitignore` file). > > - - Otherwise, Git treats the pattern as a shell glob suitable > - for consumption by fnmatch(3) with the FNM_PATHNAME flag: > - wildcards in the pattern will not match a / in the pathname. > - For example,

Re: [PATCH v2 3/3] rebase: introduce and use pseudo-ref ORIG_COMMIT

2018-01-31 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The new command `git rebase --show-current-patch` is useful for seeing > the commit related to the current rebase state. Some however may find > the "git show" command behind it too limiting. You may want to > increase context lines, do a diff

Re: Git remote helper's fast export options

2018-01-31 Thread Hareesh Rajan
Hi, I use git remote helper to export/import repository content. Git internally uses fast-export command and it seems like the options to detect move and copy (-M/-C) are not being used. Logging this issue requesting a fix to the remote helper to generate rename and copy commands in the output

Re: [PATCH v2 1/3] am: add --show-current-patch

2018-01-31 Thread Junio C Hamano
Eric Sunshine writes: > On Wed, Jan 31, 2018 at 4:30 AM, Nguyễn Thái Ngọc Duy > wrote: >> Pointing the user to $GIT_DIR/rebase-apply may encourage them to mess >> around in there, which is not a good thing. With this, the user does >> not have to

Re: [PATCH v5 5/7] convert: add 'working-tree-encoding' attribute

2018-01-31 Thread Junio C Hamano
Lars Schneider writes: >> I am not sure why this is special cased and other codepaths have "if >> WRITE_OBJECT then die, otherwise error" checks, so no, I do not >> agree with your reasoning, at least not yet. > > The convert_to_git()/encode_to_git() machinery is used

Re: [PATCH v2 10/14] commit-graph: add core.commitgraph setting

2018-01-31 Thread Igor Djordjevic
Hi Derrick, On 30/01/2018 22:39, Derrick Stolee wrote: > > diff --git a/Documentation/config.txt b/Documentation/config.txt > index 0e25b2c92b..5b63559a2b 100644 > --- a/Documentation/config.txt > +++ b/Documentation/config.txt > @@ -898,6 +898,9 @@ core.notesRef:: > This setting defaults to

Re: [PATCH v2 14/27] connect: request remote refs using v2

2018-01-31 Thread Derrick Stolee
On 1/31/2018 3:10 PM, Eric Sunshine wrote: On Wed, Jan 31, 2018 at 10:22 AM, Derrick Stolee wrote: On 1/25/2018 6:58 PM, Brandon Williams wrote: +static int process_ref_v2(const char *line, struct ref ***list) +{ + int ret = 1; + int i = 0; nit: you set 'i'

Re: Segmentation fault in git cherry-pick

2018-01-31 Thread Elijah Newren
On Wed, Jan 31, 2018 at 1:43 PM, Ayke van Laethem wrote: > Hi all, > > I've found a segmentation fault in git. > > Here, fabsf is a branch that I'm trying to get the topmost commit from. > After the failed cherry-pick, the change is added to the local working > tree, but

Segmentation fault in git cherry-pick

2018-01-31 Thread Ayke van Laethem
Hi all, I've found a segmentation fault in git. Here, fabsf is a branch that I'm trying to get the topmost commit from. After the failed cherry-pick, the change is added to the local working tree, but the commit isn't applied and .git/index.lock still exists. Version: 2.11.0 (Debian stretch)

RE: Shawn Pearce has died

2018-01-31 Thread Randall S. Becker
On January 30, 2018 1:49 PM, Jeff King @vger.kernel.org; sc...@gasch.org > Subject: Re: Shawn Pearce has died > On Mon, Jan 29, 2018 at 11:15:55PM -0800, Chris DiBona wrote: > > That's a fantastic idea. When is the contrib summit and is it open to > > others? I could send someone ... > > It's

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

2018-01-31 Thread Eric Sunshine
On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy wrote: > This option is designed to be used by git-completion.bash. For many > simple cases, what we do in there is usually > > __gitcomp "lots of completion options" > > which has to be manually updated when a new

Re: [PATCH v2 13/41] completion: use __gitcomp_builtin in _git_commit

2018-01-31 Thread Eric Sunshine
On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy wrote: > The new comletable options are: s/comletable/completable/ > --branch > --gpg-sign > --long > --no-post-rewrite > --null > --porcelain > --status > > --allow-empty is no longer completable because it's a hidden

Re: [PATCH v2 01/41] parse-options: support --git-completion-helper

2018-01-31 Thread Eric Sunshine
On Wed, Jan 31, 2018 at 6:05 AM, Nguyễn Thái Ngọc Duy wrote: > This option is designed to be used by git-completion.bash. For many > simple cases, what we do in there is usually > > __gitcomp "lots of completion options" > > which has to be manually updated when a new

Re: [PATCH v2 14/27] connect: request remote refs using v2

2018-01-31 Thread Eric Sunshine
On Wed, Jan 31, 2018 at 10:22 AM, Derrick Stolee wrote: > On 1/25/2018 6:58 PM, Brandon Williams wrote: >> +static int process_ref_v2(const char *line, struct ref ***list) >> +{ >> + int ret = 1; >> + int i = 0; > > nit: you set 'i' here, but first use it in a for

Re: [PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

2018-01-31 Thread Lars Schneider
> On 31 Jan 2018, at 18:28, Torsten Bögershausen wrote: > > [] >>> That is a good one. >>> If you ever plan a re-roll (I don't at the moment) the *.proj extemsion >>> make much more sense in Documentation/gitattributes that *.tx >>> There no text files encoded in UTF-16 wich are

Re: [PATCH v5 5/7] convert: add 'working-tree-encoding' attribute

2018-01-31 Thread Lars Schneider
> On 30 Jan 2018, at 22:56, Junio C Hamano wrote: > > Lars Schneider writes: > >>> On 30 Jan 2018, at 21:05, Junio C Hamano wrote: >>> >>> tbo...@web.de writes: >>> + if ((conv_flags & CONV_WRITE_OBJECT) &&

Re: [PATCH v2 02/10] sequencer: introduce new commands to reset therevision

2018-01-31 Thread Phillip Wood
On 31/01/18 13:21, Johannes Schindelin wrote: > > Hi Stefan, > > On Tue, 30 Jan 2018, Stefan Beller wrote: > >> On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin >> wrote: >>> @@ -116,6 +118,13 @@ static GIT_PATH_FUNC(rebase_path_stopped_sha, >>>

Re: [PATCH 2/8] sequencer: introduce the `merge` command

2018-01-31 Thread Phillip Wood
On 31/01/18 13:48, Johannes Schindelin wrote: > Hi Jake & Phillip, > > On Mon, 29 Jan 2018, Johannes Schindelin wrote: > >> On Sat, 20 Jan 2018, Jacob Keller wrote: >> >>> On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood >>> wrote: On 18/01/18 15:35, Johannes

Re: Bug/comment

2018-01-31 Thread Kaartic Sivaraam
On Tuesday 30 January 2018 05:32 AM, Andrew Ardill wrote: > Hi Ilija, > > On 30 January 2018 at 10:21, Ilija Pecelj wrote: >> Though it might not be considered a bug 'per se' it is definitely wired. >> Namely, when you type 'yes' word and hit enter in git bash for widnows, the

Re: [PATCH/RFC v5 7/7] Careful with CRLF when using e.g. UTF-16 for working-tree-encoding

2018-01-31 Thread Torsten Bögershausen
[] > > That is a good one. > > If you ever plan a re-roll (I don't at the moment) the *.proj extemsion > > make much more sense in Documentation/gitattributes that *.tx > > There no text files encoded in UTF-16 wich are called xxx.txt, but those > > are non-ideal examples. *.proj makes good sense

Re: Location limits on development, staging and production environments

2018-01-31 Thread H
On 01/30/2018 03:48 PM, H wrote: > On 01/29/2018 10:02 PM, Bryan Turner wrote: >> On Mon, Jan 29, 2018 at 11:08 AM, H wrote: >>> I am a newcomer to git looking to set up a web development environment >>> where individual computers are used for development, the

Re: Some rough edges of core.fsmonitor

2018-01-31 Thread Ben Peart
On 1/30/2018 6:16 PM, Ævar Arnfjörð Bjarmason wrote: On Tue, Jan 30 2018, Ben Peart jotted: While some of these issues have been discussed in other threads, I thought I'd summarize my thoughts here. Thanks for this & your other reply. I'm going to get to testing some of Duy's patches

Re: [PATCH v2 00/27] protocol version 2

2018-01-31 Thread Derrick Stolee
Sorry for chiming in with mostly nitpicks so late since sending this version. Mostly, I tried to read it to see if I could understand the scope of the patch and how this code worked before. It looks very polished, so I the nits were the best I could do. On 1/25/2018 6:58 PM, Brandon Williams

Re: [PATCH v2 12/27] serve: introduce git-serve

2018-01-31 Thread Derrick Stolee
On 1/25/2018 6:58 PM, Brandon Williams wrote: Introduce git-serve, the base server for protocol version 2. Protocol version 2 is intended to be a replacement for Git's current wire protocol. The intention is that it will be a simpler, less wasteful protocol which can evolve over time.

Re: [PATCH v2 14/27] connect: request remote refs using v2

2018-01-31 Thread Derrick Stolee
On 1/25/2018 6:58 PM, Brandon Williams wrote: Teach the client to be able to request a remote's refs using protocol v2. This is done by having a client issue a 'ls-refs' request to a v2 server. Signed-off-by: Brandon Williams --- builtin/upload-pack.c | 10 ++--

Re: [PATCH v2 00/41] Automate updating git-completion.bash a bit

2018-01-31 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 31 2018, Nguyễn Thái Ngọc Duy jotted: > I posted a proof of concept a while back [1]. This is the full version. > > This series lets "git" binary help git-completion.bash to complete > -- so that when a new option is added, we don't have to update > git-completion.bash manually too

Re: [PATCH v2 10/27] protocol: introduce enum protocol_version value protocol_v2

2018-01-31 Thread Derrick Stolee
On 1/25/2018 6:58 PM, Brandon Williams wrote: Introduce protocol_v2, a new value for 'enum protocol_version'. Subsequent patches will fill in the implementation of protocol_v2. Signed-off-by: Brandon Williams --- builtin/fetch-pack.c | 3 +++ builtin/receive-pack.c | 6

Re: [PATCH v2 09/27] transport: store protocol version

2018-01-31 Thread Derrick Stolee
On 1/25/2018 6:58 PM, Brandon Williams wrote: + switch (data->version) { + case protocol_v1: + case protocol_v0: + refs = fetch_pack(, data->fd, data->conn, + refs_tmp ? refs_tmp : transport->remote_refs, +

Re: [PATCH v2 08/27] connect: discover protocol version outside of get_remote_heads

2018-01-31 Thread Derrick Stolee
On 1/25/2018 6:58 PM, Brandon Williams wrote: In order to prepare for the addition of protocol_v2 push the protocol version discovery outside of 'get_remote_heads()'. This will allow for keeping the logic for processing the reference advertisement for protocol_v1 and protocol_v0 separate from

[no subject]

2018-01-31 Thread Mario Ernesto Gerala
You have been awarded a donation of $350,000 USD please reply this email for more info : sungla...@gmail.com

Re: [PATCH v2 05/27] upload-pack: factor out processing lines

2018-01-31 Thread Derrick Stolee
On 1/26/2018 4:33 PM, Brandon Williams wrote: On 01/26, Stefan Beller wrote: On Thu, Jan 25, 2018 at 3:58 PM, Brandon Williams wrote: Factor out the logic for processing shallow, deepen, deepen_since, and deepen_not lines into their own functions to simplify the

Re: [PATCH 2/8] sequencer: introduce the `merge` command

2018-01-31 Thread Johannes Schindelin
Hi Jake & Phillip, On Mon, 29 Jan 2018, Johannes Schindelin wrote: > On Sat, 20 Jan 2018, Jacob Keller wrote: > > > On Fri, Jan 19, 2018 at 6:45 AM, Phillip Wood > > wrote: > > > On 18/01/18 15:35, Johannes Schindelin wrote: > > >> > > >> This patch adds the `merge`

Re: [PATCH v2 00/10] rebase -i: offer to recreate merge commits

2018-01-31 Thread Johannes Schindelin
Hi Junio, On Tue, 30 Jan 2018, Junio C Hamano wrote: > Johannes Schindelin writes: > > > Changes since v1: > > > > - reintroduced "sequencer: make refs generated by the `label` command > > worktree-local" (which was squashed into "sequencer: handle autosquash > >

Re: [PATCH v2 02/10] sequencer: introduce new commands to reset the revision

2018-01-31 Thread Johannes Schindelin
Hi Stefan, On Tue, 30 Jan 2018, Stefan Beller wrote: > On Mon, Jan 29, 2018 at 2:54 PM, Johannes Schindelin > wrote: > > @@ -116,6 +118,13 @@ static GIT_PATH_FUNC(rebase_path_stopped_sha, > > "rebase-merge/stopped-sha") > > static

Re: [PATCH v2 00/10] rebase -i: offer to recreate merge commits

2018-01-31 Thread Johannes Schindelin
Hi Stefan, On Tue, 30 Jan 2018, Stefan Beller wrote: > > - got rid of the universally-hated `bud` command > > Sorry if you got the impression for that. Maybe I was imprecise. You were not the most vocal voice. Anyway, `bud` is gone now. > > Stefan Beller (1): > > git-rebase--interactive:

Re: Bug Report: Subtrees and GPG Signed Commits

2018-01-31 Thread Stephen R Guglielmo
On Tue, Jan 30, 2018 at 6:37 PM, Avery Pennarun wrote: > On Tue, Jan 30, 2018 at 6:24 PM, Junio C Hamano wrote: >> Stefan Beller writes: >>> There has not been feedback for a while on this thread. >>> I think that is because subtrees

[PATCH v2 20/41] completion: use __gitcomp_builtin in _git_grep

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --after-context= --before-context= --color --context --exclude-standard --quiet --recurse-submodules --textconv Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/grep.c | 13 -

[PATCH v2 41/41] completion: use __gitcomp_builtin in _git_worktree

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options for "worktree add" are: --checkout --guess-remote --lock --track Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/worktree.c | 2 +- contrib/completion/git-completion.bash | 8 2 files changed, 5 insertions(+), 5

[PATCH v2 40/41] completion: use __gitcomp_builtin in _git_tag

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --color --format= --ignore-case Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 38/41] completion: use __gitcomp_builtin in _git_show_branch

2018-01-31 Thread Nguyễn Thái Ngọc Duy
No new completable options! Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 7 +-- 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index

[PATCH v2 39/41] completion: use __gitcomp_builtin in _git_status

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are --null and --show-stash. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 37/41] completion: use __gitcomp_builtin in _git_rm

2018-01-31 Thread Nguyễn Thái Ngọc Duy
No new completable options! Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/rm.c | 2 +- contrib/completion/git-completion.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/rm.c b/builtin/rm.c index

[PATCH v2 33/41] remote: force completing --mirror= instead of --mirror

2018-01-31 Thread Nguyễn Thái Ngọc Duy
"git remote --mirror" is a special case. Technically it is possible to specify --mirror without any argument. But we will get a "dangerous, deprecated!" warning in that case. This new parse-opt flag allows --git-completion-helper to always complete --mirror=, ignoring the dangerous use case.

[PATCH v2 36/41] completion: use __gitcomp_builtin in _git_revert

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable option is --gpg-sign Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/revert.c | 12 +--- contrib/completion/git-completion.bash | 5 + 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/builtin/revert.c

[PATCH v2 27/41] completion: use __gitcomp_builtin in _git_mv

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable option is --verbose. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/mv.c | 3 ++- contrib/completion/git-completion.bash | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/mv.c b/builtin/mv.c index

[PATCH v2 34/41] completion: use __gitcomp_builtin in _git_replace

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable option is --raw. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/replace.c | 3 ++- contrib/completion/git-completion.bash | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c

[PATCH v2 35/41] completion: use __gitcomp_builtin in _git_reset

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --intent-to-add --quiet --recurse-submodules Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 32/41] completion: use __gitcomp_builtin in _git_remote

2018-01-31 Thread Nguyễn Thái Ngọc Duy
No new completable options! Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash

[PATCH v2 23/41] completion: use __gitcomp_builtin in _git_ls_files

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --debug --empty-directory --eol --recurse-submodules --resolve-undo Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git

[PATCH v2 31/41] completion: use __gitcomp_builtin in _git_push

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --atomic --exec= --ipv4 --ipv6 --no-verify --porcelain --progress --push-option --signed Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/push.c | 2 +- contrib/completion/git-completion.bash | 7 +-- 2 files

[PATCH v2 22/41] completion: use __gitcomp_builtin in _git_init

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable option is --separate-git-dir=. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 29/41] completion: use __gitcomp_builtin in _git_notes

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --allow-empty (notes add and notes append) --for-rewrite= (notes copy) Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/notes.c| 4 ++-- contrib/completion/git-completion.bash | 14 -- 2 files changed, 10

[PATCH v2 30/41] completion: use __gitcomp_builtin in _git_pull

2018-01-31 Thread Nguyễn Thái Ngọc Duy
This is really nice. Since pull_options[] already declares all passthru options to 'merge' or 'fetch', a single git pull --git-completion-helper would provide all completable options (--no- variants are a separate issue). Dead shell variables can now be deleted. New completable options are:

[PATCH v2 25/41] completion: use __gitcomp_builtin in _git_merge

2018-01-31 Thread Nguyễn Thái Ngọc Duy
New completable options are: --allow-unrelated-histories --message= --overwrite-ignore --signoff --strategy-option= --summary --verify The variable $__git_merge_options remains because _git_pull() still needs it. It will soon be gone after _git_pull() is updated. Signed-off-by: Nguyễn Thái Ngọc

[PATCH v2 28/41] completion: use __gitcomp_builtin in _git_name_rev

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --always --exclude --name-only --refs --undefined Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 26/41] completion: use __gitcomp_builtin in _git_merge_base

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completion option is --all. Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index

[PATCH v2 24/41] completion: use __gitcomp_builtin in _git_ls_remote

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are --quiet and --upload-pack=. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/ls-remote.c| 5 +++-- contrib/completion/git-completion.bash | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git

[PATCH v2 17/41] completion: use __gitcomp_builtin in _git_fetch

2018-01-31 Thread Nguyễn Thái Ngọc Duy
New completable options: --deepen= --ipv4 --ipv6 --jobs= --multiple --progress --refmap= --shallow-exclude= --shallow-since= --update-head-ok Since _git_pull() needs fetch options too, $__git_fetch_options remains. This variable will soon be gone after _git_pull() is updated. Signed-off-by:

[PATCH v2 15/41] completion: use __gitcomp_builtin in _git_describe

2018-01-31 Thread Nguyễn Thái Ngọc Duy
No new completable options! Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 6 +- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index

[PATCH v2 13/41] completion: use __gitcomp_builtin in _git_commit

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new comletable options are: --branch --gpg-sign --long --no-post-rewrite --null --porcelain --status --allow-empty is no longer completable because it's a hidden option since 4741edd549 (Remove deprecated OPTION_BOOLEAN for parsing arguments - 2013-08-03) Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v2 14/41] completion: use __gitcomp_builtin in _git_config

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --blob= --bool --bool-or-int --edit --expiry-date --get-color --get-colorbool --get-urlmatch --includes --int --null --path --show-origin Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 9 + 1 file

[PATCH v2 16/41] completion: use __gitcomp_builtin in _git_difftool

2018-01-31 Thread Nguyễn Thái Ngọc Duy
Since we can't automatically extract diff options for completion yet, difftool will take all options from $__git_diff_common_options. This brings _a lot_ more completable options to difftool. --ignore-submodules is added to $__git_diff_common_options to avoid regression in difftool. But it's a

[PATCH v2 19/41] completion: use __gitcomp_builtin in _git_gc

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable option is --quiet. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/gc.c | 7 +-- contrib/completion/git-completion.bash | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/builtin/gc.c b/builtin/gc.c index

[PATCH v2 21/41] completion: use __gitcomp_builtin in _git_help

2018-01-31 Thread Nguyễn Thái Ngọc Duy
No new completable options! Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index

[PATCH v2 12/41] completion: use __gitcomp_builtin in _git_clone

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --config --dissociate --ipv4 --ipv6 --jobs= --progress --reference-if-able --separate-git-dir= --shallow-exclude --shallow-since= --verbose Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 21

[PATCH v2 18/41] completion: use __gitcomp_builtin in _git_fsck

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --connectivity-only --dangling --progress --reflogs Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/contrib/completion/git-completion.bash

[PATCH v2 11/41] completion: use __gitcomp_builtin in _git_clean

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are --exclude and --interactive Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/clean.c| 2 +- contrib/completion/git-completion.bash | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/builtin/clean.c

[PATCH v2 10/41] completion: use __gitcomp_builtin in _git_cherry_pick

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --allow-empty --allow-empty-message --ff --gpg-sign --keep-redundant-commits --strategy-option Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git

[PATCH v2 09/41] completion: use __gitcomp_builtin in _git_checkout

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --ignore-other-worktrees --progress Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/checkout.c | 7 +-- contrib/completion/git-completion.bash | 6 +- t/t9902-completion.sh | 12 +++- 3

[PATCH v2 08/41] completion: use __gitcomp_builtin in _git_branch

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --all --create-reflog --format= --ignore-case --quiet Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/branch.c | 2 +- contrib/completion/git-completion.bash | 8 ++-- 2 files changed, 3 insertions(+), 7 deletions(-)

[PATCH v2 02/41] parse-options: add OPT_xxx_F() variants

2018-01-31 Thread Nguyễn Thái Ngọc Duy
These macros allow us to add extra parse-options flag, the main one in my mind is PARSE_OPT_NOCOMPLETE to hide certain options from --git-completion-helper. Signed-off-by: Nguyễn Thái Ngọc Duy --- parse-options.h | 25 - 1 file changed, 16

[PATCH v2 03/41] parse-options: let OPT__FORCE take optional flags argument

2018-01-31 Thread Nguyễn Thái Ngọc Duy
--force option is most likely hidden from command line completion for safety reasons. This is done by adding an extra flag PARSE_OPT_NOCOMPLETE. Update OPT__FORCE() to accept additional flags. Actual flag change comes later depending on individual commands. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v2 00/41] Automate updating git-completion.bash a bit

2018-01-31 Thread Nguyễn Thái Ngọc Duy
I posted a proof of concept a while back [1]. This is the full version. This series lets "git" binary help git-completion.bash to complete -- so that when a new option is added, we don't have to update git-completion.bash manually too (people often forget it). As a side effect, about 180 more

[PATCH v2 06/41] completion: use __gitcomp_builtin in _git_am

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --directory --exclude --gpg-sign --include --keep-cr --keep-non-patch --message-id --no-keep-cr --patch-format --quiet --reject --resolvemsg= Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/am.c | 16

[PATCH v2 04/41] git-completion.bash: introduce __gitcomp_builtin

2018-01-31 Thread Nguyễn Thái Ngọc Duy
This is a __gitcomp wrapper that will execute git ... --git-completion-helper to get the list of completable options. The call will be made only once and cached to avoid performance issues, especially on Windows. Signed-off-by: Nguyễn Thái Ngọc Duy ---

[PATCH v2 05/41] completion: use __gitcomp_builtin in _git_add

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are --all --ignore-missing --ignore-removal --renormalize --verbose Signed-off-by: Nguyễn Thái Ngọc Duy --- contrib/completion/git-completion.bash | 5 + 1 file changed, 1 insertion(+), 4 deletions(-) diff --git

[PATCH v2 07/41] completion: use __gitcomp_builtin in _git_apply

2018-01-31 Thread Nguyễn Thái Ngọc Duy
The new completable options are: --3way --allow-overlap --build-fake-ancestor= --directory --exclude --include --index-info is no longer completable but that's because it's renamed to --build-fake-ancestor in 26b2800768 (apply: get rid of --index-info in favor of --build-fake-ancestor -

[PATCH v2 01/41] parse-options: support --git-completion-helper

2018-01-31 Thread Nguyễn Thái Ngọc Duy
This option is designed to be used by git-completion.bash. For many simple cases, what we do in there is usually __gitcomp "lots of completion options" which has to be manually updated when a new user-visible option is added. With support from parse-options, we can write __gitcomp

Re: Some rough edges of core.fsmonitor

2018-01-31 Thread Duy Nguyen
On Tue, Jan 30, 2018 at 8:21 AM, Ben Peart wrote: > > > On 1/28/2018 5:28 PM, Ævar Arnfjörð Bjarmason wrote: >> >> On Sun, Jan 28, 2018 at 9:44 PM, Johannes Schindelin >> wrote: >>> >>> Hi, >>> >>> On Sat, 27 Jan 2018, Ævar Arnfjörð Bjarmason

  1   2   >