Re: [PATCH v2 17/17] fetch: make the --fetch-prune work with

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Eric Sunshine jotted: > On Thu, Feb 8, 2018 at 11:19 AM, Ævar Arnfjörð Bjarmason > wrote: >> fetch: make the --fetch-prune work with > > Do you mean s/--fetch-prune/--prune-tags/ ? Yes, sorry. Will fix. >> Make the new --prune-tags option work properly when git-fetch is >

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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 >> --- >> diff --git a/t/t5510-fetch.sh b/t/

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

2018-02-09 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 | 19 --- 1 file changed, 12 insertions(+), 7 deletions(-) diff --

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

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

2018-02-09 Thread Nguyễn Thái Ngọc Duy
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 comple

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

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

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

2018-02-09 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 a/contrib/completion/git-completion.bash b/contri

[PATCH v3 01/42] parse-options: support --git-completion-helper

2018-02-09 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 "$(git

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

2018-02-09 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 + 1 file changed,

[PATCH v3 09/42] completion: use __gitcomp_builtin in _git_checkout

2018-02-09 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 files changed, 13 ins

[PATCH v3 07/42] completion: use __gitcomp_builtin in _git_apply

2018-02-09 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 - 2007-09-1

[PATCH v3 10/42] completion: use __gitcomp_builtin in _git_cherry_pick

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

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

2018-02-09 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 b/builtin/clean.c index

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

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

[PATCH v3 08/42] completion: use __gitcomp_builtin in _git_branch

2018-02-09 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(-) diff --git a/built

[PATCH v3 15/42] completion: use __gitcomp_builtin in _git_describe

2018-02-09 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 6e17caf8d7..7a98f01067 100644

[PATCH v3 14/42] completion: use __gitcomp_builtin in _git_config

2018-02-09 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 changed, 1 insertion(+)

[PATCH v3 16/42] completion: use __gitcomp_builtin in _git_difftool

2018-02-09 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 goo

[PATCH v3 23/42] completion: use __gitcomp_builtin in _git_ls_files

2018-02-09 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 a/contrib/completion/git-completion.bash

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

2018-02-09 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 3c5eae0edf..7fc5c1625

[PATCH v3 21/42] completion: use __gitcomp_builtin in _git_help

2018-02-09 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 60d27253ee..08f024a0ba 100644 ---

[PATCH v3 20/42] completion: use __gitcomp_builtin in _git_grep

2018-02-09 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 - contrib/completion/git-completion.bash | 16 +--

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

2018-02-09 Thread Thomas Gummerer
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) > >> > + fprintf(stde

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

2018-02-09 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 b/contrib/completion/git-completion.bash index 08f024a0ba.

[PATCH v3 17/42] completion: use __gitcomp_builtin in _git_fetch

2018-02-09 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: Nguy

[PATCH v3 18/42] completion: use __gitcomp_builtin in _git_fsck

2018-02-09 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 b/contrib/completio

[PATCH v3 25/42] completion: use __gitcomp_builtin in _git_merge

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

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

2018-02-09 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 b88023a733..e3e308d282

[PATCH v3 33/42] remote: force completing --mirror= instead of --mirror

2018-02-09 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. Sign

[PATCH v3 36/42] completion: use __gitcomp_builtin in _git_revert

2018-02-09 Thread Nguyễn Thái Ngọc Duy
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 --- con

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

2018-02-09 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 6e0c7f5ac6..a818efe230 100644 --- a/b

[PATCH v3 32/42] completion: use __gitcomp_builtin in _git_remote

2018-02-09 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 index d8d9e8f0de..6e600

[PATCH v3 29/42] completion: use __gitcomp_builtin in _git_notes

2018-02-09 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 insertions(+), 8 dele

[PATCH v3 24/42] completion: use __gitcomp_builtin in _git_ls_remote

2018-02-09 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 a/builtin/ls-remote.c b/builtin/ls-rem

[PATCH v3 35/42] completion: use __gitcomp_builtin in _git_reset

2018-02-09 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 b/contrib/completion/git-compl

[PATCH v3 26/42] completion: use __gitcomp_builtin in _git_merge_base

2018-02-09 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 4f598820cd..b192a5c0a1 100

[PATCH v3 34/42] completion: use __gitcomp_builtin in _git_replace

2018-02-09 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 index 10078ae371..0c1d8

[PATCH v3 31/42] completion: use __gitcomp_builtin in _git_push

2018-02-09 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 changed, 2 insertions(+),

[PATCH v3 28/42] completion: use __gitcomp_builtin in _git_name_rev

2018-02-09 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 b/contrib/completion/git-

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

2018-02-09 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 30a51c5015..7d58969efb 10064

[PATCH v3 40/42] completion: use __gitcomp_builtin in _git_tag

2018-02-09 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 b/contrib/completion/git-completion.ba

[PATCH v3 41/42] completion: use __gitcomp_builtin in _git_worktree

2018-02-09 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 deletions(-) diff --git a

[PATCH v3 42/42] git-completion.bash: add GIT_COMPLETION_OPTIONS=all config

2018-02-09 Thread Nguyễn Thái Ngọc Duy
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 --- contrib/completion/git-completion.ba

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

2018-02-09 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 b/contrib/completion/git-completion.bash index

Re: [PATCH v2 1/3] worktree: improve message when creating a new worktree

2018-02-09 Thread Thomas Gummerer
On 02/07, Eric Sunshine wrote: > On Sun, Feb 4, 2018 at 9:12 PM, Duy Nguyen wrote: > > As a former translator, I'm not thrilled to see a sentence broken into > > two pieces like this. I'm not a Japanese translator, but I think this > > sentence is translated differently when the translator sees th

Issue: Git Gui: show ssh key don't show key type id_ed25519.pub

2018-02-09 Thread Fechter, Juergen
Hello, Maybe someone can fix this issue. Thanks Git Gui: show ssh key don't show key type id_ed25519.pub Setup . Which version of Git for Windows are you using? Is it 32-bit or 64-bit? $ git --version --build-options ** 2.16.1windows.2 ** . Which version of Windows are you running? Vista, 7, 8,

Re: [PATCH v2 1/3] worktree: improve message when creating a new worktree

2018-02-09 Thread Duy Nguyen
On Fri, Feb 9, 2018 at 6:27 PM, Thomas Gummerer wrote: > This would loose the information about the identifier of the worktree, > but from a coarse look at the man page it doesn't seem like we > advertise that widely > > ... > > So given that maybe it would even be better to hide the part about th

Re: [PATCH v3 14/14] commit-graph: build graph from starting commits

2018-02-09 Thread SZEDER Gábor
On Thu, Feb 8, 2018 at 9:37 PM, Derrick Stolee wrote: > Teach git-commit-graph to read commits from stdin when the > --stdin-commits flag is specified. Commits reachable from these > commits are added to the graph. This is a much faster way to construct > the graph than inspecting all packed objec

"git bisect run make" adequate to locate first unbuildable commit?

2018-02-09 Thread Robert P. J. Day
writing a short tutorial on "git bisect" and, all the details of special exit code 125 aside, if one wanted to locate the first unbuildable commit, would it be sufficient to just run? $ git bisect run make as i read it, make returns either 0, 1 or 2 so there doesn't appear to be any possib

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

2018-02-09 Thread lars . schneider
From: Lars Schneider Hi, Patches 1-4, 6 are preparation and helper functions. Patch 5,7 are the actual change. This series depends on Torsten's 8462ff43e4 (convert_to_git(): safe_crlf/checksafe becomes int conv_flags, 2018-01-13) which is already in next. Changes since v5: * added 'core.check

[PATCH v6 7/7] convert: add round trip check based on 'core.checkRoundtripEncoding'

2018-02-09 Thread lars . schneider
From: Lars Schneider UTF supports lossless conversion round tripping and conversions between UTF and other encodings are mostly round trip safe as Unicode aims to be a superset of all other character encodings. However, certain encodings (e.g. SHIFT-JIS) are known to have round trip issues [1].

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

2018-02-09 Thread lars . schneider
From: Lars Schneider If the endianness is not defined in the encoding name, then let's be strict and require a BOM to avoid any encoding confusion. The is_missing_required_utf_bom() function returns true if a required BOM is missing. The Unicode standard instructs to assume big-endian if there i

[PATCH v6 3/7] utf8: add function to detect prohibited UTF-16/32 BOM

2018-02-09 Thread lars . schneider
From: Lars Schneider Whenever a data stream is declared to be UTF-16BE, UTF-16LE, UTF-32BE or UTF-32LE a BOM must not be used [1]. The function returns true if this is the case. This function is used in a subsequent commit. [1] http://unicode.org/faq/utf_bom.html#bom10 Signed-off-by: Lars Schn

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

2018-02-09 Thread lars . schneider
From: Lars Schneider Git recognizes files encoded with ASCII or one of its supersets (e.g. UTF-8 or ISO-8859-1) as text files. All other encodings are usually interpreted as binary and consequently built-in Git text processing tools (e.g. 'git diff') as well as most Git web front ends do not visu

[PATCH v6 2/7] strbuf: add xstrdup_toupper()

2018-02-09 Thread lars . schneider
From: Lars Schneider Create a copy of an existing string and make all characters upper case. Similar xstrdup_tolower(). This function is used in a subsequent commit. Signed-off-by: Lars Schneider --- strbuf.c | 12 strbuf.h | 1 + 2 files changed, 13 insertions(+) diff --git a/

[PATCH v6 1/7] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

2018-02-09 Thread lars . schneider
From: Lars Schneider Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we allocate the buffer for the lower case string with xmallocz(). This already ensures a NUL at the end of the allocated buffer. Remove the unnecessary assignment. Signed-off-by: Lars Schneider --- strbu

[PATCH v6 6/7] convert: add tracing for 'working-tree-encoding' attribute

2018-02-09 Thread lars . schneider
From: Lars Schneider Add the GIT_TRACE_WORKING_TREE_ENCODING environment variable to enable tracing for content that is reencoded with the 'working-tree-encoding' attribute. This is useful to debug encoding issues. Signed-off-by: Lars Schneider --- convert.c| 25 +++

Re: "git bisect run make" adequate to locate first unbuildable commit?

2018-02-09 Thread Christian Couder
On Fri, Feb 9, 2018 at 2:20 PM, Robert P. J. Day wrote: > > writing a short tutorial on "git bisect" and, all the details of > special exit code 125 aside, if one wanted to locate the first > unbuildable commit, would it be sufficient to just run? > > $ git bisect run make > > as i read it,

Re: categorization, documentation and packaging of "git core" commands

2018-02-09 Thread Robert P. J. Day
On Wed, 7 Feb 2018, Todd Zullinger wrote: > Robert P. J. Day wrote: > > not to belabour this (and i'm sure it's *way* too late for that), > > but fedora has the following packaging scheme. first, there's a > > bunch of stuff in "git-core", which has no dependencies on any > > other git-related pa

Re: [PATCH v3 14/14] commit-graph: build graph from starting commits

2018-02-09 Thread Derrick Stolee
On 2/9/2018 8:02 AM, SZEDER Gábor wrote: On Thu, Feb 8, 2018 at 9:37 PM, Derrick Stolee wrote: Teach git-commit-graph to read commits from stdin when the --stdin-commits flag is specified. Commits reachable from these commits are added to the graph. This is a much faster way to construct the gr

Re: [PATCH v3 42/42] git-completion.bash: add GIT_COMPLETION_OPTIONS=all config

2018-02-09 Thread Ævar Arnfjörð Bjarmason
On Fri, Feb 09 2018, Nguyễn Thái Ngọc Duy jotted: > 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:

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

2018-02-09 Thread Jeff King
On Fri, Feb 09, 2018 at 03:42:34AM +0100, SZEDER Gábor wrote: > To check that a git command fails and to inspect its error message we > usually execute a command like this throughout our test suite: > > test_must_fail git command --option 2>output.err > > Note that this command doesn't limit t

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

2018-02-09 Thread Branko Majic
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 lo

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

2018-02-09 Thread Robert P. J. Day
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 starte

Dear friend,

2018-02-09 Thread Baari Abdul
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 transf

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

2018-02-09 Thread Johannes Schindelin
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: creat

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

2018-02-09 Thread Johannes Schindelin
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 executing 'git rev-parse --sq-qu

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

2018-02-09 Thread René Scharfe
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 we

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

2018-02-09 Thread Junio C Hamano
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 tests with translatable s

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

2018-02-09 Thread Junio C Hamano
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 error of the 'test_must_fail' helper function as well, >>> causing various

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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 E

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

2018-02-09 Thread Junio C Hamano
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 with no > further

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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: What's cooking in git.git (Jan 2018, #04; Wed, 31)

2018-02-09 Thread Junio C Hamano
Æ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 >> - dir.c: fix missing

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

2018-02-09 Thread Jeff King
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, please use > > bash

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

2018-02-09 Thread Junio C Hamano
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 options to be added on t

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

2018-02-09 Thread Jeff King
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 v2 01/17] fetch: don't redundantly NULL something calloc() gave us

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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. >> [...] >> Signed-off-by: Ævar Arn

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

2018-02-09 Thread Jonathan Tan
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 --git a/Documentation/CodingGuidelines b/Documentation/Codin

Re: Fetch-hooks

2018-02-09 Thread Leo Gaspard
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

2018-02-09 Thread Junio C Hamano
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 test_i18ngrep we see in t

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

2018-02-09 Thread Junio C Hamano
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? > utf8.c | 13 + > utf8.h | 16 +

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

2018-02-09 Thread Jeff King
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 ! "invalid gitfile fo

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

2018-02-09 Thread Jeff King
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" > > > [...] > > > > > > Signed-off-by: Jeff King

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

2018-02-09 Thread Robert P. J. Day
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 st

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

2018-02-09 Thread Junio C Hamano
"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 thought that "git bisect skip

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

2018-02-09 Thread Jonathan Tan
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 are any more c

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

2018-02-09 Thread Robert P. J. Day
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 you really "skipping" a

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

2018-02-09 Thread Lars Schneider
> 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 >> >> Signed-off-by: Lars Schneider >> >> utf

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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 the subsequent fetch.

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

2018-02-09 Thread Junio C Hamano
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: Fetch-hooks

2018-02-09 Thread Joey Hess
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&m=132491485901482&w=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 su

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

2018-02-09 Thread Jeff King
On Fri, Feb 09, 2018 at 09:05:00PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> diff --git a/t/t5510-fetch.sh b/t/t5510-fetch.sh > >> @@ -548,18 +548,52 @@ set_config_tristate () { > >> *) > >> git config "$1" "$2" > >> + key=$(echo $1 | sed -e 's/^remote\.origi

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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:// pat

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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. tb

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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() fun

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

2018-02-09 Thread Ævar Arnfjörð Bjarmason
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 av

  1   2   >