[PATCH v3 06/42] completion: use __gitcomp_builtin in _git_am

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= In-progress options like --continue will be part of --git-completion-helper then filtered out by _git_am() unless the

[PATCH v3 19/42] completion: use __gitcomp_builtin in _git_gc

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 v3 21/42] completion: use __gitcomp_builtin in _git_help

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 v3 20/42] completion: use __gitcomp_builtin in _git_grep

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 -

Re: [PATCH v2 3/3] worktree: teach "add" to check out existing branches

On 02/06, Duy Nguyen wrote: > On Tue, Feb 6, 2018 at 3:23 AM, Thomas Gummerer wrote: > > On 02/05, Duy Nguyen wrote: > >> On Sun, Feb 04, 2018 at 10:13:05PM +, Thomas Gummerer wrote: > >> > - if (opts->new_branch) > >> > + if (opts->checkout_existing_branch) > >> > +

[PATCH v3 22/42] completion: use __gitcomp_builtin in _git_init

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 v3 17/42] completion: use __gitcomp_builtin in _git_fetch

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 v3 16/42] completion: use __gitcomp_builtin in _git_difftool

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 v3 23/42] completion: use __gitcomp_builtin in _git_ls_files

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 v3 08/42] completion: use __gitcomp_builtin in _git_branch

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 v3 15/42] completion: use __gitcomp_builtin in _git_describe

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 v3 14/42] completion: use __gitcomp_builtin in _git_config

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 v3 18/42] completion: use __gitcomp_builtin in _git_fsck

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 v3 25/42] completion: use __gitcomp_builtin in _git_merge

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 v3 27/42] completion: use __gitcomp_builtin in _git_mv

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 v3 33/42] remote: force completing --mirror= instead of --mirror

"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 v3 36/42] completion: use __gitcomp_builtin in _git_revert

The new completable option is --gpg-sign In-progress options like --continue will be part of --git-completion-helper then filtered out by _git_revert() unless the operation is in progress. This helps keep marking of these operations in just one place. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH v3 37/42] completion: use __gitcomp_builtin in _git_rm

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 v3 32/42] completion: use __gitcomp_builtin in _git_remote

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 v3 29/42] completion: use __gitcomp_builtin in _git_notes

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 v3 24/42] completion: use __gitcomp_builtin in _git_ls_remote

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 v3 35/42] completion: use __gitcomp_builtin in _git_reset

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 v3 26/42] completion: use __gitcomp_builtin in _git_merge_base

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 v3 30/42] completion: use __gitcomp_builtin in _git_pull

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 v3 34/42] completion: use __gitcomp_builtin in _git_replace

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 v3 31/42] completion: use __gitcomp_builtin in _git_push

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

Re: [PATCH v2 16/17] fetch: add a --fetch-prune option and fetch.pruneTags config

On Fri, Feb 09 2018, Eric Sunshine jotted: > On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason > wrote: >> Add a --fetch-prune option to git-fetch, along with fetch.pruneTags >> config option. [...] >> >> Signed-off-by: Ævar Arnfjörð Bjarmason >> ---

[PATCH v3 02/42] parse-options: add OPT_xxx_F() variants

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 | 19 --- 1 file changed, 12 insertions(+), 7

[PATCH v3 03/42] parse-options: let OPT__FORCE take optional flags argument

--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 v3 00/42] Automate updating git-completion.bash a bit

v3 improves __gitcomp_builtin() function a bit to allows both adding extra options (to complement --git-completion-helper limitations) and removing options. v3 should also fix Mac OS breakage. The last change in 42/42 is a new configurable variable in git-completion.bash that allows you to

[PATCH v3 12/42] completion: use __gitcomp_builtin in _git_clone

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 v3 09/42] completion: use __gitcomp_builtin in _git_checkout

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 v3 07/42] completion: use __gitcomp_builtin in _git_apply

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 v3 10/42] completion: use __gitcomp_builtin in _git_cherry_pick

The new completable options are: --allow-empty --allow-empty-message --ff --gpg-sign --keep-redundant-commits --strategy-option In-progress options like --continue will be part of --git-completion-helper then filtered out by _git_cherry_pick() unless the operation is in progress. This helps keep

[PATCH v3 04/42] git-completion.bash: introduce __gitcomp_builtin

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. __gitcomp_builtin() allows callers to change its output a bit by adding some

[PATCH v3 05/42] completion: use __gitcomp_builtin in _git_add

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 v3 13/42] completion: use __gitcomp_builtin in _git_commit

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 v3 11/42] completion: use __gitcomp_builtin in _git_clean

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 v3 01/42] parse-options: support --git-completion-helper

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

[PATCH v3 39/42] completion: use __gitcomp_builtin in _git_status

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 v3 41/42] completion: use __gitcomp_builtin in _git_worktree

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 v3 42/42] git-completion.bash: add GIT_COMPLETION_OPTIONS=all config

By default, some option names (mostly --force, scripting related or for internal use) are not completable for various reasons. When GIT_COMPLETION_OPTIONS is set to all, all options (except hidden ones) are completable. Signed-off-by: Nguyễn Thái Ngọc Duy ---

[PATCH v3 38/42] completion: use __gitcomp_builtin in _git_show_branch

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 v3 40/42] completion: use __gitcomp_builtin in _git_tag

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

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

Hi, On Thu, 1 Feb 2018, Ævar Arnfjörð Bjarmason wrote: > On Thu, Feb 01 2018, Junio C. Hamano jotted: > > > * ab/wildmatch-tests (2018-01-30) 10 commits > > - wildmatch test: mark test as EXPENSIVE_ON_WINDOWS > > - test-lib: add an EXPENSIVE_ON_WINDOWS prerequisite > > - wildmatch test:

Re: [PATCH v2 01/17] fetch: don't redundantly NULL something calloc() gave us

On Fri, Feb 09 2018, Eric Sunshine jotted: > On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason > wrote: >> Stop redundantly NULL-ing the last element of the refs structure, >> which was retrieved via calloc(), and is thus guaranteed to be >> pre-NULL'd. >> [...] >>

Re: [PATCH] CodingGuidelines: mention "static" and "extern"

On Thu, 8 Feb 2018 18:14:06 -0500 Eric Sunshine wrote: > On Thu, Feb 8, 2018 at 4:38 PM, Jeff King wrote: > > Subject: [PATCH] CodingGuidelines: mention "static" and "extern" > > [...] > > > > Signed-off-by: Jeff King > > --- > > diff

Re: Fetch-hooks

On 02/08/2018 06:02 PM, Leo Gaspard wrote: > On 02/08/2018 04:30 PM, Joey Hess wrote: >> [...] > > Hmm, OK, so I guess I'll try to update the patch when I get some time to > delve into git's internals, as my use case (forbidding some fetches) > couldn't afaik be covered by a wrapper hook. Joey,

Re: [PATCH 1/1] Mark messages for translations

On Fri, Feb 09, 2018 at 11:15:06AM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > >> - if ! grep "Invalid gitfile format" .err > >> + if ! test_i18ngrep "invalid gitfile format" .err > > > > Shouldn't this rather be like so instead? > > > > if test_i18ngrep !

Re: totally confused as to what "git bisect skip" is supposed to do

"Robert P. J. Day" writes: > i'm confused ... why, after skipping a good chunk in the interval > [v4.13,v4.14], do i still have exactly 7300 revisions to bisect? what > am i so hopelessly misunderstanding here? Are you really "skipping" a chunk in the interval? I

Re: [PATCH 2/2] packfile: refactor hash search with fanout table

On Fri, 9 Feb 2018 19:03:48 +0100 René Scharfe wrote: > Going from unsigned to signed int means the patch breaks support for > more than 2G pack entries, which was put with 326bf39677 (Use uint32_t > for all packed object counts.) in 2007. Ah, good catch. I'll wait to see if there

Re: [PATCH 2/3] t: teach 'test_must_fail' to save the command's stderr to a file

On Fri, Feb 09, 2018 at 10:36:19AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > 2. The "-x" problems aren't specific to test_must_fail at all. They're > > a general issue with shell functions. > > > > I'm not entirely happy with saying "if you want to use -x,

totally confused as to what "git bisect skip" is supposed to do

all right, i'm sure i'm just being an idiot, but i always thought i knew what "git bisect skip" did and, now that i'm trying to put together a simple example, i'm utterly confused so here's a stripped down example. with linus kernel source code, start bisecting [v4.13,v4.14]: $ git bisect

Re: [PATCH v2 11/17] fetch tests: fetch as well as fetch []

On Fri, Feb 09 2018, Eric Sunshine jotted: > On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason > wrote: >> When a remote URL is supplied on the command-line the internals of the >> fetch are different, in particular the code in get_ref_map(). An >> earlier version of

Re: [PATCH 2/2] packfile: refactor hash search with fanout table

Am 02.02.2018 um 23:36 schrieb Jonathan Tan: > Subsequent patches will introduce file formats that make use of a fanout > array and a sorted table containing hashes, just like packfiles. > Refactor the hash search in packfile.c into its own function, so that > those patches can make use of it as

Re: [PATCH 1/1] Mark messages for translations

Alexander Shopov writes: > Small changes in messages to fit the style and typography of rest > Reuse already translated messages if possible > Do not translate messages aimed at developers of git > Fix unit tests depending on the original string > Use `test_i18ngrep` for

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

On Fri, Feb 09 2018, Johannes Schindelin jotted: > Hi, > > On Thu, 1 Feb 2018, Ævar Arnfjörð Bjarmason wrote: > >> On Thu, Feb 01 2018, Junio C. Hamano jotted: >> >> > * ab/wildmatch-tests (2018-01-30) 10 commits >> > - wildmatch test: mark test as EXPENSIVE_ON_WINDOWS >> > - test-lib: add an

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

On Thu, Feb 01 2018, Junio C. Hamano jotted: > * nd/fix-untracked-cache-invalidation (2018-01-24) 5 commits > - dir.c: stop ignoring opendir() error in open_cached_dir() > - update-index doc: note a fixed bug in the untracked cache > - dir.c: fix missing dir invalidation in untracked code >

Re: [PATCH 2/3] t: teach 'test_must_fail' to save the command's stderr to a file

Jeff King writes: > 2. The "-x" problems aren't specific to test_must_fail at all. They're > a general issue with shell functions. > > I'm not entirely happy with saying "if you want to use -x, please use > bash". But given that it actually solves the problems everywhere

Re: [PATCH 2/3] t: teach 'test_must_fail' to save the command's stderr to a file

On Fri, Feb 09, 2018 at 01:57:10PM -0500, Jeff King wrote: > Here's what it looks like as a patch. > > -- >8 -- > Subject: [PATCH] t: send verbose test-helper output to fd 4 That applies on 'master'. If we go this route, we'd want this on sg/test-i18ngrep, which is in 'next' right now: -- >8

Re: [PATCH 1/1] Mark messages for translations

Junio C Hamano writes: >> -if ! grep "Invalid gitfile format" .err >> +if ! test_i18ngrep "invalid gitfile format" .err > > Shouldn't this rather be like so instead? > > if test_i18ngrep ! "invalid gitfile format" .err > > Ditto for the other negated use of

Re: [PATCH v6 4/7] utf8: add function to detect a missing UTF-16/32 BOM

lars.schnei...@autodesk.com writes: > From: Lars Schneider > > If the endianness is not defined in the encoding name, then let's > ... > [3] https://encoding.spec.whatwg.org/#utf-16le > > Signed-off-by: Lars Schneider > > utf > --- Huh? >

Re: [PATCH v6 4/7] utf8: add function to detect a missing UTF-16/32 BOM

> On 09 Feb 2018, at 20:28, Junio C Hamano wrote: > > lars.schnei...@autodesk.com writes: > >> From: Lars Schneider >> >> If the endianness is not defined in the encoding name, then let's >> ... >> [3] https://encoding.spec.whatwg.org/#utf-16le >>

Re: [PATCH v6 0/7] convert: add support for different encodings

Documentation has core.checkRoundtripEncoding while t0028 and a comment in convert.c capitalize it differently. I suspect that it would be more reader-friendly to update the documentation to match.

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

Ævar Arnfjörð Bjarmason writes: > On Thu, Feb 01 2018, Junio C. Hamano jotted: > >> * nd/fix-untracked-cache-invalidation (2018-01-24) 5 commits >> - dir.c: stop ignoring opendir() error in open_cached_dir() >> - update-index doc: note a fixed bug in the untracked cache >> -

Re: totally confused as to what "git bisect skip" is supposed to do

On Fri, 9 Feb 2018, Junio C Hamano wrote: > "Robert P. J. Day" writes: > > > i'm confused ... why, after skipping a good chunk in the > > interval [v4.13,v4.14], do i still have exactly 7300 revisions to > > bisect? what am i so hopelessly misunderstanding here? > > Are

Re: [PATCH v3 04/42] git-completion.bash: introduce __gitcomp_builtin

Nguyễn Thái Ngọc Duy writes: > +# This function is equivalent to > +# > +#__gitcomp "$(git xxx --git-completion-helper) ..." > +# > +# except that the output is cached. Accept 1-3 arguments: > +# 1: the git command to execute, this is also the cache key > +# 2: extra

Re: [PATCH 3/3] t1404: use 'test_must_fail stderr='

SZEDER Gábor writes: > On Fri, Feb 9, 2018 at 4:16 AM, Eric Sunshine wrote: >> On Thu, Feb 8, 2018 at 9:42 PM, SZEDER Gábor wrote: >>> Instead of 'test_must_fail git cmd... 2>output.err', which redirects >>> the standard

Re: [PATCH] CodingGuidelines: mention "static" and "extern"

On Fri, Feb 09, 2018 at 11:07:38AM -0800, Jonathan Tan wrote: > On Thu, 8 Feb 2018 18:14:06 -0500 > Eric Sunshine wrote: > > > On Thu, Feb 8, 2018 at 4:38 PM, Jeff King wrote: > > > Subject: [PATCH] CodingGuidelines: mention "static" and "extern" > > >

should "git bisect skip" not visually reduce number of revisions left?

perhaps i'm misreading something, but i'm trying to put together a hands-on example on how to use "git bisect" with feature branches as explained here: https://blog.smart.ly/2015/02/03/git-bisect-debugging-with-feature-branches/ and i'm using the linux kernel source as the content, so i

Dear friend,

Dear friend, I Mr. Baari Abdul, Head of Operation at Bank of Africa. I want invite into a business overture which involves an amount of $ 22.3 million. At your acceptance, this amount will be transferred to your name as a foreign partner. I need your help to get this fund to be

[BUG] Integer overflow when supplying large context value to diff --unified

Hello, Git versions tested: 2.13.6, 2.1.4 When passing-in a large context value for the --unified option for git-diff, Git will produce an invalid-looking range information for hunks. For example, if running 'git diff --unified=10 HEAD^', the output will include (this is just a run against my

Re: [PATCH] rebase -p: fix incorrect commit message when calling `git merge`.

Hi, On Thu, 8 Feb 2018, gregory.herr...@oracle.com wrote: > From: Gregory Herrero > > Since commit dd6fb0053 ("rebase -p: fix quoting when calling `git > merge`"), commit message of the merge commit being rebased is passed to > the merge command using a subshell

Re: [PATCH v2 11/17] fetch tests: fetch as well as fetch []

Junio C Hamano writes: > Ævar Arnfjörð Bjarmason writes: > + key=$(echo $1 | sed -e 's/^remote\.origin/fetch/') >>> >>> Faster (thus more Windows-friendly) assuming that $1 always starts >>> with "remote.origin": >>> >>>

Re: [PATCH v2 11/17] fetch tests: fetch as well as fetch []

On Fri, Feb 9, 2018 at 3:27 PM, Jeff King wrote: > On Fri, Feb 09, 2018 at 09:05:00PM +0100, Ævar Arnfjörð Bjarmason wrote: >> >> + key=$(echo $1 | sed -e 's/^remote\.origin/fetch/') >> > >> > Faster (thus more Windows-friendly) assuming that $1 always starts >> >

[PATCH 0/2] fetch: add tweak-fetch hook

On 02/09/2018 09:20 PM, Joey Hess wrote:> Yes; my patches are under the same GPL-2 as the rest of git. Thanks! So here comes my patch series, heavily based on yours. There are some things to bear in mind while reviewing it: * This is my first real attempt at contributing to git, which means I

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

Æ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

Re: Fetch-hooks

On Fri, Feb 09 2018, Leo Gaspard jotted: > On 02/09/2018 11:04 PM, Ævar Arnfjörð Bjarmason wrote:>>> You could also > have some intermediate step between these two, where e.g. your refspec for "origin" is "+refs/heads/*:refs/remotes/origin-untrusted/*" instead of the default

Re: [PATCH 042/194] object-store: move alternates API to new alternates.h

"brian m. carlson" writes: >> +#include "strbuf.h" >> +#include "sha1-array.h" >> + >> +struct alternates { >> +struct alternate_object_database *list; >> +struct alternate_object_database **tail; >> +}; >> +#define ALTERNATES_INIT { NULL, NULL } > > I was

Re: Fetch-hooks

Leo Gaspard wrote: > I just wanted to check, you did not put the Signed-off-by line in > patches in https://marc.info/?l=git=132491485901482=2 > > Could you confirm that the patches you sent are “covered under an > appropriate open source license and I have the right under that license > to

Re: [PATCH v2 00/17] document & test fetch pruning & add fetch.pruneTags

On Thu, Feb 08 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> On Thu, Feb 08 2018, Ævar Arnfjörð Bjarmason jotted: >> >>> As noted in my 87h8quytmq@evledraar.gmail.com there was a bug I >>> noticed in v3 where it would segfault on some git-fetch

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

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

Re: Fetch-hooks

On 02/09/2018 11:04 PM, Ævar Arnfjörð Bjarmason wrote:>>> You could also have some intermediate step between these two, where >>> e.g. your refspec for "origin" is >>> "+refs/heads/*:refs/remotes/origin-untrusted/*" instead of the default >>> "+refs/heads/*:refs/remotes/origin/*", you fetch all

[RFC PATCH 0/3] Make fsck check other worktree HEADs

This patchset adds checking of other worktree HEADs to fsck. The reason I've marked this RFC is that I'm worried my incidental reliance on "worktrees/$WORKTREE/HEAD" resolving as a ref (in patch 3) might raise some flags for others. In particular, in [1] Peff said that this refname resolves

[RFC PATCH 1/3] fsck: Move fsck_head_link() to get_default_heads() to avoid some globals

This will make it easier to check the HEAD of other worktrees from fsck. Signed-off-by: Elijah Newren --- builtin/fsck.c | 27 --- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c index

[RFC PATCH 3/3] fsck: Check HEAD of other worktrees as well

This takes advantage of the fact that "worktrees/$WORKTREE/HEAD" will currently resolve as a ref, which may not be true in the future with different ref backends. I don't think it locks us in to supporting resolving other worktree HEADs with this syntax, as I view the user-visible error message

Re: Fetch-hooks

On 02/09/2018 11:30 PM, Jeff King wrote: > On Fri, Feb 09, 2018 at 11:04:17PM +0100, Ævar Arnfjörð Bjarmason wrote: >> One thing that's not discussed yet, and I know just enough about for it >> to tingle my spidey sense, but not enough to say for sure (CC'd Jeff & >> Brandon who know more) is that

[PATCH v5 09/17] fetch tests: double quote a variable for interpolation

If the $cmdline variable contains arguments with spaces they won't be interpolated correctly, since the body of the test is single quoted, and because test-lib.sh does its own eval(). This will be used in a subsequent commit to pass arguments that need to be quoted to git-fetch, i.e. a file://

[PATCH v5 00/17] document & test fetch pruning & add fetch.pruneTags

Here's a v5 (correct subject line this time!). Many thanks to Eric for a thorough review. I'll spare you the per-patch changelog. These are all minor commit message / doc / comment wording changes, with the exception of making a bit of the test code better, and adding a \n for grep portability.

[PATCH v5 08/17] fetch tests: test --prune and refspec interaction

Add a test for the interaction between explicitly provided refspecs and fetch.prune. There's no point in adding this boilerplate to every combination of unset/false/true, it's instructive and sufficient to show that no matter if the variable is unset, false or true the refspec on the command-line

[PATCH v5 03/17] fetch: stop accessing "remote" variable indirectly

Access the "remote" variable passed to the fetch_one() directly rather than through the gtransport wrapper struct constructed in this function for other purposes. This makes the code more readable, as it's now obvious that the remote struct doesn't somehow get munged by the prepare_transport()

[PATCH v5 04/17] remote: add a macro for "refs/tags/*:refs/tags/*"

Add a macro with the refspec string "refs/tags/*:refs/tags/*". There's been a pre-defined struct version of this since e0aaa29ff3 ("Have a constant extern refspec for "--tags"", 2008-04-17), but nothing that could be passed to e.g. add_fetch_refspec(). This will be used in subsequent commits to

[PATCH v5 10/17] fetch tests: expand case/esac for later change

Expand a compact case/esac statement for a later change that'll add more logic to the body of the "*" case. This is a whitespace-only change. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t5510-fetch.sh | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git

[PATCH v5 05/17] fetch tests: refactor in preparation for testing tag pruning

In a subsequent commit this function will learn to test for tag pruning, prepare for that by making space for more variables, and making it clear that "expected" here refers to branches. Signed-off-by: Ævar Arnfjörð Bjarmason --- t/t5510-fetch.sh | 9 ++--- 1 file changed,

[PATCH v5 02/17] fetch: trivially refactor assignment to ref_nr

Trivially refactor an assignment to make a subsequent patch smaller. The "ref_nr" variable is initialized to 0 earlier, just as "j" is, and "j" is only incremented in that loop, so this change isn't a logic error. This change simplifies a subsequent change, which will split the incrementing of

[PATCH v5 01/17] fetch: don't redundantly NULL something calloc() gave us

Stop redundantly NULL-ing the last element of the refs structure, which was retrieved via calloc(), and is thus guaranteed to be pre-NULL'd. This code dates back to b888d61c83 ("Make fetch a builtin", 2007-09-10), where wasn't any reason to do this back then either, it's just boilerplate left

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

Æ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

Re: [PATCH 2/2] fetch: add tweak-fetch hook

Leo Gaspard writes: > +tweak-fetch > +~~~ > + > +This hook is invoked by 'git fetch' (commonly called by 'git pull'), after > refs > +have been fetched from the remote repository. It is not executed, if nothing > was > +fetched. Need to tighten explanation of "nothing

[RFC PATCH 2/3] t1450-fsck: Add tests for HEAD of other worktrees

Signed-off-by: Elijah Newren --- t/t1450-fsck.sh | 27 +++ 1 file changed, 27 insertions(+) diff --git a/t/t1450-fsck.sh b/t/t1450-fsck.sh index cb4b66e29d..fa94c59458 100755 --- a/t/t1450-fsck.sh +++ b/t/t1450-fsck.sh @@ -102,6 +102,33 @@

Re: [PATCH 046/194] object-store: move replace_objects back to object-store

Stefan Beller writes: > @@ -32,7 +31,15 @@ struct object_store { >* Objects that should be substituted by other objects >* (see git-replace(1)). >*/ > - struct replace_objects replacements; > + struct replace_objects { > + /* > +

  1   2   >