Kindly Confirm Receive

2018-09-04 Thread Richard Jeffery Esq
Good day, My name is Richard Jeffery I have a client, who died as a result of heart-related condition on the 10th of December, 2015. I have contacted you to assist in distributing the estate left behind by my client, who shares the same last name as yours. Would discuss more when I hear from

Re: [PATCH 7/9] tests: include detailed trace logs with --write-junit-xml upon failure

2018-09-04 Thread Luke Diamand
On 4 September 2018 at 12:09, Johannes Schindelin wrote: > Hi Eric, > > On Tue, 4 Sep 2018, Eric Sunshine wrote: > >> On Mon, Sep 3, 2018 at 5:10 PM Johannes Schindelin via GitGitGadget >> wrote: >> > So let's do something different in VSTS: let's run all the tests with >> > `--quiet` first, and

[PATCH] reopen_tempfile(): truncate opened file

2018-09-04 Thread Jeff King
On Tue, Sep 04, 2018 at 12:38:07PM -0400, Jeff King wrote: > > And just to be clear I'm looking forward to a patch from Jeff to fix > > this since he clearly put more thoughts on this than me. With commit.c > > being the only user of reopen_lock_file() I guess it's even ok to just > > stick

Re: [PATCH] mailinfo: support format=flowed

2018-09-04 Thread Jonathan Nieder
Jonathan Nieder wrote: > René Scharfe wrote: >> builtin/am.c|4 + >> mailinfo.c | 64 +- >> mailinfo.h |2 + >> t/t4256-am-format-flowed.sh | 19 + >> t/t4256/1/mailinfo.c| 1245 +++ >>

Re: [PATCH] mailinfo: support format=flowed

2018-09-04 Thread Jonathan Nieder
Hi, René Scharfe wrote: > builtin/am.c|4 + > mailinfo.c | 64 +- > mailinfo.h |2 + > t/t4256-am-format-flowed.sh | 19 + > t/t4256/1/mailinfo.c| 1245 +++ > t/t4256/1/mailinfo.c.orig | 1185

[PATCH 10/11] fetch: retry fetching submodules if sha1 were not fetched

2018-09-04 Thread Stefan Beller
Currently when git-fetch is asked to recurse into submodules, it dispatches a plain "git-fetch -C " (and some submodule related options such as prefix and recusing strategy, but) without any information of the remote or the tip that should be fetched. This works surprisingly well in some

[PATCH 11/11] builtin/fetch: check for submodule updates for non branch fetches

2018-09-04 Thread Stefan Beller
For Gerrit users that use submodules the invocation of fetch without a branch is their main use case. Signed-off-by: Stefan Beller --- builtin/fetch.c | 5 - t/t5526-fetch-submodules.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/builtin/fetch.c

[PATCH 05/11] submodule.c: fix indentation

2018-09-04 Thread Stefan Beller
The submodule subsystem is really bad at staying within 80 characters. Fix it while we are here. Signed-off-by: Stefan Beller --- submodule.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/submodule.c b/submodule.c index da2ed8696f5..8345d423fda 100644 ---

[PATCH 08/11] submodule.c: do not copy around submodule list

2018-09-04 Thread Stefan Beller
'calculate_changed_submodule_paths' uses a local list to compute the changed submodules, and then produces the result by copying appropriate items into the result list. Instead use the result list directly and prune items afterwards using string_list_remove_empty_items. As a side effect, we'll

[PATCH 00/11] fetch: make sure submodule oids are fetched

2018-09-04 Thread Stefan Beller
This is a resend of [1] and was rebased to origin/master and all review comments have been addressed. Thanks, Stefan [1] https://public-inbox.org/git/20180808221752.195419-1-sbel...@google.com/ Stefan Beller (11): string_list: print_string_list to use trace_printf string-list.h: add

[PATCH 09/11] submodule: fetch in submodules git directory instead of in worktree

2018-09-04 Thread Stefan Beller
This patch started as a refactoring to make 'get_next_submodule' more readable, but upon doing so, I realized that git-fetch actually doesn't need to be run in the worktree. So let's run it in the git dir instead. That should pave the way towards fetching submodules that are currently not checked

[PATCH 04/11] submodule.c: convert submodule_move_head new argument to object id

2018-09-04 Thread Stefan Beller
All callers use oid_to_hex to convert the desired oid to a string before calling submodule_move_head. Defer the conversion to the submodule_move_head as it will turn out to be useful in a bit. Signed-off-by: Stefan Beller --- entry.c| 6 +++--- submodule.c| 12 ++--

[PATCH 01/11] string_list: print_string_list to use trace_printf

2018-09-04 Thread Stefan Beller
It is a debugging aid, so it should print to the debugging channel. Signed-off-by: Stefan Beller --- string-list.c | 6 +++--- string-list.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/string-list.c b/string-list.c index 771c4550980..1ebbe1f56ea 100644 ---

[PATCH 07/11] submodule: move global changed_submodule_names into fetch submodule struct

2018-09-04 Thread Stefan Beller
The `changed_submodule_names` are only used for fetching, so let's make it part of the struct that is passed around for fetching submodules. Signed-off-by: Stefan Beller --- submodule.c | 42 +++--- 1 file changed, 23 insertions(+), 19 deletions(-) diff

[PATCH 06/11] submodule.c: sort changed_submodule_names before searching it

2018-09-04 Thread Stefan Beller
Instead of sorting it after we created an unsorted list, we could insert correctly into the list. As the unsorted append is in order of cache entry names, this is already sorted if names were equal to paths for submodules. As submodule names are often the same as their path, the input is sorted

[PATCH 02/11] string-list.h: add string_list_{pop, last} functions

2018-09-04 Thread Stefan Beller
A string list can be used as a stack, but should we? A later patch shows how useful this will be. In an earlier iteration of this patch it was suggested to return the last element or NULL (if empty), to enable a pattern of while ((item = string_list_pop()) work_on(item); But it turns

[PATCH 03/11] sha1-array: provide oid_array_filter

2018-09-04 Thread Stefan Beller
Helped-by: Junio C Hamano Signed-off-by: Stefan Beller --- sha1-array.c | 18 ++ sha1-array.h | 5 + 2 files changed, 23 insertions(+) diff --git a/sha1-array.c b/sha1-array.c index 265941fbf40..7eada4d1811 100644 --- a/sha1-array.c +++ b/sha1-array.c @@ -77,3 +77,21 @@

What's cooking in git.git (Sep 2018, #01; Tue, 4)

2018-09-04 Thread Junio C Hamano
Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. Git 2.19-rc2 is out. Hopefully

Re: [PATCH 1/8] trace2: create new combined trace facility

2018-09-04 Thread Junio C Hamano
Stefan Beller writes: >> The API defines both fixed-field and printf-style functions. >> >> The trace2 performance tracing includes thread-specific function >> nesting and timings. > > So this only adds the new API, and we need to merge the TRACE > into the TRACE2 later? If this is a rhetorical

Re: Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

2018-09-04 Thread Johannes Schindelin
Hi Junio, On Tue, 4 Sep 2018, Junio C Hamano wrote: > "Johannes Schindelin via GitGitGadget" > writes: > > > + test_must_fail git -c core.editor="grep -q ^pick" \ > > + rebase -ki --autosquash HEAD~4 && > > When merged to 'pu', this reveals that "git rebase" rewritten in C > knows

Re: [PATCH 1/8] trace2: create new combined trace facility

2018-09-04 Thread Stefan Beller
> Create GIT_TR2 trace-key to replace GIT_TRACE, GIT_TR2_PERFORMANCE to > replace GIT_TRACE_PERFORMANCE, and a new trace-key GIT_TR2_EVENT to > generate JSON data for telemetry purposes. Other structured formats > can easily be added later using this new existing model. So the idea is to use the

Re: [PATCH 2/2] commit-graph verify: add progress output

2018-09-04 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > For the reasons explained in the "commit-graph write: add progress > output" commit leading up to this one, emit progress on "commit-graph > verify". Since e0fd51e1d7 ("fsck: verify commit-graph", 2018-06-27) > "git fsck" has called this command if

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-04 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Before this change the "commit-graph write" command didn't report any Please describe the pre-patch state in present tense without "Before this change". > progress. On my machine this command takes more than 10 seconds to > write the graph for linux.git, and

[PATCH v2 12/18] builtin rebase: support `--exec`

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit adds support for the `--exec` option which takes a shell command-line as argument. This argument will be appended as an `exec ` command after each line in the todo list that creates a commit in the final history. commands. Note: while the shell script version of

[PATCH v2 17/18] builtin rebase: add support for custom merge strategies

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki When running a rebase in non-am mode, it uses the recursive merge to cherry-pick the commits, and the rebase command allows to configure the merge strategy to be used in this operation. This commit adds that support to the builtin rebase. Signed-off-by: Pratik Karki

[PATCH v2 16/18] builtin rebase: support `fork-point` option

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit adds support for `--fork-point` and `--no-fork-point`. This is converted as-is from `git-legacy-rebase.sh`. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 11 +++ 1 file changed, 11 insertions(+) diff --git

[PATCH v2 11/18] builtin rebase: support `--autostash` option

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki To support `--autostash` we introduce a function `apply_autostash()` just like in `git-legacy-rebase.sh`. Rather than refactoring and using the same function that exists in `sequencer.c`, we go a different route here, to avoid clashes with the sister GSoC project that turns

[PATCH v2 13/18] builtin rebase: support `--allow-empty-message` option

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit introduces the `--allow-empty-message` option to `builtin/rebase.c`. The motivation behind this option is: if there are empty messages (which is not allowed in Git by default, but can be imported from different version control systems), the rebase will fail. Using

[PATCH v2 18/18] builtin rebase: support --root

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This option allows to rebase entire histories up to, and including, the root commit. The conversion from the shell script is straight-forward, apart from the fact that we do not have to write an empty tree in C. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin

[PATCH v2 09/18] builtin rebase: support `--gpg-sign` option

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit introduces support for `--gpg-sign` option which is used to GPG-sign commits. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 27 +++ 1 file changed, 27 insertions(+) diff --git a/builtin/rebase.c

[PATCH v2 15/18] merge-base --fork-point: extract libified function

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki We need this functionality in the builtin rebase. Note: to make this function truly reusable, we have to switch the call get_merges_many_dirty() to get_merges_many() because we want the commit flags to be reset (otherwise, subsequent get_merge_bases() calls would obtain

[PATCH v2 10/18] builtin rebase: support `-C` and `--whitespace=`

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit converts more code from the shell script version to the builtin rebase. In this instance, we just have to be careful to keep support for passing multiple `--whitespace` options, as the shell script version does so, too. Signed-off-by: Pratik Karki Signed-off-by:

[PATCH v2 14/18] builtin rebase: support --rebase-merges[=[no-]rebase-cousins]

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki The mode to rebase non-linear branches is now supported by the builtin rebase, too. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 21 + 1 file changed, 21 insertions(+) diff --git a/builtin/rebase.c

[PATCH v2 08/18] builtin rebase: support `--autosquash`

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit adds support for the `--autosquash` option which is used to automatically squash the commits marked as `squash` or `fixup` in their messages. This is converted following `git-legacy-rebase.sh` closely. This option can also be configured via the Git config setting

[PATCH v2 07/18] builtin rebase: support `keep-empty` option

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki The `--keep-empty` option can be used to keep the commits that do not change anything from its parents in the result. While the scripted version uses `interactive_rebase=implied` to indicate that the rebase needs to use the `git-rebase--interactive` backend in non-interactive

[PATCH v2 06/18] builtin rebase: support `ignore-date` option

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit adds support for `--ignore-date` which is passed to `git am` to easily change the dates of the rebased commits. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 8 1 file changed, 8 insertions(+) diff --git

[PATCH v2 02/18] builtin rebase: support --signoff

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit adds support for `--signoff` which is used to add a `Signed-off-by` trailer to all the rebased commits. The actual handling is left to the rebase backends. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 17

[PATCH v2 05/18] builtin rebase: support `ignore-whitespace` option

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit adds support for the `--ignore-whitespace` option of the rebase command. This option is simply passed to the `--am` backend. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 6 ++ 1 file changed, 6 insertions(+) diff

[PATCH v2 03/18] builtin rebase: support --rerere-autoupdate

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki The `--rerere-autoupdate` option allows rerere to update the index with resolved conflicts. This commit follows closely the equivalent part of `git-legacy-rebase.sh`. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 25

[PATCH v2 04/18] builtin rebase: support --committer-date-is-author-date

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This option is simply handed down to `git am` by way of setting the `git_am_opt` variable that is handled by the `git-rebase--am` backend. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 10 ++ 1 file changed, 10 insertions(+)

[PATCH v2 00/18] builtin rebase options

2018-09-04 Thread Johannes Schindelin via GitGitGadget
This patch series completes the support for all rebase options in the builtin rebase, e.g. --signoff, rerere-autoupdate, etc. It is based on pk/rebase -in-c-3-acts. Changes since v1: * Added the forgotten -k short option for --keep-empty (and verified that no other short options were

[PATCH v2 01/18] builtin rebase: allow selecting the rebase "backend"

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki With this commit the builtin rebase supports selecting the "rebase backends" (or "type") `interactive`, `preserve-merges`, and `merge`. The `state_dir` was already handled according to the rebase type in a previous commit. Note that there is one quirk in the shell script:

[PATCH v2 07/11] builtin rebase: try to fast forward when possible

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki In this commit, we add support to fast forward. Note: we will need the merge base later, therefore the call to can_fast_forward() really needs to be the first one when testing whether we can skip the rebase entirely (otherwise, it would make more sense to skip the possibly

[PATCH v2 10/11] builtin rebase: only store fully-qualified refs in `options.head_name`

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki When running a rebase on a detached HEAD, we currently store the string "detached HEAD" in options.head_name. That is a faithful translation of the shell script version, and we still kind of need it for the purposes of the scripted backends. It is poor style for C, though,

[PATCH v2 04/11] builtin rebase: support --quiet

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit introduces a rebase option `--quiet`. While `--quiet` is commonly perceived as opposite to `--verbose`, this is not the case for the rebase command: both `--quiet` and `--verbose` default to `false` if neither `--quiet` nor `--verbose` is present. Despite the

[PATCH v2 02/11] builtin rebase: support `git rebase --onto A...B`

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit implements support for an --onto argument that is actually a "symmetric range" i.e. `...`. The equivalent shell script version of the code offers two different error messages for the cases where there is no merge base vs more than one merge base. Though it would

[PATCH v2 11/11] builtin rebase: support `git rebase `

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit adds support for `switch-to` which is used to switch to the target branch if needed. The equivalent codes found in shell script `git-legacy-rebase.sh` is converted to builtin `rebase.c`. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin ---

[PATCH v2 09/11] builtin rebase: start a new rebase only if none is in progress

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki To run a new rebase, there needs to be a check to assure that no other rebase is in progress. New rebase operation cannot start until an ongoing rebase operation completes or is terminated. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c

[PATCH v2 00/11] A minimal builtin rebase

2018-09-04 Thread Johannes Schindelin via GitGitGadget
This patch series provides the bare minimum to run more than just the trivial rebase (i.e. git rebase ): it implements the most common options such as --onto. It is based the latest iteration of pk/rebase-in-c. This is the second patch series that brings us more closer to a builtin "git rebase".

[PATCH v2 03/11] builtin rebase: handle the pre-rebase hook and --no-verify

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit converts the equivalent part of the shell script `git-legacy-rebase.sh` to run the pre-rebase hook (unless disabled), and to interrupt the rebase with error if the hook fails. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c |

[PATCH v2 01/11] builtin rebase: support --onto

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki The `--onto` option is important, as it allows to rebase a range of commits onto a different base commit (which gave the command its odd name: "rebase"). This commit introduces options parsing so that different options can be added in future commits. Note: As this commit

[PATCH v2 05/11] builtin rebase: support the `verbose` and `diffstat` options

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit introduces support for the `-v` and `--stat` options of rebase. The --stat option can also be configured via the Git config setting rebase.stat. To support this, we also add a custom rebase_config() function in this commit that will be used instead of (and falls

[PATCH v2 08/11] builtin rebase: support --force-rebase

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki In this commit, we add support to `--force-rebase` option. The equivalent part of the shell script found in `git-legacy-rebase.sh` is converted as faithfully as possible to C. The --force-rebase option ensures that the rebase does not simply fast-forward even if it could.

[PATCH v2 06/11] builtin rebase: require a clean worktree

2018-09-04 Thread Pratik Karki via GitGitGadget
From: Pratik Karki This commit reads the index of the repository for rebase and checks whether the repository is ready for rebase. Signed-off-by: Pratik Karki Signed-off-by: Johannes Schindelin --- builtin/rebase.c | 11 +++ 1 file changed, 11 insertions(+) diff --git

Re: [PATCH 1/2] commit-graph write: add progress output

2018-09-04 Thread Eric Sunshine
On Tue, Sep 4, 2018 at 4:27 PM Ævar Arnfjörð Bjarmason wrote: > With --stdin-packs we don't show any estimation of how much is left to > do. This is because we might be processing more than one pack. We > could be less lazy here and show progress, either detect by detecting s/detect// > that

Re: [PATCH v2 24/24] Rename functions to avoid breaking in-flight topics

2018-09-04 Thread Stefan Beller
On Tue, Sep 4, 2018 at 1:57 PM Junio C Hamano wrote: > > Nguyễn Thái Ngọc Duy writes: > > > The three functions init_revisions(), diff_setup() and rerere() are > > prefixed temporarily with repo_ to avoid breaking other topics which > > add new call sites for these functions. This is a

Re: [PATCH v2 24/24] Rename functions to avoid breaking in-flight topics

2018-09-04 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > The three functions init_revisions(), diff_setup() and rerere() are > prefixed temporarily with repo_ to avoid breaking other topics which > add new call sites for these functions. This is a temporary > measure. Once everything is merged, it will be reverted and

Re: [PATCH v2 22/24] revision.c: remove implicit dependency on the_index

2018-09-04 Thread Junio C Hamano
Stefan Beller writes: >> - init_revisions(revs, prefix); >> + init_revisions(revs, the_repository, prefix); > > Thanks for this patch! > > At first I wondered why we put the repository as the second argument, > but that comes down to personal preference, so I wanted to keep it

Re: [PATCH v7 7/7] list-objects-filter: implement filter tree:0

2018-09-04 Thread Junio C Hamano
Matthew DeVore writes: > @@ -50,6 +50,10 @@ static int gently_parse_list_objects_filter( > return 0; > } > > + } else if (!strcmp(arg, "tree:0")) { > + filter_options->choice = LOFC_TREE_NONE; > + return 0; > + This is not wrong

Re: [PATCH v7 6/7] list-objects-filter: use BUG rather than die

2018-09-04 Thread Junio C Hamano
Matthew DeVore writes: > In some cases in this file, BUG makes more sense than die. In such > cases, a we get there from a coding error rather than a user error. > > 'return' has been removed following some instances of BUG since BUG does > not return. > > Signed-off-by: Matthew DeVore > ---

Re: [PATCH v7 5/7] revision: mark non-user-given objects instead

2018-09-04 Thread Junio C Hamano
Matthew DeVore writes: > diff --git a/revision.h b/revision.h > index 51189..2d381e636 100644 > --- a/revision.h > +++ b/revision.h > @@ -8,7 +8,11 @@ > #include "diff.h" > #include "commit-slab-decl.h" > > -/* Remember to update object flag allocation in object.h */ > +/* Remember to

[PATCH 2/2] commit-graph verify: add progress output

2018-09-04 Thread Ævar Arnfjörð Bjarmason
For the reasons explained in the "commit-graph write: add progress output" commit leading up to this one, emit progress on "commit-graph verify". Since e0fd51e1d7 ("fsck: verify commit-graph", 2018-06-27) "git fsck" has called this command if core.commitGraph=true, but there's been no progress

[PATCH 1/2] commit-graph write: add progress output

2018-09-04 Thread Ævar Arnfjörð Bjarmason
Before this change the "commit-graph write" command didn't report any progress. On my machine this command takes more than 10 seconds to write the graph for linux.git, and around 1m30s on the 2015-04-03-1M-git.git[1] test repository, which is a test case for larger monorepos. Furthermore, since

[PATCH 0/2] commit-graph: add progress output

2018-09-04 Thread Ævar Arnfjörð Bjarmason
This series adds progress output to the commit-graph command, so that when it's called by "git gc" or "git fsck" we can see what's going on with it. Ævar Arnfjörð Bjarmason (2): commit-graph write: add progress output commit-graph verify: add progress output commit-graph.c | 44

Re: [PATCH v2 24/24] Rename functions to avoid breaking in-flight topics

2018-09-04 Thread Stefan Beller
On Mon, Sep 3, 2018 at 11:10 AM Nguyễn Thái Ngọc Duy wrote: > > The three functions init_revisions(), diff_setup() and rerere() are > prefixed temporarily with repo_ to avoid breaking other topics which > add new call sites for these functions. This is a temporary > measure. Once everything is

Re: [RFC PATCH] Allow aliases that include other aliases

2018-09-04 Thread Jeff King
On Tue, Sep 04, 2018 at 10:55:35AM -0700, Junio C Hamano wrote: > Tim Schumacher writes: > > > I submitted this as RFC because I'm not sure whether disallowing > > nested aliases was an intentional design choice. The done_alias > > check implies that disallowing is intended, but the direct > >

Re: [PATCH v2 22/24] revision.c: remove implicit dependency on the_index

2018-09-04 Thread Stefan Beller
On Mon, Sep 3, 2018 at 11:10 AM Nguyễn Thái Ngọc Duy wrote: > > "remove" is probably a strong word because the dependency is still > there, hidden behind the_repository. This patch is almost mechanical, > all call sites are updated to take the_repository, no exception. > > Signed-off-by: Nguyễn

Re: [PATCH 0/4] un-breaking pack-objects with bitmaps

2018-09-04 Thread Jeff King
On Tue, Sep 04, 2018 at 12:30:14PM -0700, Stefan Beller wrote: > > [1/4]: bitmap_has_sha1_in_uninteresting(): drop BUG check > > > > The actual fix. This should get merged to next ASAP (or the original > > topic just reverted). > > > > [2/4]: t5310: test delta reuse with bitmaps > > >

Re: [PATCH 2/4] t5310: test delta reuse with bitmaps

2018-09-04 Thread Jeff King
On Tue, Sep 04, 2018 at 12:05:58PM -0700, Stefan Beller wrote: > Yeah, maybe we need to ask for more tests in the 'real' test suite, and not > just in some special corner (such as t/perf/ or any of the environment > variable proposals nearby). > > I wonder if we can make use of git.git in the

Re: [PATCH 12/21] patch-ids.c: remove implicit dependency on the_index

2018-09-04 Thread Stefan Beller
On Mon, Sep 3, 2018 at 11:03 AM Duy Nguyen wrote: > > On Mon, Aug 27, 2018 at 9:13 PM Stefan Beller wrote: > > > > > -int init_patch_ids(struct patch_ids *ids) > > > +int init_patch_ids(struct patch_ids *ids, struct repository *repo) > > > { > > > memset(ids, 0, sizeof(*ids)); > > > -

Re: [PATCH 2/2] rebase -i: be careful to wrap up fixup/squash chains

2018-09-04 Thread Johannes Schindelin
Hi Junio, On Tue, 4 Sep 2018, Junio C Hamano wrote: > > diff --git a/sequencer.c b/sequencer.c > > index 84bf598c3e..ac5c805c14 100644 > > --- a/sequencer.c > > +++ b/sequencer.c > > @@ -3578,9 +3578,20 @@ static int commit_staged_changes(struct replay_opts > > *opts, > > * the

Re: [PATCH] i18n: fix dangling dot in die() messages

2018-09-04 Thread Junio C Hamano
Jean-Noël Avila writes: > On 04/09/2018, Ævar Arnfjörð Bjarmason wrote:On Tue, Sep 4, 2018 at 4:59 > PM Jean-Noel Avila wrote: >> Your commit message says "dangling dot"... > > The dot is dangling on its own line. I don't really catch why this would > be needed. > >> >>> diff --git

Re: [PATCH 2/4] t5310: test delta reuse with bitmaps

2018-09-04 Thread Junio C Hamano
Stefan Beller writes: > From some offline discussion, maybe we want to adapt a philosophy of > > Each patch needs to add a test, that fails when the patch > is not applied, but succeeds when it is applied. This shows > that _some_ code in the patch is exercised at least. > > (and

Re: [PATCH v4 00/12] Hash-independent tests (part 3)

2018-09-04 Thread Junio C Hamano
Duy Nguyen writes: > On Tue, Sep 4, 2018 at 1:26 AM brian m. carlson > wrote: >> >> This is the next in the series of improvements to make tests >> hash-independent. > > If it helps, I looked over the series and didn't find anything questionable. Thanks. I'll tick the message I am resopnding

Re: [PATCH] i18n: fix mistakes in translated strings

2018-09-04 Thread Junio C Hamano
Jiang Xin writes: > Jean-Noël Avila 于2018年8月24日周五 上午5:02写道: >> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c >> index 2bcc70fdfe..b56028ba9d 100644 >> --- a/builtin/submodule--helper.c >> +++ b/builtin/submodule--helper.c >> @@ -542,7 +542,7 @@ static void

Re: [PATCH v6] Implement --first-parent for git rev-list --bisect

2018-09-04 Thread Junio C Hamano
Duy Nguyen writes: > Hmm.. no? the commit-slab stores the pointer to the weight, not the > weight itself, so we still have the ability to check the third case, I > think. Good, thanks.

Re: [PATCH v2 1/1] read-cache.c: optimize reading index format v4

2018-09-04 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > Index format v4 requires some more computation to assemble a path > based on a previous one. The current code is not very efficient > because > > - it doubles memory copy, we assemble the final path in a temporary >first before putting it back to a

Re: [PATCH 0/4] un-breaking pack-objects with bitmaps

2018-09-04 Thread Stefan Beller
> [1/4]: bitmap_has_sha1_in_uninteresting(): drop BUG check > > The actual fix. This should get merged to next ASAP (or the original > topic just reverted). > > [2/4]: t5310: test delta reuse with bitmaps > > I did this separately to give us flexibility to squash or merge >

hi

2018-09-04 Thread Andre
Hello Dear,

Re*: [PATCH 1/2] rebase -i --autosquash: demonstrate a problem skipping the last squash

2018-09-04 Thread Junio C Hamano
"Johannes Schindelin via GitGitGadget" writes: > + test_must_fail git -c core.editor="grep -q ^pick" \ > + rebase -ki --autosquash HEAD~4 && When merged to 'pu', this reveals that "git rebase" rewritten in C knows "--keep-empty" but not "-k". I did a quick eyeballing between

Re: [PATCH 2/4] t5310: test delta reuse with bitmaps

2018-09-04 Thread Stefan Beller
On Sat, Sep 1, 2018 at 1:03 AM Jeff King wrote: > > On Sat, Sep 01, 2018 at 03:48:13AM -0400, Jeff King wrote: > > > Commit 6a1e32d532 (pack-objects: reuse on-disk deltas for > > thin "have" objects, 2018-08-21) taught pack-objects a new > > optimization trick. Since this wasn't meant to change >

Re: [PATCH v2 1/1] read-cache.c: optimize reading index format v4

2018-09-04 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > +static struct cache_entry *create_from_disk(struct index_state *istate, > struct ondisk_cache_entry *ondisk, > unsigned long *ent_size, > -

Re: [PATCH] diff: fix --color-moved-ws=allow-indentation-change

2018-09-04 Thread Phillip Wood
Hi Stefan On 04/09/2018 19:08, Stefan Beller wrote: On Tue, Sep 4, 2018 at 6:53 AM Phillip Wood wrote: From: Phillip Wood If there is more than one potential moved block and the longest block is not the first element of the array of potential blocks then the block is cut short. With

Re: [PATCH v7 0/7] filter: support for excluding all trees and blobs

2018-09-04 Thread Stefan Beller
On Tue, Sep 4, 2018 at 11:06 AM Matthew DeVore wrote: > > I made the following changes since v6 of the patchset: > - (suggested by Duy Nguyen) add a new commit which replaces uses of die() > with >BUG() in list-objects-filter.c wherever it corresponds to a coding error. > - Replace die()

Re: [PATCH] diff: fix --color-moved-ws=allow-indentation-change

2018-09-04 Thread Stefan Beller
On Tue, Sep 4, 2018 at 6:53 AM Phillip Wood wrote: > > From: Phillip Wood > > If there is more than one potential moved block and the longest block > is not the first element of the array of potential blocks then the > block is cut short. With --color-moved=blocks this can leave moved > lines

[PATCH v7 5/7] revision: mark non-user-given objects instead

2018-09-04 Thread Matthew DeVore
Currently, list-objects.c incorrectly treats all root trees of commits as USER_GIVEN. Also, it would be easier to mark objects that are non-user-given instead of user-given, since the places in the code where we access an object through a reference are more obvious than the places where we access

[PATCH v7 6/7] list-objects-filter: use BUG rather than die

2018-09-04 Thread Matthew DeVore
In some cases in this file, BUG makes more sense than die. In such cases, a we get there from a coding error rather than a user error. 'return' has been removed following some instances of BUG since BUG does not return. Signed-off-by: Matthew DeVore --- list-objects-filter.c | 11 ---

[PATCH v7 7/7] list-objects-filter: implement filter tree:0

2018-09-04 Thread Matthew DeVore
Teach list-objects the "tree:0" filter which allows for filtering out all tree and blob objects (unless other objects are explicitly specified by the user). The purpose of this patch is to allow smaller partial clones. The name of this filter - tree:0 - does not explicitly specify that it also

[PATCH v7 2/7] list-objects: refactor to process_tree_contents

2018-09-04 Thread Matthew DeVore
This will be used in a follow-up patch to reduce indentation needed when invoking the logic conditionally. i.e. rather than: if (foo) { while (...) { /* this is very indented */ } } we will have: if (foo) process_tree_contents(...); Signed-off-by:

[PATCH v7 0/7] filter: support for excluding all trees and blobs

2018-09-04 Thread Matthew DeVore
I made the following changes since v6 of the patchset: - (suggested by Duy Nguyen) add a new commit which replaces uses of die() with BUG() in list-objects-filter.c wherever it corresponds to a coding error. - Replace die() with BUG() in new code. - Replace test_line_count = 0 with

[PATCH v7 1/7] list-objects: store common func args in struct

2018-09-04 Thread Matthew DeVore
This will make utility functions easier to create, as done by the next patch. Signed-off-by: Matthew DeVore --- list-objects.c | 158 +++-- 1 file changed, 74 insertions(+), 84 deletions(-) diff --git a/list-objects.c b/list-objects.c index

[PATCH v7 3/7] list-objects: always parse trees gently

2018-09-04 Thread Matthew DeVore
If parsing fails when revs->ignore_missing_links and revs->exclude_promisor_objects are both false, we print the OID anyway in the die("bad tree object...") call, so any message printed by parse_tree_gently() is superfluous. Signed-off-by: Matthew DeVore --- list-objects.c | 4 +--- 1 file

[PATCH v7 4/7] rev-list: handle missing tree objects properly

2018-09-04 Thread Matthew DeVore
Previously, we assumed only blob objects could be missing. This patch makes rev-list handle missing trees like missing blobs. The --missing=* and --exclude-promisor-objects flags now work for trees as they already do for blobs. This is demonstrated in t6112. Signed-off-by: Matthew DeVore ---

Re: test files with same names?

2018-09-04 Thread Stephen & Linda Smith
I don't mind doing this. On Tuesday, September 4, 2018 10:27:26 AM MST Junio C Hamano wrote: > Duy Nguyen writes: > > t2000-checkout-cache-clash.sh > > t2001-checkout-cache-clash.sh > > These date back to 368f99d5 ("[PATCH 2/2] The core GIT tests: recent > additions and fixes.", 2005-05-13)

Re: [RFC PATCH] Allow aliases that include other aliases

2018-09-04 Thread Junio C Hamano
Tim Schumacher writes: > I submitted this as RFC because I'm not sure whether disallowing > nested aliases was an intentional design choice. The done_alias > check implies that disallowing is intended, but the direct > recursion check for aliases that call themselves opposes that. "direct

[RFC PATCH] Allow aliases that include other aliases

2018-09-04 Thread Tim Schumacher
Aliases can only contain non-alias git commands and arguments, but not other user-defined aliases. Resolving nested aliases is prevented by breaking the loop after the first alias was processed, git then fails with a command-not-found error. Allow resolving nested aliases by not breaking the loop

Re: test files with same names?

2018-09-04 Thread Junio C Hamano
Duy Nguyen writes: > t2000-checkout-cache-clash.sh > t2001-checkout-cache-clash.sh These date back to 368f99d5 ("[PATCH 2/2] The core GIT tests: recent additions and fixes.", 2005-05-13) which later were renamed by f50c9f76 ("Rename some test scripts and describe the naming convention",

Re: Trivial enhancement: All commands which require an author should accept --author

2018-09-04 Thread Jonathan Nieder
Junio C Hamano wrote: > Ævar Arnfjörð Bjarmason writes: >> I believe the "official" way, such as it is, is you just put >> #leftoverbits in your E-Mail, then search the list archives, >> e.g. https://public-inbox.org/git/?q=%23leftoverbits > > I think that technique has been around long enough

Re: [PATCH v2 0/1] Define GIT_TEST_COMMIT_GRAPH for commit-graph test coverage

2018-09-04 Thread Duy Nguyen
On Tue, Sep 04, 2018 at 01:12:55PM -0400, Derrick Stolee wrote: > On 9/4/2018 12:49 PM, Duy Nguyen wrote: > > On Wed, Aug 29, 2018 at 2:49 PM Derrick Stolee via GitGitGadget > > wrote: > >> The commit-graph (and multi-pack-index) features are optional data > >> structures that can make Git

Re: [PATCH v2 0/1] Define GIT_TEST_COMMIT_GRAPH for commit-graph test coverage

2018-09-04 Thread Derrick Stolee
On 9/4/2018 12:49 PM, Duy Nguyen wrote: On Wed, Aug 29, 2018 at 2:49 PM Derrick Stolee via GitGitGadget wrote: The commit-graph (and multi-pack-index) features are optional data structures that can make Git operations faster. Since they are optional, we do not enable them in most Git tests.

  1   2   >