Re: [PATCH 1/2] add setup step to filter-branch

On Mon, Jun 05, 2017 at 11:15:18AM +0900, Junio C Hamano wrote: > Andreas Heiduk writes: > > > A specific `--setup` step in `git filter-branch` makes it much easier > > to define the initial values of variables used in the real filters. > > Also sourcing/defining utility functions here instead o

Re: There are too many unreachable loose objects

On Thu, Jun 08, 2017 at 02:52:42PM +0200, Lars Schneider wrote: > >> It may be that it's the server side that needs to git-prune, and not > >> your local side? I'm not really certain but you're doing a push which > >> talks to a remote server. > > > > Yes, certainly the position in the output imp

Re: "There are too many unreachable loose objects" - why don't we run 'git prune' automatically?

On Thu, Jun 08, 2017 at 02:45:48PM +0200, Lars Schneider wrote: > I recently ran into "There are too many unreachable loose objects; run > 'git prune' to remove them." after a "Auto packing the repository in > background for optimum performance." message. > > This was introduced with a087cc9 "g

Re: Clarifying behavior of diff --stat

On Thu, Jun 08, 2017 at 07:10:00AM -0400, Samuel Lijin wrote: > I noticed when answering a StackOverflow question that apparently > --stat modifies the raw diff itself, instead of just adding a diffstat > to the output. In the linux kernel: Sort of. Using "--stat" implies "-r", since it only deal

Greetings!

Greetings! I have a proposal for you, this however is not mandatory nor will I in any manner compel you to honor against your will. I am Dr.Paul Benk a former executive director with Arab Tunisian Bank here in Tunis; I retired 1 year 7 months ago after putting in 28 years of meticulous service. Du

Re: [PATCH v2 32/32] ls-files: use repository object

On 06/08, Brandon Williams wrote: > Convert ls-files to use a repository struct and recurse submodules > inprocess. > > Signed-off-by: Brandon Williams > --- > builtin/ls-files.c | 198 > ++--- > git.c | 2 +- >

[PATCH v2 08/32] environment: place key repository state in the_repository

Migrate 'git_dir', 'git_common_dir', 'git_object_dir', 'git_index_file', 'git_graft_file', and 'namespace' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- cache.h | 1 - environment.c | 65 ++- path.c| 1

[PATCH v2 11/32] config: read config from a repository object

Teach the config machinery to read config information from a repository object. This involves storing a 'struct config_set' inside the repository object and adding a number of functions (repo_config*) to be able to query a repository's config. The current config API enables lazy-loading of the co

[PATCH v2 31/32] ls-files: factor out tag calculation

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 41 + 1 file changed, 25 insertions(+), 16 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 2849c9a65..6a0302a28 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -94

[PATCH v2 30/32] ls-files: factor out debug info into a function

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 23 ++- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 3061af2c5..2849c9a65 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -94,6 +94,19 @@ static

[PATCH v2 12/32] repository: add index_state to struct repo

Signed-off-by: Brandon Williams --- repository.c | 16 repository.h | 4 2 files changed, 20 insertions(+) diff --git a/repository.c b/repository.c index fd53d6bf7..21719d0a6 100644 --- a/repository.c +++ b/repository.c @@ -186,5 +186,21 @@ void repo_clear(struct repositor

[PATCH v2 26/32] ls-files: convert show_ru_info to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index d00ca7810..2838e2f75 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -293,14 +293,14 @@ static void show_ce_

[PATCH v2 17/32] convert: convert crlf_to_git to take an index

Signed-off-by: Brandon Williams --- convert.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index 574003023..ff3e72657 100644 --- a/convert.c +++ b/convert.c @@ -219,13 +219,13 @@ static void check_safe_crlf(const char *path, enum crlf_a

[PATCH v2 13/32] submodule-config: store the_submodule_cache in the_repository

Refactor how 'the_submodule_cache' is handled so that it can be stored inside of a repository object. Also migrate 'the_submodule_cache' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- repository.c | 6 + repository.h | 2 ++ submodule-config.c | 70 +

[PATCH v2 32/32] ls-files: use repository object

Convert ls-files to use a repository struct and recurse submodules inprocess. Signed-off-by: Brandon Williams --- builtin/ls-files.c | 198 ++--- git.c | 2 +- repository.c | 4 + repos

[PATCH v2 29/32] ls-files: convert show_files to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index e2d8fb7f6..3061af2c5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -329,7 +329,7 @@ sta

[PATCH v2 27/32] ls-files: convert ce_excluded to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 2838e2f75..289c6b2a5 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -322,10 +322,11 @@ static void show_ru

[PATCH v2 18/32] convert: convert convert_to_git_filter_fd to take an index

Signed-off-by: Brandon Williams --- convert.c | 5 +++-- convert.h | 3 ++- sha1_file.c | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/convert.c b/convert.c index ff3e72657..824b606fa 100644 --- a/convert.c +++ b/convert.c @@ -1109,7 +1109,8 @@ int convert_to_git(const

[PATCH v2 24/32] ls-files: convert show_killed_files to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 21 +++-- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index c37e9de11..f9578cf9f 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -121,7 +121,8 @@ static

[PATCH v2 28/32] ls-files: convert prune_cache to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index 289c6b2a5..e2d8fb7f6 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -381,30 +381,31 @@ static void

[PATCH v2 15/32] submodule: convert is_submodule_initialized to work on a repository

Convert 'is_submodule_initialized()' to take a repository object and while we're at it, lets rename the function to 'is_submodule_active()' and remove the NEEDSWORK comment. Signed-off-by: Brandon Williams --- builtin/grep.c | 3 ++- builtin/submodule--helper.c | 9 + subm

[PATCH v2 21/32] tree: convert read_tree to take an index parameter

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 2 +- tree.c | 28 ++-- tree.h | 3 ++- 3 files changed, 21 insertions(+), 12 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index f16ce0053..620487a77 100644 --- a/built

[PATCH v2 25/32] ls-files: convert show_other_files to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 7 --- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index f9578cf9f..d00ca7810 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -109,13 +109,14 @@ static void show_dir_

[PATCH v2 14/32] submodule: add repo_read_gitmodules

Teach the repo object to be able to populate the submodule_cache by reading the repository's gitmodules file. Signed-off-by: Brandon Williams --- submodule.c | 15 +++ submodule.h | 2 ++ 2 files changed, 17 insertions(+) diff --git a/submodule.c b/submodule.c index 95328de61..65f6

[PATCH v2 20/32] convert: convert renormalize_buffer to take an index

Signed-off-by: Brandon Williams --- convert.c | 6 -- convert.h | 3 ++- ll-merge.c| 2 +- merge-recursive.c | 4 ++-- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/convert.c b/convert.c index 5af6fdf3f..7d2a519da 100644 --- a/convert.c +++ b/convert.c

[PATCH v2 23/32] ls-files: convert write_eolinfo to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index a5ceeb052..c37e9de11 100644 --- a/builtin/ls-files.c +++ b/builtin/ls-files.c @@ -54,17 +54,16 @@ static const cha

[PATCH v2 09/32] environment: store worktree in the_repository

Migrate 'work_tree' to be stored in 'the_repository'. Signed-off-by: Brandon Williams --- environment.c | 9 - repository.c | 12 repository.h | 3 +++ 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/environment.c b/environment.c index fb52c0daf..e390a662

[PATCH v2 19/32] convert: convert convert_to_git to take an index

Signed-off-by: Brandon Williams --- apply.c | 2 +- builtin/blame.c | 2 +- combine-diff.c | 2 +- convert.c | 7 --- convert.h | 8 +--- diff.c | 6 +++--- dir.c | 2 +- sha1_file.c | 4 ++-- 8 files changed, 18 insertions(+), 15 deletions(-)

[PATCH v2 16/32] convert: convert get_cached_convert_stats_ascii to take an index

Signed-off-by: Brandon Williams --- builtin/ls-files.c | 3 ++- convert.c | 5 +++-- convert.h | 5 - 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c index c4357dc30..f16ce0053 100644 --- a/builtin/ls-files.c +++ b/built

[PATCH v2 22/32] ls-files: convert overlay_tree_on_cache to take an index

Signed-off-by: Brandon Williams --- builtin/commit.c | 3 ++- builtin/ls-files.c | 15 --- cache.h| 3 ++- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/builtin/commit.c b/builtin/commit.c index 805da4915..3d98084fb 100644 --- a/builtin/commit.c +++ b

[PATCH v2 10/32] setup: add comment indicating a hack

'GIT_TOPLEVEL_PREFIX_ENVIRONMENT' was added in (b58a68c1c setup: allow for prefix to be passed to git commands) to aid in fixing a bug where 'ls-files' and 'grep' were not able to properly recurse when called from within a subdirectory. Add a 'NEEDSWORK' comment indicating that this envvar should

[PATCH v2 07/32] repository: introduce the repository object

Introduce the repository object 'struct repository' which can be used to hold all state pertaining to a git repository. Some of the benefits of object-ifying a repository are: 1. Make the code base more readable and easier to reason about. 2. Allow for working on multiple repositories, speci

[PATCH v2 05/32] setup: don't perform lazy initialization of repository state

Under some circumstances (bogus GIT_DIR value or the discovered gitdir is '.git') 'setup_git_directory()' won't initialize key repository state. This leads to inconsistent state after running the setup code. To account for this inconsistent state, lazy initialization is done once a caller asks for

[PATCH v2 04/32] config: don't implicitly use gitdir

Commit 2185fde56 (config: handle conditional include when $GIT_DIR is not set up) added a 'git_dir' field to the config_options struct. Let's use this option field explicitly all the time instead of occasionally falling back to calling 'git_pathdup("config")' to get the path to the local repositor

[PATCH v2 00/32] repository object

When I sent out my RFC series there seemed to be a lot of interest but I haven't seen many people jump to review this series. Despite lack of review I wanted to get out another version which includes some changes to fix things that were bugging me about the series. Hopfully this v2 will prod some

[PATCH v2 03/32] config: don't include config.h by default

Stop including config.h by default in cache.h. Instead only include config.h in those files which require use of the config system. Signed-off-by: Brandon Williams --- advice.c | 1 + alias.c | 1 + apply.c | 1 + archive

[PATCH v2 06/32] environment: remove namespace_len variable

Use 'skip_prefix' instead of 'starts_with' so that we can drop the need to keep around 'namespace_len'. Signed-off-by: Brandon Williams --- environment.c | 9 - 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/environment.c b/environment.c index a73b08f5d..e035f6372 100644 -

[PATCH v2 01/32] config: create config.h

Move all config related declarations from cache.h to a new config.h header file. This makes cache.h smaller and allows for the opportunity in a following patch to only include config.h when needed. Signed-off-by: Brandon Williams --- cache.h | 190 +-

[PATCH v2 02/32] config: remove git_config_iter

Since there is no implementation of the function 'git_config_iter' lets stop exporting it and remove the prototype from config.h. Signed-off-by: Brandon Williams --- config.h | 1 - 1 file changed, 1 deletion(-) diff --git a/config.h b/config.h index f7f8b66c5..c70599bd5 100644 --- a/config.h +

Re: Re: git stash --include-untracked possible destructive behavior

Looks like that series was merged last week, fixing this issue. Marc, the fix will probably be in git 2.14. Joel

Re: [PATCH v2 0/8] Avoid problem where git_dir is set after alias expansion

On 06/08, Johannes Schindelin wrote: > > Changes since v1: > > - 1/8's commit message clarifies why the other early return in > discover_git_directory() does not need an equivalent resetting of > git_dir. > > - 3/8's commit message fixes awkward language (thanks, Brandon!). > > - the `workt

Re: git stash --include-untracked possible destructive behavior

On 06/08, Joel Teichroeb wrote: > It looks like it's an issue with git clean, as that's what stash > uses internally. You can try your same test, but replace git stash > with "git clean -df" and it will delete Data. Maybe clean should > check if there are any ignored files in an untracked directory

Re: git stash --include-untracked possible destructive behavior

It looks like it's an issue with git clean, as that's what stash uses internally. You can try your same test, but replace git stash with "git clean -df" and it will delete Data. Maybe clean should check if there are any ignored files in an untracked directory and only remove it if -x is specifi

[PATCH v2 6/8] t7006: demonstrate a problem with aliases in subdirectories

When expanding aliases, the git_dir is set during the alias expansion (by virtue of running setup_git_directory_gently()). This git_dir may be relative to the current working directory, and indeed often is simply ".git/". When the alias expands to a shell command, we restore the original working

[PATCH v2 7/8] alias_lookup(): optionally return top-level directory

When an alias expands to a shell command, and when we are inside a regular worktree's subdirectory (i.e. not inside the .git/ directory nor in a worktree initialized via `git worktree add`), and only then, the current working directory is switched to the top-level directory of the worktree before r

[PATCH v2 5/8] t1308: relax the test verifying that empty alias values are disallowed

We are about to change the way aliases are expanded, to use the early config machinery. This machinery reports errors in a slightly different manner than the cached config machinery. Let's not get hung up by the precise wording of the message mentioning the lin number. It is really sufficient to

[PATCH v2 8/8] Use the early config machinery to expand aliases

We already taught alias_lookup() to use the early config if the .git/ directory was not yet discovered, of course, however, since we called setup_git_directory_gently() before expanding the alias (if any), we only used the early config code path only if outside of any Git-managed directory. With t

[PATCH v2 4/8] read_early_config(): optionally return the worktree's top-level directory

So far, when we invoked the early config code path, we implicitly determined the top-level directory of the worktree while discovering the .git/ directory. And then we simply forgot that information. However, when we expand aliases, we very much need that information, as aliases expanding to shel

[PATCH v2 3/8] help: use early config when autocorrecting aliases

Git has this feature which suggests similar commands (including aliases) in case the user specified an unknown command. This feature currently relies on a side effect of the way we expand aliases right now: when a command is not a builtin, we use the regular config machinery (meaning: discovering

[PATCH v2 1/8] discover_git_directory(): avoid setting invalid git_dir

When discovering a .git/ directory, we take pains to ensure that its repository format version matches Git's expectations, and we return NULL otherwise. However, we still appended the invalid path to the strbuf passed as argument. Let's just reset the strbuf to the state before we appended the .g

[PATCH v2 0/8] Avoid problem where git_dir is set after alias expansion

When expanding an alias in a subdirectory, we setup the git_dir (gently), read the config, and then restore the "env" (e.g. the current working directory) so that the command specified by the alias can run correctly. What we failed to reset was the git_dir, meaning that in the most common case, it

[PATCH v2 2/8] config: report correct line number upon error

When get_value() parses a key/value pair, it is possible that the line number is decreased (because the \n has been consumed already) before the key/value pair is passed to the callback function, to allow for the correct line to be attributed in case of an error. However, when git_parse_source() a

Information!!

Dear Customer This is from western union Head office here in Benin Du Republic. We presently ready to send your first payment of $5000 this morning from our office out of your $1,500,000.00USD assigned to us by the United Nation to transfer to you as your compensation fund, so you are requested to

Re: [PATCH 03/31] config: don't implicitly use gitdir

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Thu, 8 Jun 2017, Brandon Williams wrote: > > > On 06/08, Johannes Schindelin wrote: > > > > > > On Wed, 31 May 2017, Brandon Williams wrote: > > > > > > > Commit 2185fde56 (config: handle conditional include when $GIT_DIR is > > > > not

Re: [PATCH 03/31] config: don't implicitly use gitdir

Hi Brandon, On Thu, 8 Jun 2017, Brandon Williams wrote: > On 06/08, Johannes Schindelin wrote: > > > > On Wed, 31 May 2017, Brandon Williams wrote: > > > > > Commit 2185fde56 (config: handle conditional include when $GIT_DIR is > > > not set up) added a 'git_dir' field to the config_options str

Re: [PATCH 4/9] read_early_config(): optionally return the worktree's top-level directory

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Thu, 8 Jun 2017, Brandon Williams wrote: > > > On 06/08, Johannes Schindelin wrote: > > > > > > On Thu, 8 Jun 2017, Brandon Williams wrote: > > > > > > > On 06/08, Johannes Schindelin wrote: > > > > > > > > > Back to the worktree_dir va

Re: [PATCH 4/9] read_early_config(): optionally return the worktree's top-level directory

Hi Brandon, On Thu, 8 Jun 2017, Brandon Williams wrote: > On 06/08, Johannes Schindelin wrote: > > > > On Thu, 8 Jun 2017, Brandon Williams wrote: > > > > > On 06/08, Johannes Schindelin wrote: > > > > > > > Back to the worktree_dir variable. > > > > > > > > I think part of the confusion here

[PATCH v1] dir: create function count_slashes

Similar functions exist in apply.c and builtin/show-branch.c for counting the number of slashes in a string. Also in the later patches, we introduce a third caller for the same. Hence, we unify it now by cleaning the existing functions and declaring a common function count_slashes in dir.h and impl

Re: [PATCH 03/31] config: don't implicitly use gitdir

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Wed, 31 May 2017, Brandon Williams wrote: > > > Commit 2185fde56 (config: handle conditional include when $GIT_DIR is > > not set up) added a 'git_dir' field to the config_options struct. Let's > > use this option field explicitly all the

Re: [PATCH 0/9] Avoid problem where git_dir is set after alias expansion

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Wed, 7 Jun 2017, Brandon Williams wrote: > > > Looks good, I don't have any major issues with the series, just some > > comments for clarity mostly. > > Thank you for the review! Of course! I've been poking around the setup logic so thi

Re: [PATCH 4/9] read_early_config(): optionally return the worktree's top-level directory

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Thu, 8 Jun 2017, Brandon Williams wrote: > > > On 06/08, Johannes Schindelin wrote: > > > > > Back to the worktree_dir variable. > > > > > > I think part of the confusion here is that it may be left alone even > > > when there is a workt

Re: [PATCH 4/9] read_early_config(): optionally return the worktree's top-level directory

Hi Brandon, On Thu, 8 Jun 2017, Brandon Williams wrote: > On 06/08, Johannes Schindelin wrote: > > > Back to the worktree_dir variable. > > > > I think part of the confusion here is that it may be left alone even > > when there is a worktree. For example, if we are already in the > > top-level

Re: [PATCH 8/9] Use the early config machinery to expand aliases

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Wed, 7 Jun 2017, Brandon Williams wrote: > > > I like seeing chunks of old code being deleted :D > > Me, too. In particular as hacky code as this one. It caused quite a couple > of gray hairs here. > > > On 06/07, Johannes Schindelin wro

Re: [PATCH 5/9] t1308: relax the test verifying that empty alias values are disallowed

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Wed, 7 Jun 2017, Brandon Williams wrote: > > > On 06/07, Johannes Schindelin wrote: > > > We are about to change the way aliases are expanded, to use the early > > > config machinery. > > > > > > This machinery reports errors in a slightl

Re: [PATCH 4/9] read_early_config(): optionally return the worktree's top-level directory

On 06/08, Johannes Schindelin wrote: > Hi Brandon, > > On Wed, 7 Jun 2017, Brandon Williams wrote: > > > On 06/07, Johannes Schindelin wrote: > > > @@ -1668,7 +1668,7 @@ void read_early_config(config_fn_t cb, void *data) > > >* notably, the current working directory is still the same after th

Re: There are too many unreachable loose objects

> On 16 Feb 2017, at 23:57, Jeff King wrote: > > On Thu, Feb 16, 2017 at 02:36:10PM -0800, Jacob Keller wrote: > >>> Whenever I run "git push --force(-with-lease)" I get a variation of >>> >>> Counting objects: 187, done. >>> Delta compression using up to 12 threads. >>> Compressing objects: 1

"There are too many unreachable loose objects" - why don't we run 'git prune' automatically?

Hi, I recently ran into "There are too many unreachable loose objects; run 'git prune' to remove them." after a "Auto packing the repository in background for optimum performance." message. This was introduced with a087cc9 "git-gc --auto: protect ourselves from accumulated cruft" but I don't u

git stash --include-untracked possible destructive behavior

One of our users has just discovered a destructive behavior of git stash --include-untracked: ignored files within non-ignored directories will not be stashed as untracked files (expected), but will still be removed from the working tree. The problem is reproducible by following command sequenc

Clarifying behavior of diff --stat

I noticed when answering a StackOverflow question that apparently --stat modifies the raw diff itself, instead of just adding a diffstat to the output. In the linux kernel: $ git diff-tree --raw -M 00a2430ff07d4e0e0e7e24e02fd8adede333b797 00a2430ff07d4e0e0e7e24e02fd8adede333b797 :04 04 f57

Re: [PATCH 03/31] config: don't implicitly use gitdir

Hi Brandon, On Wed, 31 May 2017, Brandon Williams wrote: > Commit 2185fde56 (config: handle conditional include when $GIT_DIR is > not set up) added a 'git_dir' field to the config_options struct. Let's > use this option field explicitly all the time instead of occasionally > falling back to cal

Re: [PATCH 0/9] Avoid problem where git_dir is set after alias expansion

Hi Brandon, On Wed, 7 Jun 2017, Brandon Williams wrote: > Looks good, I don't have any major issues with the series, just some > comments for clarity mostly. Thank you for the review! I will wait a couple of hours to see whether anybody else sees anything that needs to be changed, before sendin

Re: [PATCH 8/9] Use the early config machinery to expand aliases

Hi Brandon, On Wed, 7 Jun 2017, Brandon Williams wrote: > I like seeing chunks of old code being deleted :D Me, too. In particular as hacky code as this one. It caused quite a couple of gray hairs here. > On 06/07, Johannes Schindelin wrote: > > > @@ -245,36 +201,37 @@ static int handle_option

Re: [PATCH 5/9] t1308: relax the test verifying that empty alias values are disallowed

Hi Brandon, On Wed, 7 Jun 2017, Brandon Williams wrote: > On 06/07, Johannes Schindelin wrote: > > We are about to change the way aliases are expanded, to use the early > > config machinery. > > > > This machinery reports errors in a slightly different manner than the > > cached config machinery

Re: [PATCH 4/9] read_early_config(): optionally return the worktree's top-level directory

Hi Brandon, On Wed, 7 Jun 2017, Brandon Williams wrote: > On 06/07, Johannes Schindelin wrote: > > @@ -1668,7 +1668,7 @@ void read_early_config(config_fn_t cb, void *data) > > * notably, the current working directory is still the same after the > > * call). > > */ > > - else if (

Re: [PATCH 3/9] help: use early config when autocorrecting aliases

Hi Brandon, On Wed, 7 Jun 2017, Brandon Williams wrote: > On 06/07, Johannes Schindelin wrote: > > Git has this feature where suggests similar commands (including aliases) > > nit: s/where/which/ > > > in case that the user specified an unknown command. > > s/that// Oh my. Thank you so much!

Re: [PATCH 1/9] discover_git_directory(): avoid setting invalid git_dir

Hi Brandon, On Wed, 7 Jun 2017, Brandon Williams wrote: > On 06/07, Johannes Schindelin wrote: > > > diff --git a/setup.c b/setup.c > > index e3f7699a902..2435186e448 100644 > > --- a/setup.c > > +++ b/setup.c > > @@ -982,6 +982,7 @@ const char *discover_git_directory(struct strbuf > > *gitdir)

Re: send-email: Net::SSLeay failure

On Thu, Jun 8, 2017 at 5:53 AM, Ævar Arnfjörð Bjarmason wrote: > On Thu, Jun 8, 2017 at 11:06 AM, Samuel Lijin wrote: >> Sorry, I should've been clearer. Currently send-email fails for me >> with this error: >> >> SSLeay.c: loadable library and perl binaries are mismatched (got >> handshake key 0

Re: send-email: Net::SSLeay failure

On Thu, Jun 8, 2017 at 11:06 AM, Samuel Lijin wrote: > Sorry, I should've been clearer. Currently send-email fails for me > with this error: > > SSLeay.c: loadable library and perl binaries are mismatched (got > handshake key 0xdb80080, needed 0xde00080) > > I thought the undefined symbol stuff in

Re: send-email: Net::SSLeay failure

Sorry, I should've been clearer. Currently send-email fails for me with this error: SSLeay.c: loadable library and perl binaries are mismatched (got handshake key 0xdb80080, needed 0xde00080) I thought the undefined symbol stuff in the .so could have been part of the problem, but I guess not. Non

Re: [PATCH] docs: suggest "Helped-by" rather than "Thanks-to"

(Resending to everyone after only sending to Junio by mistake.) On Wed, Jun 07, 2017 at 08:44:08AM +0900, Junio C Hamano wrote: > Adam Dinwoodie writes: > > > On Mon, Jun 05, 2017 at 11:42:31AM -0700, Stefan Beller wrote: > >> So I was wondering if there is a command that shows all trailers? > >

Re: [PATCH] fast-import: Increase the default pack depth to 50

On Thu, Jun 08, 2017 at 04:11:52PM +0900, Mike Hommey wrote: > > It probably doesn't matter that much, though, as you'd really want to > > `repack -f` afterwards if you care about getting good deltas. And one > > base object every 50 versions is probably fine for keeping the initial > > pack manag

Re: [PATCH] fast-import: Increase the default pack depth to 50

On Thu, Jun 08, 2017 at 03:05:37AM -0400, Jeff King wrote: > On Thu, Jun 08, 2017 at 02:34:36PM +0900, Mike Hommey wrote: > > > In 618e613a70, 10 years ago, the default for pack depth used for > > git-pack-objects and git-repack was changed from 10 to 50, while > > leaving fast-import's default to

Re: [PATCH] fast-import: Increase the default pack depth to 50

On Thu, Jun 08, 2017 at 02:34:36PM +0900, Mike Hommey wrote: > In 618e613a70, 10 years ago, the default for pack depth used for > git-pack-objects and git-repack was changed from 10 to 50, while > leaving fast-import's default to 10. > > There doesn't seem to be a reason besides oversight for the