Re: [PATCH 09/23] config.c: mark more strings for translation

On Sat, Jun 30, 2018 at 2:08 AM, Nguyễn Thái Ngọc Duy wrote: > @@ -1409,11 +1409,11 @@ static int git_default_push_config(const char *var, > const char *value) > push_default = PUSH_DEFAULT_UPSTREAM; > else if (!strcmp(value, "current")) >

Re: [PATCH 07/23] builtin/replace.c: mark more strings for translation

On Sat, Jun 30, 2018 at 2:08 AM, Nguyễn Thái Ngọc Duy wrote: > Signed-off-by: Nguyễn Thái Ngọc Duy > --- > builtin/replace.c | 82 +++ > 1 file changed, 41 insertions(+), 41 deletions(-) > > - return error("invalid replace format '%s'\n"

Re: [PATCH 06/23] builtin/pack-objects.c: mark more strings for translation

On Sat, Jun 30, 2018 at 2:08 AM, Nguyễn Thái Ngọc Duy wrote: > Most of these are straight forward. GETTEXT_POISON does catch the last > string in cmd_pack_objects(), but since this is --progress output, it's > not supposed to be machine-readable. > > @@ -2341,8 +2342,8 @@ static void ll_find_delt

Re: [PATCH 04/23] builtin/config.c: mark more strings for translation

On Sat, Jun 30, 2018 at 2:07 AM, Nguyễn Thái Ngọc Duy wrote: > if (show_origin && !(actions & > (ACTION_GET|ACTION_GET_ALL|ACTION_GET_REGEXP|ACTION_LIST))) { > - error("--show-origin is only applicable to --get, --get-all, " > - "--get

[PATCH 2/6] t6036: add a failed conflict detection case with symlink add/add

Signed-off-by: Elijah Newren --- t/t6036-recursive-corner-cases.sh | 66 +++ 1 file changed, 66 insertions(+) diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 4a94fa5ba..0ba04d46d 100755 --- a/t/t6036-recursive-corner-cases.sh

[PATCH 4/6] t6036: add a failed conflict detection case with submodule add/add

Signed-off-by: Elijah Newren --- t/t6036-recursive-corner-cases.sh | 88 +++ 1 file changed, 88 insertions(+) diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 0c8f81331..e920c7505 100755 --- a/t/t6036-recursive-corner-cases.sh

[PATCH 3/6] t6036: add a failed conflict detection case with submodule modify/modify

Signed-off-by: Elijah Newren --- t/t6036-recursive-corner-cases.sh | 88 +++ 1 file changed, 88 insertions(+) diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 0ba04d46d..0c8f81331 100755 --- a/t/t6036-recursive-corner-cases.sh

[PATCH 0/6] Add merge recursive testcases with undetected conflicts

SPOILER ALERT: This series contains answers to the "fun puzzle" at https://public-inbox.org/git/CABPp-BFc1OLYKzS5rauOehvEugPc0oGMJp-NMEAmVMW7QR=4...@mail.gmail.com/ When a merge succeeds, we expect the resulting contents to depend only upon the trees and blobs of the branches involved and of th

[PATCH 1/6] t6036: add a failed conflict detection case with symlink modify/modify

Signed-off-by: Elijah Newren --- t/t6036-recursive-corner-cases.sh | 67 +++ 1 file changed, 67 insertions(+) diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index b5621303d..4a94fa5ba 100755 --- a/t/t6036-recursive-corner-cases.sh

[PATCH 5/6] t6036: add a failed conflict detection case with conflicting types

Signed-off-by: Elijah Newren --- t/t6036-recursive-corner-cases.sh | 75 +++ 1 file changed, 75 insertions(+) diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index e920c7505..8b997d7e5 100755 --- a/t/t6036-recursive-corner-cases.sh

[PATCH 6/6] t6036: add a failed conflict detection case: regular files, different modes

Signed-off-by: Elijah Newren --- t/t6036-recursive-corner-cases.sh | 67 +++ 1 file changed, 67 insertions(+) diff --git a/t/t6036-recursive-corner-cases.sh b/t/t6036-recursive-corner-cases.sh index 8b997d7e5..f8f7b3046 100755 --- a/t/t6036-recursive-corner-cases.sh

[PATCH v2 4/9] t6044: add a testcase for index matching head, when head doesn't match HEAD

The `git merge-recursive` command allows the user to directly specify three commits to merge -- base, head, and remote. (More than three can be specified in the case of multiple merge bases.) Note that since the user is allowed to specify head, it need not match HEAD. Virtually every test and sc

[PATCH v2 9/9] merge: fix misleading pre-merge check documentation

builtin/merge.c contains this important requirement for merge strategies: ...the index must be in sync with the head commit. The strategies are responsible to ensure this. However, Documentation/git-merge.txt says: ...[merge will] abort if there are any changes registered in the ind

[PATCH v2 8/9] merge-recursive: enforce rule that index matches head before merging

builtin/merge.c says that when we are about to perform a merge: ...the index must be in sync with the head commit. The strategies are responsible to ensure this. merge-recursive has always relied on unpack_trees() to enforce this requirement, except in the case of an "Already up to date!

[PATCH v2 5/9] merge-recursive: make sure when we say we abort that we actually abort

In commit 65170c07d4 ("merge-recursive: avoid incorporating uncommitted changes in a merge", 2017-12-21), it was noted that there was a special case when merge-recursive didn't rely on unpack_trees() to enforce the index == HEAD requirement, and thus that it needed to do that enforcement itself. U

[PATCH v2 7/9] t6044: add more testcases with staged changes before a merge is invoked

According to Documentation/git-merge.txt, ...[merge will] abort if there are any changes registered in the index relative to the `HEAD` commit. (One exception is when the changed index entries are in the state that would result from the merge already.) Add some tests showing that

[PATCH v2 6/9] merge-recursive: fix assumption that head tree being merged is HEAD

`git merge-recursive` does a three-way merge between user-specified trees base, head, and remote. Since the user is allowed to specify head, we can not necesarily assume that head == HEAD. Modify index_has_changes() to take an extra argument specifying the tree to compare against. If NULL, it wi

[PATCH v2 3/9] t6044: verify that merges expected to abort actually abort

t6044 has lots of tests for verifying that merge will abort as expected when there are changes staged before the merge starts. However, it only checked for non-zero exit code, which could mean that the merge ran to completion with conflicts. Check that the merge was actually correctly aborted, i.

[PATCH v2 1/9] read-cache.c: move index_has_changes() from merge.c

Since index_has_change() is an index-related function, move it to read-cache.c, only modifying it to avoid uses of the active_cache and active_nr macros. Signed-off-by: Elijah Newren --- merge.c | 31 --- read-cache.c | 33 + 2 fil

[PATCH v2 0/9] Fix merge issues with index not matching HEAD

This series exists to fix problems for merges when the index doesn't match HEAD. We've had an almost comical number of these types of problems in our history, as thoroughly documented in the commit message for the final patch. v1 can be found here: https://public-inbox.org/git/20180603065810.23

[PATCH v2 2/9] index_has_changes(): avoid assuming operating on the_index

Modify index_has_changes() to take a struct istate* instead of just operating on the_index. This is only a partial conversion, though, because we call do_diff_cache() which implicitly assumes work is to be done on the_index. Ongoing work is being done elsewhere to do the remainder of the conversi

[PATCH] fast-import: Don't count delta attempts against an empty buffer

When the reference buffer is empty, diff_delta returns NULL without really attempting anything, yet fast-import counts that as a delta attempt. Signed-off-by: Mike Hommey --- fast-import.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fast-import.c b/fast-import.c index 4d5

RE

I am Col. Hussein Harmush An army officer from Syria I have a very profitable business proposition for you

Re: [PATCH] gc --auto: release pack files before auto packing

On Sat, Jun 30, 2018 at 03:38:21PM +0200, Kim Gybels wrote: > Teach gc --auto to release pack files before auto packing the repository > to prevent failures when removing them. > > Also teach the test 'fetching with auto-gc does not lock up' to complain > when it is no longer triggering an auto pa

[PATCH] gc --auto: release pack files before auto packing

Teach gc --auto to release pack files before auto packing the repository to prevent failures when removing them. Also teach the test 'fetching with auto-gc does not lock up' to complain when it is no longer triggering an auto packing of the repository. Fixes https://github.com/git-for-windows/git

Re: [BUG] A part of an edge from an octopus merge gets colored, even with --color=never

On 25 June 2018 at 12:23, Jeff King wrote: > These diagrams confused me for a minute, because I see two differences: > > 1. The first one has an extra apparently unrelated parallel branch on > the far left. > > 2. The first has the first-parent of the "*" merge commit immediately >

Resubmitted

Please send Sent from my iPhone

[PATCH 11/12] revision.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- revision.h | 69 +++--- 1 file changed, 35 insertions(+), 34 deletions(-) diff --git a/revision.h b/revision.h index b8c47b98e2..5f082a6d98 100644 --- a/revision.h +++ b/revision.h @@ -226,7 +226,7 @@ struct

[PATCH 12/12] submodule.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- submodule.h | 112 ++-- 1 file changed, 56 insertions(+), 56 deletions(-) diff --git a/submodule.h b/submodule.h index 7856b8a0b3..d266e6dca5 100644 --- a/submodule.h +++ b/submodule.h @@ -33,62 +33,62 @@ str

[PATCH 07/12] diff.h: remove extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- diff.h | 120 - 1 file changed, 60 insertions(+), 60 deletions(-) diff --git a/diff.h b/diff.h index dedac472ca..4a8885fb0f 100644 --- a/diff.h +++ b/diff.h @@ -253,15 +253,15 @@ const char *diff_line

[PATCH 06/12] diffcore.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- diffcore.h | 50 +- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/diffcore.h b/diffcore.h index a30da161da..81281a398b 100644 --- a/diffcore.h +++ b/diffcore.h @@ -50,17 +50,17 @@ struct diff

[PATCH 08/12] line-range.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- line-range.h | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/line-range.h b/line-range.h index 83ba3c25e8..d3c54e45aa 100644 --- a/line-range.h +++ b/line-range.h @@ -19,11 +19,11 @@ typedef const char *(*nth_line_fn_t)(v

[PATCH 04/12] cache-tree.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- cache-tree.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cache-tree.h b/cache-tree.h index cfd5328cc9..9799e894f7 100644 --- a/cache-tree.h +++ b/cache-tree.h @@ -51,6 +51,6 @@ int write_index_as_tree(struct object_id *oid, struct i

[PATCH 09/12] rerere.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- rerere.h | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/rerere.h b/rerere.h index c2961feaaa..cd948f28f4 100644 --- a/rerere.h +++ b/rerere.h @@ -22,19 +22,19 @@ struct rerere_id { int variant; }; -extern int s

[PATCH 10/12] repository.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- repository.h | 25 +++-- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/repository.h b/repository.h index f2646f0c52..f60d1cafbd 100644 --- a/repository.h +++ b/repository.h @@ -94,19 +94,16 @@ struct set_gitdir_args {

[PATCH 02/12] attr.h: drop extern from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- attr.h | 24 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/attr.h b/attr.h index 442d464db6..46340010bb 100644 --- a/attr.h +++ b/attr.h @@ -42,31 +42,31 @@ struct attr_check { struct attr_stack *stack; };

[PATCH 05/12] convert.h: drop 'extern' from function declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- convert.h | 56 --- 1 file changed, 29 insertions(+), 27 deletions(-) diff --git a/convert.h b/convert.h index 01385d9288..0a0fa15b58 100644 --- a/convert.h +++ b/convert.h @@ -57,35 +57,36 @@ struct dela

[PATCH 03/12] blame.h: drop extern on func declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- blame.h | 28 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/blame.h b/blame.h index a6c915c277..8c1e14980d 100644 --- a/blame.h +++ b/blame.h @@ -159,17 +159,21 @@ static inline struct blame_origin *blame_orig

[PATCH 00/12] Kill the_index part2, header file cleanup

Like part 1 this is also boring. I wanted to drop these 'extern' everywhere actually, so before I touched any header file in this series, I did a clean up first. This is the result (and to reduce diff noise later) Nguyễn Thái Ngọc Duy (12): apply.h: drop extern on func declaration attr.h: drop

[PATCH 01/12] apply.h: drop extern on func declaration

Signed-off-by: Nguyễn Thái Ngọc Duy --- apply.h | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/apply.h b/apply.h index dc4a019057..025dfed7ab 100644 --- a/apply.h +++ b/apply.h @@ -110,14 +110,14 @@ struct apply_state { int applied_after_fixi

Re: [PATCH 2/2] i18n: bisect: mark two supplementary strings for translation

On Mon, Jun 25, 2018 at 5:29 PM Raphael Hertzog wrote: > > Hi, > > On Thu, 21 Jun 2018, Raphael Hertzog wrote: > > On Thu, 21 Jun 2018, Duy Nguyen wrote: > > > Nice. There's another string in bisect_common() that should also be > > > translated: "revision walk setup failed". Maybe you can mark it

[PATCH 23/23] transport-helper.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- t/t5801-remote-helpers.sh | 8 ++-- transport-helper.c| 87 --- 2 files changed, 48 insertions(+), 47 deletions(-) diff --git a/t/t5801-remote-helpers.sh b/t/t5801-remote-helpers.sh index 88c7f158ef..e3bc53b0c7

[PATCH 10/23] connect.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- connect.c | 78 +++ t/t5570-git-daemon.sh | 6 ++-- 2 files changed, 44 insertions(+), 40 deletions(-) diff --git a/connect.c b/connect.c index 083cf804a7..70b97cfef6 100644 --- a/connect.c +++ b/connect

[PATCH 07/23] builtin/replace.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/replace.c | 82 +++ 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/builtin/replace.c b/builtin/replace.c index de826e8209..c77b325aa1 100644 --- a/builtin/replace.c +++ b/builtin/replace.c

[PATCH 16/23] pkt-line.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- pkt-line.c | 26 +- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/pkt-line.c b/pkt-line.c index 941e41dfc1..04d10bbd03 100644 --- a/pkt-line.c +++ b/pkt-line.c @@ -101,7 +101,7 @@ int packet_flush_gently(int fd) {

[PATCH 18/23] refspec.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- refspec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/refspec.c b/refspec.c index c66351743b..f529092fd6 100644 --- a/refspec.c +++ b/refspec.c @@ -134,7 +134,7 @@ void refspec_item_init_or_die(struct refspec_item *item, const char

[PATCH 14/23] exec-cmd.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- exec-cmd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/exec-cmd.c b/exec-cmd.c index 02d31ee897..4f81f44310 100644 --- a/exec-cmd.c +++ b/exec-cmd.c @@ -358,7 +358,7 @@ int execl_git_cmd(const char *cmd, ...) } va_end

[PATCH 21/23] sha1-file.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- sha1-file.c | 104 ++-- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/sha1-file.c b/sha1-file.c index ed7ac73fa9..92c27583db 100644 --- a/sha1-file.c +++ b/sha1-file.c @@ -378,8 +378,8 @@ sta

[PATCH 09/23] config.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- config.c | 76 +++ t/t1305-config-include.sh | 2 +- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/config.c b/config.c index bb2e30fe3d..58d076e833 100644 --- a/config.c +++ b/config.c

[PATCH 22/23] transport.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- transport.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/transport.c b/transport.c index 2f6a7cb4cd..516a83b7f6 100644 --- a/transport.c +++ b/transport.c @@ -139,7 +139,7 @@ static struct ref *get_refs_from_bundle(st

[PATCH 12/23] dir.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- dir.c| 6 +++--- t/t3005-ls-files-relative.sh | 4 ++-- t/t7400-submodule-basic.sh | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/dir.c b/dir.c index e1a2e1cffb..7c6e7a0a37 100644 --- a/dir.c +++ b/dir.c @@

[PATCH 11/23] convert.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- convert.c | 38 -- t/t0021-conversion.sh | 2 +- 2 files changed, 21 insertions(+), 19 deletions(-) diff --git a/convert.c b/convert.c index f47e60022e..e53911d4f8 100644 --- a/convert.c +++ b/convert.c @@ -

[PATCH 20/23] sequencer.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- sequencer.c | 26 ++ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/sequencer.c b/sequencer.c index 6b6162d194..f7c2f2422d 100644 --- a/sequencer.c +++ b/sequencer.c @@ -716,7 +716,7 @@ static const char *read_author

[PATCH 08/23] commit-graph.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- commit-graph.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/commit-graph.c b/commit-graph.c index b63a1fc85e..c8d521923c 100644 --- a/commit-graph.c +++ b/commit-graph.c @@ -77,28 +77,28 @@ struct commit_graph *

[PATCH 17/23] refs.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- refs.c| 40 +-- t/t1400-update-ref.sh | 20 +++--- t/t1404-update-ref-errors.sh | 4 +-- t/t3210-pack-refs.sh | 2 +- t/t3310-notes-merge-manual-reso

[PATCH 06/23] builtin/pack-objects.c: mark more strings for translation

Most of these are straight forward. GETTEXT_POISON does catch the last string in cmd_pack_objects(), but since this is --progress output, it's not supposed to be machine-readable. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 108 + t/t5

[PATCH 13/23] environment.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- environment.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.c b/environment.c index 2a6de2330b..d129c4adc5 100644 --- a/environment.c +++ b/environment.c @@ -147,7 +147,7 @@ static char *expand_namespace(const char *raw

[PATCH 15/23] object.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- object.c| 10 +- t/t1450-fsck.sh | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/object.c b/object.c index 10d167825e..477e686da7 100644 --- a/object.c +++ b/object.c @@ -49,7 +49,7 @@ int type_from_string_gently(cons

[PATCH 19/23] replace-object.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- replace-object.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/replace-object.c b/replace-object.c index 801b5c1678..ddc1546b8c 100644 --- a/replace-object.c +++ b/replace-object.c @@ -17,7 +17,7 @@ static int register_replace_re

[PATCH 02/23] archive-tar.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- archive-tar.c | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/archive-tar.c b/archive-tar.c index b6f58ddf38..68e72d9176 100644 --- a/archive-tar.c +++ b/archive-tar.c @@ -121,7 +121,7 @@ static int stream_blocked(const stru

[PATCH 00/23] Mark strings for translation

This is a rebased version of v2 [1], sent during rc time and was probably fell through the cracks. [1] https://public-inbox.org/git/20180603163420.13702-1-pclo...@gmail.com/ Nguyễn Thái Ngọc Duy (23): Update messages in preparation for i18n archive-tar.c: mark more strings for translation a

[PATCH 01/23] Update messages in preparation for i18n

Many messages will be marked for translation in the following commits. This commit updates some of them to be more consistent and reduce diff noise in those commits. Changes are - keep the first letter of die(), error() and warning() in lowercase - no full stop in die(), error() or warning() if it

[PATCH 03/23] archive-zip.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- archive-zip.c | 14 +++--- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/archive-zip.c b/archive-zip.c index 48d843489c..7ad46d8854 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -309,11 +309,11 @@ static int write_zip_entry(struc

[PATCH 04/23] builtin/config.c: mark more strings for translation

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/config.c | 48 +-- t/t1308-config-set.sh | 2 +- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index ebeb4c5638..3c26df6c48 100644 --- a/builtin/con

[PATCH 05/23] builtin/grep.c: mark strings for translation and no full stops

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/grep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/builtin/grep.c b/builtin/grep.c index 9774920999..58f941e951 100644 --- a/builtin/grep.c +++ b/builtin/grep.c @@ -489,7 +489,7 @@ static int grep_cache(struct grep_opt *opt,

Re: [PATCH v2 0/9] Introducing remote ODBs

On Sat, Jun 30, 2018 at 10:35 AM, Christian Couder wrote: > Changes compared to V1 of this patch series > ~~~ > > - fix tests failures > - error out when more than one "odb..promisorremote" exist > with the same Here is the diff with V1: diff --g

Re: [PATCH 02/15] apply.c: stop using index compat macros

On Mon, Jun 25, 2018 at 10:27:23AM -0700, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > > > Signed-off-by: Nguyễn Thái Ngọc Duy > > --- > > apply.c | 34 +++--- > > 1 file changed, 19 insertions(+), 15 deletions(-) > > Until all the codepaths that reach th

[PATCH v2 8/9] t0410: test fetching from many promisor remotes

Signed-off-by: Christian Couder --- t/t0410-partial-clone.sh | 24 +++- 1 file changed, 23 insertions(+), 1 deletion(-) diff --git a/t/t0410-partial-clone.sh b/t/t0410-partial-clone.sh index 71a9b9a3e8..9d513ebf57 100755 --- a/t/t0410-partial-clone.sh +++ b/t/t0410-partial-cl

[PATCH v2 7/9] Use odb.origin.partialclonefilter instead of core.partialclonefilter

Let's make the partial clone filter specific to one odb instead of general to all the odbs. This makes it possible to have different partial clone filters for different odbs. Signed-off-by: Christian Couder --- builtin/fetch.c | 2 +- list-objects-filter-options.c | 28 ++

[PATCH v2 6/9] Use remote_odb_get_direct() and has_remote_odb()

Instead of using the repository_format_partial_clone global and fetch_object() directly, let's use has_remote_odb() and remote_odb_get_direct(). Signed-off-by: Christian Couder --- builtin/cat-file.c| 5 +++-- builtin/fetch.c | 11 ++- builtin/gc.c

[PATCH v2 5/9] remote-odb: add remote_odb_reinit()

We will need to reinitialize the remote odb configuration as we will make some changes to it in a later commit when we will detect that a remote is also a remote odb. Signed-off-by: Christian Couder --- remote-odb.c | 14 -- remote-odb.h | 1 + 2 files changed, 13 insertions(+), 2 d

[PATCH v2 9/9] Documentation/config: add odb..promisorRemote

--- Documentation/config.txt | 5 + 1 file changed, 5 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 1cc18a828c..066858886b 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2505,6 +2505,11 @@ This setting can be overridden with the

[PATCH v2 4/9] remote-odb: implement remote_odb_get_many_direct()

This function will be used to get many objects from a promisor remote. Signed-off-by: Christian Couder --- odb-helper.c | 15 +++ odb-helper.h | 3 +++ remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed, 36 insertions(+) diff --git a/odb-helper.c b/odb-helper

[PATCH v2 0/9] Introducing remote ODBs

This is a follow up from the patch series called "odb remote" that I sent earlier this year, which was itself a follow up from previous series. See the links section for more information. As with the previous "odb remote" series, this series is only about integrating with the promisor/narrow clone

[PATCH v2 2/9] Add initial remote odb support

The remote-odb.{c,h} files will contain the functions that are called by the rest of Git mostly from "sha1-file.c" to access the objects managed by the remote odbs. The odb-helper.{c,h} files will contain the functions to actually implement communication with either the internal functions or the e

[PATCH v2 1/9] fetch-object: make functions return an error code

The callers of the fetch_object() and fetch_objects() might be interested in knowing if these functions succeeded or not. Signed-off-by: Christian Couder --- fetch-object.c | 15 +-- fetch-object.h | 6 +++--- sha1-file.c| 4 ++-- 3 files changed, 14 insertions(+), 11 deletions

[PATCH v2 3/9] remote-odb: implement remote_odb_get_direct()

This is implemented only in the promisor remote mode for now by calling fetch_object(). Signed-off-by: Christian Couder --- odb-helper.c | 14 ++ odb-helper.h | 3 ++- remote-odb.c | 17 + remote-odb.h | 1 + 4 files changed, 34 insertions(+), 1 deletion(-) diff --