Dear Friend,
I am soliciting your partnership to relocation $9 Million to your country for
investment on my behalf and you will be entitled to 30% of the sum once the
transaction is successful made, please indicate your interest if you are
capable so that i will send you details of the transact
A release candidate Git v2.11.0-rc3 is now available for testing
at the usual places. It is comprised of 666 non-merge commits
since v2.10.0, contributed by 73 people, 15 of which are new faces.
It turns out that one recent fix exposed codepaths that have not
been using the API correctly, resulti
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.
A new and hopefully final release
Am 23.11.2016 um 21:05 schrieb Junio C Hamano:
> Johannes Sixt writes:
>> Am 22.11.2016 um 21:40 schrieb Johannes Sixt:
>>> Am 22.11.2016 um 20:16 schrieb Junio C Hamano:
Can't this be handled on the "git merge FETCH_HEAD" codepath
instead?
>>>
>>> Absolutely. Any takers? ;)
>>
>> I atte
Junio C Hamano writes:
> ... I do not think you can safely add these two bits here until the
> migration completes.
I accidentally removed a more useful bit I wrote after the above
sentence while editing.
The NEEDSWORK comment in 73c2779f42 ("builtin-am: implement skeletal
builtin am", 2015-08-
Johannes Schindelin writes:
> + if (!strcmp(var, "core.usebuiltindifftool")) {
> + use_builtin_difftool = git_config_bool(var, value);
> + return 0;
> + }
This no way belongs to the core set; difftool.usebuiltin would be
more appropriate.
> + if (!use_builtin
This adds a builtin difftool that represents a conversion of the current
Perl script version of the difftool.
The motivation is that Perl scripts are not at all native on Windows,
and that `git difftool` therefore is pretty slow on that platform, when
there is no good reason for it to be slow.
In
I have been working on the builtin difftool for almost two weeks,
for two reasons:
1. Perl is really not native on Windows. Not only is there a performance
penalty to be paid just for running Perl scripts, we also have to deal
with the fact that users may have different Perl installations, w
Hi Dennis,
On Wed, 23 Nov 2016, Johannes Schindelin wrote:
> On Wed, 23 Nov 2016, Dennis Kaarsemaker wrote:
>
> > On Tue, 2016-11-22 at 18:01 +0100, Johannes Schindelin wrote:
> > > The original idea was to use an environment variable
> > > GIT_USE_BUILTIN_DIFFTOOL, but the test suite resets tho
Johannes Sixt writes:
> Am 22.11.2016 um 21:40 schrieb Johannes Sixt:
>> Am 22.11.2016 um 20:16 schrieb Junio C Hamano:
>>> Can't this be handled on the "git merge FETCH_HEAD" codepath
>>> instead?
>>
>> Absolutely. Any takers? ;)
>
> I attempted to fix git merge FETCH_HEAD, but I do not see a tr
Johannes Schindelin writes:
> Hi Junio,
>
> On Wed, 23 Nov 2016, Junio C Hamano wrote:
>
>> Junio C Hamano writes:
>>
>> > Can't you route the control upon seeing "git difftool" to your
>> > experimental "C" difftool and check the configuration there? Then
>> > you can decide to run_command()
Hi Junio,
On Wed, 23 Nov 2016, Junio C Hamano wrote:
> Junio C Hamano writes:
>
> > Can't you route the control upon seeing "git difftool" to your
> > experimental "C" difftool and check the configuration there? Then
> > you can decide to run_command() a non-builtin one depending what the
> >
Am 22.11.2016 um 21:40 schrieb Johannes Sixt:
Am 22.11.2016 um 20:16 schrieb Junio C Hamano:
Can't this be handled on the "git merge FETCH_HEAD" codepath
instead?
Absolutely. Any takers? ;)
I attempted to fix git merge FETCH_HEAD, but I do not see a trivial
solution.
But on second thought
Junio C Hamano writes:
> Can't you route the control upon seeing "git difftool" to your
> experimental "C" difftool and check the configuration there? Then
> you can decide to run_command() a non-builtin one depending what the
> configuration says---that way, you would incur cost of spawning Per
Johannes Schindelin writes:
> The downside is that we actually *do* go through Perl to do that. Only to
> go back to a builtin. Which is exactly the thing I intended to avoid.
>
> If we do not go through Perl, we have to set up the git directory and
> parse the config in git.c *just* to figure ou
Christian Couder writes:
> Ok it will appear like this in cache.h:
>
> /* This dies if the configured or default date is in the future */
> extern int git_config_get_expire_date_string(const char *key, const
> char **output);
Those who imitate existing callsites never read comments, and you
need
Hi Dennis,
On Wed, 23 Nov 2016, Dennis Kaarsemaker wrote:
> On Tue, 2016-11-22 at 18:01 +0100, Johannes Schindelin wrote:
> > The original idea was to use an environment variable
> > GIT_USE_BUILTIN_DIFFTOOL, but the test suite resets those variables, and
> > we do want to use that feature flag t
Nguyễn Thái Ngọc Duy writes:
> + for (i = nr = 0; worktrees[i]; i++)
> + nr++;
> +
> + /*
> + * don't sort the first item (main worktree), which will
> + * always be the first
> + */
> + QSORT(worktree
Jeff King writes:
> Another possibility is:
>
> df_sorted_entries.cmp = string_list_df_name_compare;
> string_list_sort(&df_sorted_entries);
>
> It's not any shorter, but maybe it's conceptually simpler.
My first reaction to Duy's patch was: it is moronic for the
string-list API not to offer
Nguyễn Thái Ngọc Duy writes:
> diff --git a/builtin/worktree.c b/builtin/worktree.c
> index 5c4854d..b835b91 100644
> --- a/builtin/worktree.c
> +++ b/builtin/worktree.c
> @@ -388,7 +388,7 @@ static void show_worktree_porcelain(struct worktree *wt)
> printf("HEAD %s\n", sha1_to_hex
G. Steve Batija
Operations / regionalni direktor
Santander Bank Plc,
47-48 Piccadilly
PICCADILLY
W1J0DT
London, Združeno Kraljestvo
Good Day Spoštovani,
Kako se vi in ??vaša družina? Upam, da danes moje pismo ste se sestaja na svoje
najboljše razpoloženje. Sem Dr. Steve Batija, od Harlesden Nor
Nguyễn Thái Ngọc Duy writes:
> This keeps things a bit simpler when we add more fields, knowing that
> default values are always zero.
>
> Signed-off-by: Nguyễn Thái Ngọc Duy
> ---
Looks sensible. Thanks.
> worktree.c | 14 ++
> 1 file changed, 2 insertions(+), 12 deletions(-)
Nguyễn Thái Ngọc Duy writes:
> This fixes two things:
>
> - make sure the first item is always the main worktree even if we
>fail to retrieve some info
>
> - keep 'worktree list' order stable (which in turn fixes the random
>failure on my 'worktree-move' series
> Nguyễn Thái Ngọc Duy (
Brandon Williams writes:
> On 11/22, Junio C Hamano wrote:
>> Brandon Williams writes:
>>
>> > On 11/17, Stefan Beller wrote:
>> >> On Thu, Nov 17, 2016 at 10:46 AM, Brandon Williams
>> >> wrote:
>> >>
>> >> > sha1_array_clear(&commits);
>> >> > -
On Tue, Nov 1, 2016 at 8:28 PM, Junio C Hamano wrote:
> Christian Couder writes:
>
>> 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".
>
> Is it generic enough that a help
On Tue, 2016-11-22 at 18:01 +0100, Johannes Schindelin wrote:
> The original idea was to use an environment variable
> GIT_USE_BUILTIN_DIFFTOOL, but the test suite resets those variables, and
> we do want to use that feature flag to run the tests with, and without,
> the feature flag.
>
> Besides,
On Wed, Nov 23, 2016 at 04:45:56PM +0700, Duy Nguyen wrote:
>
> It's a known issue that gc (and maybe some others that do rev-list
> --all, like fsck) "forgets" about some worktree's refs and you will
> see what you see.
Good. I just wanted to be sure it was a known problem.
Thanks for the info.
Hi David,
On Wed, 23 Nov 2016, David Aguilar wrote:
> On Tue, Nov 22, 2016 at 06:01:23PM +0100, Johannes Schindelin wrote:
>
> > +static const char * const builtin_difftool_usage[] = {
> > + N_("git add [] [--] ..."),
> > + NULL
> > +};
>
> The usage should probably say "difftool" (or "built
Hi Junio,
On Tue, 22 Nov 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Mon, 21 Nov 2016, Junio C Hamano wrote:
> >
> >> diff --git a/t/t0030-stripspace.sh b/t/t0030-stripspace.sh
> >> index 29e91d861c..c1f6411eb2 100755
> >> --- a/t/t0030-stripspace.sh
> >> +++ b/t/t0030-st
On Wed, Nov 23, 2016 at 7:52 AM, Van Oostenryck Luc
wrote:
> Hi,
>
> More or less by error I used the fsck command in a worktree and I had
> the surprised to see that it reported a lot of dangling commits while it was
> not supposed to have one.
> I quickly realized that it was the case only in th
On Wed, Nov 23, 2016 at 12:49 AM, Jeff King wrote:
> On Tue, Nov 22, 2016 at 07:30:19PM +0700, Nguyễn Thái Ngọc Duy wrote:
>
>> This is the follow up of rs/qsort series, merged in b8688ad (Merge
>> branch 'rs/qsort' - 2016-10-10), where coccinelle was used to do
>> automatic transformation.
>>
>>
On Wed, Nov 23, 2016 at 12:26 AM, Stefan Beller wrote:
> On Tue, Nov 22, 2016 at 2:41 AM, Duy Nguyen wrote:
>> On Fri, Nov 11, 2016 at 3:34 AM, Stefan Beller wrote:
>>> @@ -139,7 +140,8 @@ static size_t common_prefix_len(const struct pathspec
>>> *pathspec)
>>>PATHSPEC_L
On Tue, Nov 22, 2016 at 06:01:23PM +0100, Johannes Schindelin wrote:
> This adds a builtin difftool that represents a conversion of the current
> Perl script version of the difftool.
>
> The motivation is that Perl scripts are not at all native on Windows,
> and that `git difftool` therefore is pr
33 matches
Mail list logo
