STRICTLY CONFIDENTIAL

I have important transaction for you as next of kin to claim US$18.37m Mail me on my private email: chimwia...@gmail.com so I can send you more details Thanks Mr.Chim Wai Kim MOVE TO INBOX=== DISCLAIMER: This email and any files it contains are confidential and

[PATCH v2] git-p4: Fix multi-path changelist empty commits

From: George Vanburgh When importing from multiple perforce paths - we may attempt to import a changelist that contains files from two (or more) of these depot paths. Currently, this results in multiple git commits - one containing the changes, and the other(s) as empty commit(s). This behavior w

Re: [PATCH v2 01/34] sequencer: support a new action: 'interactive rebase'

Hi, On 12/14/2016 08:29 PM, Junio C Hamano wrote: > Johannes Schindelin writes: >> -/* We will introduce the 'interactive rebase' mode later */ >> static inline int is_rebase_i(const struct replay_opts *opts) >> { >> -return 0; >> +return opts->action == REPLAY_INTERACTIVE_REBASE; >> }

Re: [PATCH v15 08/27] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

Hi Pranit, On 12/16/2016 08:35 PM, Pranit Bauva wrote: > On Thu, Nov 17, 2016 at 5:17 AM, Stephan Beyer wrote: >> On 10/14/2016 04:14 PM, Pranit Bauva wrote: >>> diff --git a/builtin/bisect--helper.c b/builtin/bisect--helper.c >>> index d84ba86..c542e8b 100644 >>> --- a/builtin/bisect--helper.c >

[PATCH] mailinfo.c: move side-effects outside of assert

Since 6b4b013f18 (mailinfo: handle in-body header continuations, 2016-09-20, v2.11.0) mailinfo.c has contained new code with an assert of the form: assert(call_a_function(...)) The function in question, check_header, has side effects. This means that when NDEBUG is defined during a relea

Re: [PATCH v15 08/27] bisect--helper: `is_expected_rev` & `check_expected_revs` shell function in C

Hi Pranit, On 12/16/2016 08:00 PM, Pranit Bauva wrote: > On Wed, Dec 7, 2016 at 1:03 AM, Pranit Bauva wrote: >>> I don't understand why the return value is int and not void. To avoid a >>> "return 0;" line when calling this function? >> >> Initially I thought I would be using the return value but

Re: test failure

> On 17 Dec 2016, at 15:28, Lars Schneider wrote: > > >> On 16 Dec 2016, at 21:32, Ramsay Jones wrote: >> >> Hi Lars, >> >> For the last two days, I've noticed t0021.15 on the 'pu' branch has been >> failing intermittently (well it fails with: 'make test >ptest-out', but >> when run by hand

Re: [PATCH v2 00/21] Add configuration options for split-index

> The previous versions were: > > RFC: https://github.com/chriscool/git/commits/config-split-index7 > v1: https://github.com/chriscool/git/commits/config-split-index72 The diff since v1 is: diff --git a/Documentation/config.txt b/Documentation/config.txt index 8fbef25cb1..52a3cac4ff 100644 -

[PATCH v2 19/21] read-cache: use freshen_shared_index() in read_index_from()

This way a share index file will not be garbage collected if we still read from an index it is based from. As we need to read the current index before creating a new one, the tests have to be adjusted, so that we don't expect an old shared index file to be deleted right away when we create a new o

[PATCH v2 21/21] Documentation/git-update-index: explain splitIndex.*

Signed-off-by: Christian Couder --- Documentation/config.txt | 6 +++--- Documentation/git-update-index.txt | 37 + 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Documentation/config.txt b/Documentation/config.txt index 8fbef25cb1.

[PATCH v2 07/21] Documentation/config: add information for core.splitIndex

Signed-off-by: Christian Couder --- Documentation/config.txt | 4 1 file changed, 4 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index a0ab66aae7..dc44d8a417 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -331,6 +331,10 @@ core.trus

[PATCH v2 16/21] read-cache: unlink old sharedindex files

Everytime split index is turned on, it creates a "sharedindex." file in the git directory. This change makes sure that shared index files that haven't been used for a long time are removed when a new shared index file is created. The new "splitIndex.sharedIndexExpire" config variable is create

[PATCH v2 20/21] Documentation/config: add splitIndex.sharedIndexExpire

Signed-off-by: Christian Couder --- Documentation/config.txt | 11 +++ 1 file changed, 11 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index 08f638c65c..8fbef25cb1 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2776,6 +2776,17 @

[PATCH v2 10/21] read-cache: regenerate shared index if necessary

When writing a new split-index and there is a big number of cache entries in the split-index compared to the shared index, it is a good idea to regenerate the shared index. By default when the ratio reaches 20%, we will push back all the entries from the split-index into a new shared index file in

[PATCH v2 11/21] t1700: add tests for splitIndex.maxPercentChange

Signed-off-by: Christian Couder --- t/t1700-split-index.sh | 72 ++ 1 file changed, 72 insertions(+) diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index 507a1dd1ad..f03addf654 100755 --- a/t/t1700-split-index.sh +++ b/t/t1700-split-i

[PATCH v2 18/21] read-cache: refactor read_index_from()

It looks better and is simpler to review when we don't compute the same things many times in the function. It will also help make the following commit simpler. Signed-off-by: Christian Couder --- read-cache.c | 14 -- 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/rea

[PATCH v2 04/21] read-cache: add and then use tweak_split_index()

This will make us use the split-index feature or not depending on the value of the "core.splitIndex" config variable. Signed-off-by: Christian Couder --- read-cache.c | 17 + 1 file changed, 17 insertions(+) diff --git a/read-cache.c b/read-cache.c index db5d910642..79aae6bd20 1

[PATCH v2 14/21] read-cache: touch shared index files when used

When a split-index file is created, let's update the mtime of the shared index file that the split-index file is referencing. In a following commit we will make shared index file expire depending on their mtime, so updating the mtime makes sure that the shared index file will not be deleted soon.

[PATCH v2 15/21] config: add git_config_get_expiry() from gc.c

This function will be used in a following commit to get the expiration time of the shared index files from the config, and it is generic enough to be put in "config.c". Signed-off-by: Christian Couder --- builtin/gc.c | 15 ++- cache.h | 3 +++ config.c | 13 +

[PATCH v2 03/21] split-index: add {add,remove}_split_index() functions

Also use the functions in cmd_update_index() in builtin/update-index.c. These functions will be used in a following commit to tweak our use of the split-index feature depending on the setting of a configuration variable. Signed-off-by: Christian Couder --- builtin/update-index.c | 18 ++

[PATCH v2 13/21] sha1_file: make check_and_freshen_file() non static

This function will be used in a commit soon, so let's make it available globally. Signed-off-by: Christian Couder --- cache.h | 3 +++ sha1_file.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index e15b421b6f..f442f28189 100644 --- a/cache.h +++ b/c

[PATCH v2 17/21] t1700: test shared index file expiration

Signed-off-by: Christian Couder --- t/t1700-split-index.sh | 44 1 file changed, 44 insertions(+) diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index f03addf654..f448fc13cd 100755 --- a/t/t1700-split-index.sh +++ b/t/t1700-split-index.s

[PATCH v2 05/21] update-index: warn in case of split-index incoherency

When users are using `git update-index --(no-)split-index`, they may expect the split-index feature to be used or not according to the option they just used, but this might not be the case if the new "core.splitIndex" config variable has been set. In this case let's warn about what will happen and

[PATCH v2 00/21] Add configuration options for split-index

Goal We want to make it possible to use the split-index feature automatically by just setting a new "core.splitIndex" configuration variable to true. This can be valuable as split-index can help significantly speed up `git rebase` especially along with the work to libify `git apply` that has

[PATCH v2 02/21] config: add git_config_get_split_index()

This new function will be used in a following commit to know if we want to use the split index feature or not. Signed-off-by: Christian Couder --- cache.h | 1 + config.c | 10 ++ 2 files changed, 11 insertions(+) diff --git a/cache.h b/cache.h index a50a61a197..c126fe475e 100644 ---

[PATCH v2 06/21] t1700: add tests for core.splitIndex

Signed-off-by: Christian Couder --- t/t1700-split-index.sh | 37 + 1 file changed, 37 insertions(+) diff --git a/t/t1700-split-index.sh b/t/t1700-split-index.sh index 292a0720fc..db8c39f446 100755 --- a/t/t1700-split-index.sh +++ b/t/t1700-split-index.sh @@ -2

[PATCH v2 01/21] config: mark an error message up for translation

Signed-off-by: Christian Couder --- config.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.c b/config.c index 83fdecb1bc..2eaf8ad77a 100644 --- a/config.c +++ b/config.c @@ -1701,8 +1701,8 @@ int git_config_get_untracked_cache(void) if (!strcasecmp

[PATCH v2 08/21] Documentation/git-update-index: talk about core.splitIndex config var

Signed-off-by: Christian Couder --- Documentation/git-update-index.txt | 6 ++ 1 file changed, 6 insertions(+) diff --git a/Documentation/git-update-index.txt b/Documentation/git-update-index.txt index 7386c93162..e091b2a409 100644 --- a/Documentation/git-update-index.txt +++ b/Documentatio

[PATCH v2 09/21] config: add git_config_get_max_percent_split_change()

This new function will be used in a following commit to get the value of the "splitIndex.maxPercentChange" config variable. Signed-off-by: Christian Couder --- cache.h | 1 + config.c | 15 +++ 2 files changed, 16 insertions(+) diff --git a/cache.h b/cache.h index c126fe475e..e15b

[PATCH v2 12/21] Documentation/config: add splitIndex.maxPercentChange

Signed-off-by: Christian Couder --- Documentation/config.txt | 13 + 1 file changed, 13 insertions(+) diff --git a/Documentation/config.txt b/Documentation/config.txt index dc44d8a417..08f638c65c 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -2763,6 +2763,19

Re: What's cooking in git.git (Dec 2016, #04; Fri, 16)

On Sat, Dec 17, 2016 at 7:13 PM, Ramsay Jones wrote: > > > On 17/12/16 08:38, Karthik Nayak wrote: >> Hello, >> >>> >>> * kn/ref-filter-branch-list (2016-12-08) 20 commits >>> - branch: implement '--format' option >>> - branch: use ref-filter printing APIs >>> - branch, tag: use porcelain outpu

Re: test failure

> On 16 Dec 2016, at 21:32, Ramsay Jones wrote: > > Hi Lars, > > For the last two days, I've noticed t0021.15 on the 'pu' branch has been > failing intermittently (well it fails with: 'make test >ptest-out', but > when run by hand, it fails only say 1-in-6, 1-in-18, etc.). > > [yes, it's a bi

Re: What's cooking in git.git (Dec 2016, #04; Fri, 16)

On 17/12/16 08:38, Karthik Nayak wrote: > Hello, > >> >> * kn/ref-filter-branch-list (2016-12-08) 20 commits >> - branch: implement '--format' option >> - branch: use ref-filter printing APIs >> - branch, tag: use porcelain output >> - ref-filter: allow porcelain to translate messages in the

[PATCH] mingw: consider that UNICODE_STRING::Length counts bytes

UNICODE_STRING::Length field means size of buffer in bytes[1], despite of buffer itself being array of wchar_t. Because of that terminating zero is placed twice as far. Fix it. [1] https://msdn.microsoft.com/en-us/library/windows/desktop/aa380518.aspx Signed-off-by: Max Kirillov --- Access outsi

Re: [PATCH v2 1/5] doc: add documentation for OPT_STRING_LIST

From: "Jacob Keller" From: Jacob Keller Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add documentation now so t

Re: What's cooking in git.git (Dec 2016, #04; Fri, 16)

Hello, > > * kn/ref-filter-branch-list (2016-12-08) 20 commits > - branch: implement '--format' option > - branch: use ref-filter printing APIs > - branch, tag: use porcelain output > - ref-filter: allow porcelain to translate messages in the output > - ref-filter: add an 'rstrip=' option to

Re: [PATCH] diff: prefer indent heuristic over compaction heuristic

On Fri, Dec 16, 2016 at 5:30 PM, Junio C Hamano wrote: > Although I do not think we should spend too much braincycles on this > one (we should rather just removing the older one soonish), I think > this patch is going in a wrong direction. I agree that "the last > one wins" is a bit hard to see (