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

Archive link to previous discussion: https://marc.info/?l=git&m=146331754420554&w=2 On 20 May 2016 at 18:12, Noam Postavsky wrote: > Looking at the coloured output, for some octopus merges where the > first parent edge immediately merges into the next column to the left, > col_num should be decr

Donation offer

premjiazimhas...@outlook.com

Re: [PATCH v3 8/8] diff.c: add white space mode to move detection that allows indent changes

> diff --git a/diff.c b/diff.c > index 040b46545e5..9e357111864 100644 > --- a/diff.c > +++ b/diff.c > @@ -302,12 +302,18 @@ static int parse_color_moved_ws(const char *arg) > ret |= XDF_IGNORE_WHITESPACE_AT_EOL; > else if (!strcmp(sb.buf, "ignore-all-space")) >

RE:

-- Hello Friend, My name is Andres Mark . I'm 49 years old, from the US. I want to get to know you better, if I may be so bold. I consider myself an easy-going man, and I am currently looking for a relationship in which I feel loved. Regards, Mark.

[PATCH] diff: fix a sparse 'dubious one-bit signed bitfield' error

Signed-off-by: Ramsay Jones --- Hi Stefan, If you need to re-roll your 'sb/diff-color-move-more' branch, could you please squash this into the relevant patch (commit f2d78d2c67, "diff.c: add white space mode to move detection that allows indent changes", 2018-06-21). Thanks! ATB, Ramsay Jone

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

On Sat, Jun 23, 2018 at 2:18 PM, Christian Couder wrote: > High level overview of this patch series > > > - Patch 1/9: Sorry the patches are numbered X/11 but they should be numbered X/9 as only the first 9 should be in the series and have been sent.

[PATCH v1 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 the patch series called "Promisor remotes and external ODB support" that I sent earlier this year, which was itself a follow up from previous series. See the links section

[PATCH v1 01/11] 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 v1 03/11] 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 --

[PATCH v1 07/11] 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 | 26 ++

[PATCH v1 08/11] 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 6af4712da8..4a7a662512 100755 --- a/t/t0410-partial-clone.sh +++ b/t/t0410-partial-cl

[PATCH v1 09/11] 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 ab641bf5a9..8df0c7177e 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2504,6 +2504,11 @@ This setting can be overridden with the

[PATCH v1 06/11] 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 v1 02/11] 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 v1 04/11] 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 v1 05/11] 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

Re: [PATCH v1 2/8] Add initial odb remote support

On Tue, May 15, 2018 at 3:44 AM, Junio C Hamano wrote: > Christian Couder writes: >> --- /dev/null >> +++ b/odb-helper.h >> @@ -0,0 +1,13 @@ >> +#ifndef ODB_HELPER_H >> +#define ODB_HELPER_H > > Here is a good space to write a comment on what this structure and > its fields are about. Who are t