Re: [PATCH v4 4/9] t3701: don't hard code sha1 hash values

> Use a filter when comparing diffs to fix the value of non-zero hashes > in diff index lines so we're not hard coding sha1 hash values in the > expected output. This makes it easier to change the expected output if > a test is edited as we don't need to worry about the exact hash value > and

Re: Bug report: "Use of uninitialized value $_ in print"

Jeff King writes: > Because the array is full of "undef". See parse_diff(), which does this: > > my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path); > ... > @colored = run_cmd_pipe(@display_cmd); > ... > for (my $i = 0; $i < @diff; $i++) { > ... >

Re: What's cooking in git.git (Mar 2018, #01; Thu, 1)

SZEDER Gábor writes: > On Thu, Mar 1, 2018 at 11:20 PM, Junio C Hamano wrote: > >> * sg/travis-build-during-script-phase (2018-01-08) 1 commit >> - travis-ci: build Git during the 'script' phase >> >> Stalled for too long without any response; will

Re: [PATCH 1/2] ref-filter: mark a file-local symbol as static

Ramsay Jones writes: > Junio, do you want me to re-roll, or would you mind tweaking the > commit message while queueing? Perfect timing ;-) I was about to get to these two patches. Here is what is queued. commit 2d7cb07e3718d0af6547e2abb35f9cff9b10c1f5 Author:

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Phillip, On 02/03/2018 17:00, Jacob Keller wrote: > > > It is interesting to think what it means to faithfully rebase a '-s > > ours' merge. In your example the rebase does not introduce any new > > changes into branch B that it doesn't introduce to branch A. Had it > > added a fixup to

Re: [PATCH 1/2] ref-filter: mark a file-local symbol as static

On 02/03/18 03:59, Jonathan Nieder wrote: > Hi, > > Ramsay Jones wrote: > >> Commit fcfba37337 ('ref-filter: make "--contains " less chatty if >> is invalid', 2018-02-23) added the add_str_to_commit_list() >> function, which causes sparse to issue a "... not declared. Should it >> be static?"

SimpleMind Mind Maps Export

The attachment contains an archive of all local Mind Maps and related data. This archive can also be used to transfer Mind Maps between SimpleMind editions. Importing this archive will not overwrite maps, but instead will add the contained Mind Maps to the maps already present. Send this message

Re: [PATCH 1/2] ref-filter: mark a file-local symbol as static

On 02/03/18 17:19, Junio C Hamano wrote: > Ramsay Jones writes: > >> Junio, do you want me to re-roll, or would you mind tweaking the >> commit message while queueing? > > Perfect timing ;-) I was about to get to these two patches. Here > is what is queued.

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

On Fri, Mar 2, 2018 at 3:17 AM, Phillip Wood wrote: > > It is interesting to think what it means to faithfully rebase a '-s > ours' merge. In your example the rebase does not introduce any new > changes into branch B that it doesn't introduce to branch A. Had it >

Re: [RFC] Contributing to Git (on Windows)

Jonathan Nieder writes: >> +When adding a helper, be sure to add a line to `t/Makefile` and to the >> `.gitignore` for the >> +binary file you add. The Git community prefers functional tests using the >> full `git` >> +executable, so be sure the test helper is required. > >

Re: What's cooking in git.git (Mar 2018, #01; Thu, 1)

Junio C Hamano writes: > SZEDER Gábor writes: > >> On Thu, Mar 1, 2018 at 11:20 PM, Junio C Hamano wrote: >> >>> * sg/travis-build-during-script-phase (2018-01-08) 1 commit >>> - travis-ci: build Git during the 'script' phase >>> >>>

Re: Bug report: "Use of uninitialized value $_ in print"

On 02/03/2018, Jeff King wrote: > Unfortunately, I don't think there's an easy way to do what you want > (show word-diffs but apply the full diff). Oh :( That would be a *very* useful feature to have, especially where multiple small (e.g. single character or single word) changes

Re: Bug report: "Use of uninitialized value $_ in print"

On Fri, Mar 02, 2018 at 08:53:34AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > Because the array is full of "undef". See parse_diff(), which does this: > > > > my @diff = run_cmd_pipe("git", @diff_cmd, "--", $path); > > ... > > @colored =

Re: Bug report: "Use of uninitialized value $_ in print"

Jeff King writes: > That's probably a reasonable sanity check, but I think we need to abort > and not just have a too-small DISPLAY array. Because later code like the > hunk-splitting is going to assume that there's a 1:1 line > correspondence. We definitely don't want to end up

Re: Bug report: "Use of uninitialized value $_ in print"

On 02/03/2018, Jonathan Nieder wrote: > Is this reproducible for you? Yes. It seems to occur consistently, given the same input. > Do you have more details about how I can reproduce it? Unfortunately, the particular git repo I encountered it on is private, otherwise I would

Re: What's cooking in git.git (Mar 2018, #01; Thu, 1)

> On 02 Mar 2018, at 18:11, Junio C Hamano wrote: > > Junio C Hamano writes: > >> SZEDER Gábor writes: >> >>> On Thu, Mar 1, 2018 at 11:20 PM, Junio C Hamano wrote: >>> *

Re: [PATCH v4 4/9] t3701: don't hard code sha1 hash values

SZEDER Gábor writes: >> +diff_cmp () { >> +for x >> +do >> +sed -e '/^index/s/[0-9a-f]*[1-9a-f][0-9a-f]*\.\./1234567../' \ >> + -e '/^index/s/\.\.[0-9a-f]*[1-9a-f][0-9a-f]*/..9abcdef/' \ >> + -e '/^index/s/ 00*\.\./

, My name is Lindsey and I'm glad to get In Touch with you after view you profile for serious relationship,age does not matter but love and care,

Re: Bug report: "Use of uninitialized value $_ in print"

Jeff King writes: > Unfortunately, I don't think there's an easy way to do what you want > (show word-diffs but apply the full diff). The current "word-diff" discards the information on where the lines end, and it is pretty much hopeless/useless in the context of "add -p". It

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

On Fri, Mar 2, 2018 at 4:36 AM, Phillip Wood wrote: > On 02/03/18 11:17, Phillip Wood wrote: >> >> On 02/03/18 01:16, Igor Djordjevic wrote: >>> >>> Hi Sergey, >>> >>> On 01/03/2018 06:39, Sergey Organov wrote: >> (3) ---X1---o---o---o---o---o---X2 >>

Re: What's cooking in git.git (Mar 2018, #01; Thu, 1)

On Thu, Mar 1, 2018 at 11:20 PM, Junio C Hamano wrote: > * sg/travis-build-during-script-phase (2018-01-08) 1 commit > - travis-ci: build Git during the 'script' phase > > Stalled for too long without any response; will discard. I still think this is a good change as-is and

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Sergey, On 02/03/2018 06:40, Sergey Organov wrote: > > > So... In comparison to original merge commit M, rebased merge commit > > M' is expected to: > > > > - Add X9, from updated "master" > > - Have A1 changed to A12, due to A12 commit amendment > > - Keep A2, rebased as A2' > > -

Re: Bug report: "Use of uninitialized value $_ in print"

On 02/03/2018, Junio C Hamano wrote: > Jeff King writes: >> Unfortunately, I don't think there's an easy way to do what you want >> (show word-diffs but apply the full diff). > > The current "word-diff" discards the information on where the lines > end, and it

Re: [PATCH v5 01/12] sequencer: avoid using errno clobbered by rollback_lock_file()

Hi Martin, On Tue, 27 Feb 2018, Martin Ågren wrote: > On 26 February 2018 at 22:29, Johannes Schindelin > wrote: > > As pointed out in a review of the `--recreate-merges` patch series, > > `rollback_lock_file()` clobbers errno. Therefore, we have to report the > >

[no subject]

Good day, I have business proposition for further reinvestment, if interested please contact me for details on my emailccb9...@gmail.com

Re: [PATCH v4 34/35] remote-curl: implement stateless-connect command

Hi Brandon, On Wed, 28 Feb 2018, Brandon Williams wrote: > diff --git a/remote-curl.c b/remote-curl.c > index 66a53f74b..3f882d766 100644 > --- a/remote-curl.c > +++ b/remote-curl.c > @@ -188,7 +188,12 @@ static struct ref *parse_git_refs(struct discovery > *heads, int for_push) > [...] >

Re: What's cooking in git.git (Mar 2018, #01; Thu, 1)

On Fri, Mar 2, 2018 at 6:11 PM, Junio C Hamano wrote: > OK, I think I now understand what happened. I misread the "fold" > discussion and thought we were still exploring the possibility, to > avoid showing uninteresting zero-status case to the users. > > If we do not care

Re: [PATCH] git-p4: Fix depot path stripping

Yes, that's where we left off. I owe you better testing of the clientspec-side path remapping case, which I hope to get to soon. Will get back to you as soon as I can. Thanks, Nuno On Fri, Mar 2, 2018 at 2:09 AM, Luke Diamand wrote: > On 27 February 2018 at 19:00, Nuno Subtil

Re: [PATCH v4 12/35] serve: introduce git-serve

Brandon Williams writes: > + Capabilities > +~~ > + > +There are two different types of capabilities: normal capabilities, > +which can be used to to convey information or alter the behavior of a > +request, and commands, which are the core actions that a client

Re: [PATCH v4 12/35] serve: introduce git-serve

Brandon Williams writes: > + /* > + * Function queried to see if a capability should be advertised. > + * Optionally a value can be specified by adding it to 'value'. > + * If a value is added to 'value', the server will advertise this > + * capability

Re: [PATCH 2/2] Revert "repository: pre-initialize hash algo pointer"

On Tue, Feb 27, 2018 at 6:09 AM, Junio C Hamano wrote: > Duy Nguyen writes: > >> Yes that's the intention. But after writing cover letter for v2 and >> sending it out, it looks to me that this thing must stay until all our >> code is converted to using

[PATCH/RFC v2 4/9] pack-objects: use bitfield for object_entry::depth

This does not give us any saving due to padding. But we will be able to save once we cut 4 bytes out of this struct in a subsequent patch. Because of struct packing from now on we can only handle max depth 4095 (or even lower when new booleans are added in this struct). This should be ok since

[PATCH/RFC v2 6/9] pack-objects: move in_pack_pos out of struct object_entry

This field is only need for pack-bitmap, which is an optional feature. Move it to a separate array that is only allocated when pack-bitmap is used (it's not freed in the same way that objects[] is not). This saves us 8 bytes in struct object_entry. Signed-off-by: Nguyễn Thái Ngọc Duy

[PATCH/RFC v2 8/9] pack-objects: refer to delta objects by index instead of pointer

Notice that packing_data::nr_objects is uint32_t, we could only handle maximum 4G objects and can address all of them with an uint32_t. If we use a pointer here, we waste 4 bytes on 64 bit architecture. Convert these delta pointers to indexes. Since we need to handle NULL pointers as well, the

[PATCH/RFC v2 2/9] pack-objects: turn type and in_pack_type to bitfields

This saves 8 bytes in sizeof(struct object_entry). On a large repository like linux-2.6.git (6.5M objects), this saves us 52MB memory. Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 14 -- cache.h| 2 ++ object.h |

[PATCH/RFC v2 1/9] pack-objects: document holes in struct object_entry.h

Signed-off-by: Nguyễn Thái Ngọc Duy --- pack-objects.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pack-objects.h b/pack-objects.h index 03f1191659..720a8e8756 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -28,6 +28,7 @@ struct object_entry { unsigned

[PATCH/RFC v2 7/9] pack-objects: move in_pack out of struct object_entry

Instead of using 8 bytes (on 64 bit arch) to store a pointer to a pack. Use an index isntead since the number of packs should be relatively small. This limits the number of packs we can handle to 16k. For now if you hit 16k pack files limit, pack-objects will simply fail [1]. This technically

[PATCH/RFC v2 0/9] Reduce pack-objects memory footprint

The array of object_entry in pack-objects can take a lot of memory when pack-objects is run in "pack everything" mode. On linux-2.6.git, this array alone takes roughly 800MB. This series reorders some fields and reduces field size... to keep this struct smaller. Its size goes from 136 bytes to 96

[PATCH/RFC v2 3/9] pack-objects: use bitfield for object_entry::dfs_state

Signed-off-by: Nguyễn Thái Ngọc Duy --- builtin/pack-objects.c | 3 +++ pack-objects.h | 33 - 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c index fd217cb51f..a4dbb40824

[PATCH/RFC v2 5/9] pack-objects: note about in_pack_header_size

Object header in a pack is packed really tight (see pack-format.txt). Even with 8 bytes length, we need 9-10 bytes most, plus a hash (20 bytes). Which means this field only needs to store a number as big as 32 (5 bits). This is trickier to pack tight though since a new hash algorithm is coming,

[PATCH/RFC v2 9/9] pack-objects: reorder 'hash' to pack struct object_entry

Signed-off-by: Nguyễn Thái Ngọc Duy --- pack-objects.h | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pack-objects.h b/pack-objects.h index db50e56223..a57aca5f03 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -38,12 +38,10 @@ struct

Re: [PATCH v3 11/35] test-pkt-line: introduce a packet-line test helper

On Fri, Feb 23, 2018 at 01:22:31PM -0800, Brandon Williams wrote: > On 02/22, Stefan Beller wrote: > > On Tue, Feb 6, 2018 at 5:12 PM, Brandon Williams wrote: > > > > > +static void pack_line(const char *line) > > > +{ > > > + if (!strcmp(line, "") || !strcmp(line,

Re: [PATCH v3 04/35] upload-pack: convert to a builtin

On Fri, Feb 23, 2018 at 01:09:04PM -0800, Brandon Williams wrote: > > By the way, any decision here would presumably need to be extended to > > git-serve, etc. The current property is that it's safe to fetch from an > > untrusted repository, even over ssh. If we're keeping that for protocol > >

Re: Bug report: "Use of uninitialized value $_ in print"

On Fri, Mar 02, 2018 at 09:15:44AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > That's probably a reasonable sanity check, but I think we need to abort > > and not just have a too-small DISPLAY array. Because later code like the > > hunk-splitting is going to assume

Re: Bug report: "Use of uninitialized value $_ in print"

On Fri, Mar 02, 2018 at 05:30:28PM +, Sam Kuper wrote: > On 02/03/2018, Jeff King wrote: > > Unfortunately, I don't think there's an easy way to do what you want > > (show word-diffs but apply the full diff). > > Oh :( > > That would be a *very* useful feature to have,

Re: [PATCH v4 13/35] ls-refs: introduce ls-refs server command

On Wed, Feb 28, 2018 at 03:22:30PM -0800, Brandon Williams wrote: > +static void add_pattern(struct pattern_list *patterns, const char *pattern) > +{ > + struct ref_pattern p; > + const char *wildcard; > + > + p.pattern = strdup(pattern); xstrdup? > + wildcard = strchr(pattern,

Re: [PATCH 0/4] Speed up git tag --contains

On Fri, Jan 12, 2018 at 10:56:00AM -0800, csilvers wrote: > > This is a resubmission of Jeff King's patch series to speed up git tag > > --contains with some changes. It's been cooking for a while as: > > Replying to this 6-year-old thread: > > Is there any chance this could be resurrected? We

[PATCH] smart-http: document flush after "# service" line

On Thu, Feb 22, 2018 at 12:12:54PM -0800, Dorian Taylor wrote: > This patch exists because I was asked to write it. I don’t know squat > about this protocol other than the fact that I followed the spec and > it didn’t work. I traced a known-good protocol endpoint and found it > contained content

[PATCH 2/2] add--interactive: detect bogus diffFilter output

It's important that the diff-filter only filter the individual lines, and that there remain a one-to-one mapping between the input and output lines. Otherwise, things like hunk-splitting will behave quite unexpectedly (e.g., you think you are splitting at one point, but it has a different effect

[PATCH 1/2] t3701: add a test for interactive.diffFilter

This feature was added in 01143847db (add--interactive: allow custom diff highlighting programs, 2016-02-27) but never tested. Let's add a basic test. Note that we only apply the filter when color is enabled, so we have to use test_terminal. This is an open limitation explicitly mentioned in the

Re: Bug report: "Use of uninitialized value $_ in print"

On Fri, Mar 02, 2018 at 01:53:32PM -0800, Junio C Hamano wrote: > Sam Kuper writes: > > > 1. It would yield, IIUC, less flexibility to create new kinds of view > > based on a consistent, standardised underlying model. > > > > 2. It is harder to read, for some types of

Re: [PATCH] t: send verbose test-helper output to fd 4

On Wed, Feb 28, 2018 at 03:30:29AM +0100, SZEDER Gábor wrote: > > - echo >&2 "test_expect_code: command exited with $exit_code, we > > wanted $want_code $*" > > + echo >&4 "test_expect_code: command exited with $exit_code, we > > wanted $want_code $*" > > return 1 > > } >

Re: [PATCH 00/11] Make the test suite pass with '-x' and /bin/sh

On Sat, Feb 24, 2018 at 12:39:40AM +0100, SZEDER Gábor wrote: > The first patch is the most important: with a couple of well-placed file > descriptor redirections it ensures that the stderr of the test helper > functions running git commands only contain the stderr of the tested > command,

Re: [PATCH v3] run-command: add hint when a hook is ignored

On Fri, Jan 05, 2018 at 11:36:39AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > The problem is that I was bisecting an unrelated change in old code, and > > I built a commit which predates f98f8cbac0 (Ship sample hooks with .sample > > suffix, 2008-06-24). That wrote a

Re: [PATCH v4 13/35] ls-refs: introduce ls-refs server command

Brandon Williams writes: > + ls-refs > +- > + > +`ls-refs` is the command used to request a reference advertisement in v2. > +Unlike the current reference advertisement, ls-refs takes in arguments > +which can be used to limit the refs sent from the server. OK. >

Re: Bug report: "Use of uninitialized value $_ in print"

Sam Kuper writes: > 1. It would yield, IIUC, less flexibility to create new kinds of view > based on a consistent, standardised underlying model. > > 2. It is harder to read, for some types of input (e.g. prose) than the > view generated by the existing word-diff

Re: [PATCH v4 19/35] push: pass ref patterns when pushing

Brandon Williams writes: > Construct a list of ref patterns to be passed to 'get_refs_list()' from > the refspec to be used during the push. This list of ref patterns will > be used to allow the server to filter the ref advertisement when > communicating using protocol v2. >

Respond for details

Good day. Do you need a loan to pay off bills ? To pay off your mortgage quickly ? To set up a new business or to Re- finance your existing business ? I can help you secure a private loan should you be interested please respond for more details Thanks Allen

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

Hi Phillip, > On Fri, Mar 2, 2018 at 4:36 AM, Phillip Wood wrote: > > > > > It is interesting to think what it means to faithfully rebase a '-s > > > ours' merge. > > > > I should have explained that I mean is a faithful rebase one that > > adheres to the semantics of '-s ours' (i.e. ignores

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi Phillip, On 02/03/2018 12:31, Phillip Wood wrote: > > > Thinking about it overnight, I now suspect that original proposal had a > > mistake in the final merge step. I think that what you did is a way to > > fix it, and I want to try to figure what exactly was wrong in the > > original

Re: [PATCH v4 17/35] ls-remote: pass ref patterns when requesting a remote's refs

Brandon Williams writes: > Construct an argv_array of the ref patterns supplied via the command > line and pass them to 'transport_get_remote_refs()' to be used when > communicating protocol v2 so that the server can limit the ref > advertisement based on the supplied

Re: [PATCH v4 18/35] fetch: pass ref patterns when fetching

Brandon Williams writes: > diff --git a/builtin/fetch.c b/builtin/fetch.c > index 850382f55..695fafe06 100644 > --- a/builtin/fetch.c > +++ b/builtin/fetch.c > @@ -332,11 +332,25 @@ static struct ref *get_ref_map(struct transport > *transport, > struct ref *rm; >

[PATCH] travis-ci: enable more warnings on travis linux-gcc job

We have DEVELOPER config to enable more warnings, but since we can't set a fixed gcc version to all devs, that has to be a bit more conservative. On travis, we know almost exact version to be used (bumped to 6.x for more warnings), we could be more aggressive. Signed-off-by: Nguyễn Thái Ngọc Duy

[ID] - [39485] [RE] - [Notice!]

PayPal Dear, YoursaccountshassBeenslimited! -To getsbacksintosyourspaypalsaccount,syousneedstosconfirmsyoursidentity. -it'sseasy ! 1. Clicksonstheslinksbelow. 2. Confirmsthatsyou'resthesownersofsthesaccount,sandsthensfollowsthesinstructions. Confirm Your account Sincerely ,

[PATCH] git.el: handle default excludesfile properly

The previous version only looked at core.excludesfile for locating the excludesfile. So, when core.excludesfile was not defined, it did not use the possible default locations. The current version uses either $XDG_CONFIG_HOME/git/ignore or $HOME/.config/git/ignore for the default excludesfile

Re: [PATCH 00/11] Moving global state into the repository object (part 2)

On Thu, Mar 1, 2018 at 2:09 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> On Wed, Feb 28, 2018 at 9:59 AM, Junio C Hamano wrote: >>> Duy Nguyen writes: >>> Looking at the full-series diff though, it

[PATCH 2/3] worktree: delete dead code

This "link" was a feature in early iterations of multiple worktree functionality but for some reason it was dropped. Since nobody creates this "link", there's no need to check it. This is mostly used to let the user moves a worktree manually [1]. If you move a worktree within the same file

[PATCH 1/3] gc.txt: more details about what gc does

Signed-off-by: Nguyễn Thái Ngọc Duy --- Documentation/git-gc.txt | 12 ++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/Documentation/git-gc.txt b/Documentation/git-gc.txt index 571b5a7e3c..862c931104 100644 --- a/Documentation/git-gc.txt +++

[PATCH 3/3] worktree prune: improve prune logic when worktree is moved

Worktree manual move support is actually gone in 618244e160 (worktree: stop supporting moving worktrees manually - 2016-01-22). Before that, this gitdir could be updated often when the worktree is accessed. That keeps the worktree from being pruned by this logic. "git worktree move" is coming so

[PATCH 0/3] git worktree prune improvements

This is something we could do to improve the situation when a user manually moves a worktree and not follow the update process (we have had the first reported case [1]). Plus a bit cleanup in gc. I think this is something we should do until we somehow make the user aware that the worktree is

[ID] - [39485] [RE] - [Notice!]

PayPal Dear, YoursaccountshassBeenslimited! -To getsbacksintosyourspaypalsaccount,syousneedstosconfirmsyoursidentity. -it'sseasy ! 1. Clicksonstheslinksbelow. 2. Confirmsthatsyou'resthesownersofsthesaccount,sandsthensfollowsthesinstructions. Confirm Your account Sincerely ,

Re: [PATCH v3 12/35] serve: introduce git-serve

On Fri, Feb 23, 2018 at 01:45:57PM -0800, Brandon Williams wrote: > I think this is the price of extending the protocol in a backward > compatible way. If we don't want to be backwards compatible (allowing > for graceful fallback to v1) then we could design this differently. > Even so we're not

Von: Joy Kone

Von: Joy Kone Ich habe Ihnen diese E-Mail geschickt, weil Sie mit Ihnen diskutieren müssen. Ich möchte nicht, dass Sie dieses Angebot in irgendeiner Hinsicht missverstehen ... wenn es Ihnen recht ist, bitte ich um Ihre volle Mitarbeit. Ich habe mich mit Ihnen in Verbindung gesetzt, um eine

Re: [PATCH] git-gui: bind CTRL/CMD+numpad ENTER to do_commit

Sorry about that. Version 2 coming right up. On Thu, Mar 1, 2018 at 7:31 PM, Eric Sunshine wrote: > On Thu, Mar 1, 2018 at 9:39 AM, Birger Skogeng Pedersen > wrote: >> --- > > Please sign-off on your patch. See Documentation/SubmittingPatches. > >

Re: Reduce pack-objects memory footprint?

On Fri, Mar 2, 2018 at 5:54 PM, Jeff King wrote: > On Fri, Mar 02, 2018 at 05:18:45PM +0700, Duy Nguyen wrote: > >> On Wed, Feb 28, 2018 at 4:27 PM, Duy Nguyen wrote: >> > linux-2.6.git current has 6483999 objects. "git gc" on my poor laptop >> > consumes 1.7G

Re: What's cooking in git.git (Mar 2018, #01; Thu, 1)

On 3/1/2018 5:20 PM, Junio C Hamano wrote: -- [Graduated to "master"] * jt/binsearch-with-fanout (2018-02-15) 2 commits (merged to 'next' on 2018-02-15 at 7648891022) + packfile: refactor hash search with fanout table + packfile: remove

Re: Reduce pack-objects memory footprint?

On Wed, Feb 28, 2018 at 4:27 PM, Duy Nguyen wrote: > linux-2.6.git current has 6483999 objects. "git gc" on my poor laptop > consumes 1.7G out of 4G RAM, pushing lots of data to swap and making > all apps nearly unusuable (granted the problem is partly Linux I/O > scheduler

Re: What's cooking in git.git (Mar 2018, #01; Thu, 1)

On 1 March 2018 at 22:20, Junio C Hamano wrote: > 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

Re: Bug report: "Use of uninitialized value $_ in print"

On Fri, Mar 02, 2018 at 01:19:35AM +, Sam Kuper wrote: > The bug is that in the midst of running > > git -c interactive.diffFilter="git diff --word-diff --color" add --patch That's not how interactive.diffFilter is supposed to work. It's meant to have the output of an existing diff piped

Re: [PATCH v4 9/9] add -p: don't rely on apply's '--recount' option

On 01/03/18 20:30, Junio C Hamano wrote: > Phillip Wood writes: > >> From: Phillip Wood >> >> Now that add -p counts patches properly it should be possible to turn >> off the '--recount' option when invoking 'git apply' > > Sounds good ;-)

Re: [PATCH v2 0/5] roll back locks in various code paths

On Thu, Mar 01, 2018 at 09:40:20PM +0100, Martin Ågren wrote: > After thinking about it, I tend to agree. That rewrite loses an > indentation level and makes it a bit clearer that we have two steps, > "maybe bail" and "write". But at the cost of duplicating logic -- after > all, those two steps

Re: [PATCH v4 8/9] add -p: fix counting when splitting and coalescing

On 01/03/18 20:29, Junio C Hamano wrote: > Phillip Wood writes: > >> @@ -887,8 +892,8 @@ sub merge_hunk { >> $o_cnt = $n_cnt = 0; >> for ($i = 1; $i < @{$prev->{TEXT}}; $i++) { >> my $line = $prev->{TEXT}[$i]; >> -if ($line =~ /^\+/)

Re: Reduce pack-objects memory footprint?

On Fri, Mar 02, 2018 at 05:18:45PM +0700, Duy Nguyen wrote: > On Wed, Feb 28, 2018 at 4:27 PM, Duy Nguyen wrote: > > linux-2.6.git current has 6483999 objects. "git gc" on my poor laptop > > consumes 1.7G out of 4G RAM, pushing lots of data to swap and making > > all apps

Re: [PATCH 00/11] Reduce pack-objects memory footprint

On Fri, Mar 02, 2018 at 07:14:01AM +0700, Duy Nguyen wrote: > > We have a big repo, and this gets repacked on 6-8GB of memory on dev > > KVMs, so we're under a fair bit of memory pressure. git-gc slows things > > down a lot. > > > > It would be really nice to have something that made it use

Re: Worktree silently deleted on git fetch/gc/log

Hello Duy, thanks for your answer. Your assumption is correct: when renaming the directory apparently I have not adjusted /git/A/.git/worktrees/B/gitdir to the new location. I fixed the situation by renaming /git/B to /git/B.bak, creating a new worktree pointing to /git/B (with branch g),

[PATCH v2] git-gui: bind CTRL/CMD+numpad ENTER to do_commit

CTRL/CMD+ENTER is bound to do_commit, but this did not apply for the (numpad ENTER) key. To enable CTRL/CMD+ENTER and CTRL/CMD+(numpad ENTER) to yield the same behaviour, CTRL/CMD+(numpad enter) has also been bound to do_commit. Signed-off-by: Birger Skogeng Pedersen ---

Re: [PATCH] git-p4: Fix depot path stripping

On 27 February 2018 at 19:00, Nuno Subtil wrote: > I originally thought this had been designed such that the p4 client spec > determines the paths, which would make sense. However, git-p4 still ignores > the local path mappings in the client spec when syncing p4 depot paths >

Re: [PATCH v4 7/9] add -p: calculate offset delta for edited patches

On 01/03/18 20:14, Junio C Hamano wrote: > Phillip Wood writes: > >> From: Phillip Wood >> >> Recount the number of preimage and postimage lines in a hunk after it >> has been edited so any change in the number of insertions or deletions >>

Re: Reduce pack-objects memory footprint?

Duy Nguyen wrote: > struct revindex_entry { > off_t offset; > unsigned int nr; > }; > > We need on entry per object, so 6.5M objects * 16 bytes = 104 MB. If > we break this struct apart and store two arrays of offset and nr in > struct packed_git, we save 4

Re: Bug report: "Use of uninitialized value $_ in print"

On Thu, Mar 01, 2018 at 11:04:34PM -0800, Jonathan Nieder wrote: > > Use of uninitialized value $_ in print at > > /usr/lib/git-core/git-add--interactive line 1371, line 75. > [...] > > Strange. The relevant line, for reference: > > $ dpkg-deb --fsys-tarfile git_2.11.0-3+deb9u2_amd64.deb | >

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

On 02/03/18 01:16, Igor Djordjevic wrote: > > Hi Sergey, > > On 01/03/2018 06:39, Sergey Organov wrote: >> (3) ---X1---o---o---o---o---o---X2 |\ |\ | A1---A2---A3---U1 | A1'--A2'--A3'--U1' | \ |

Re: Worktree silently deleted on git fetch/gc/log

On Fri, Mar 2, 2018 at 6:34 AM, Дилян Палаузов wrote: > Your assumption is correct: when renaming the directory apparently I have > not adjusted /git/A/.git/worktrees/B/gitdir to the new location. > > I fixed the situation by renaming /git/B to /git/B.bak, creating a

Re: Reduce pack-objects memory footprint?

On Fri, Mar 2, 2018 at 5:54 PM, Jeff King wrote: > On Fri, Mar 02, 2018 at 05:18:45PM +0700, Duy Nguyen wrote: > >> On Wed, Feb 28, 2018 at 4:27 PM, Duy Nguyen wrote: >> > linux-2.6.git current has 6483999 objects. "git gc" on my poor laptop >> > consumes 1.7G

Re: [RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

On 01/03/18 05:39, Sergey Organov wrote: > > Hi Igor, > > Igor Djordjevic writes: > >> Hi Sergey, >> >> On 28/02/2018 06:19, Sergey Organov wrote: >>> > (3) ---X1---o---o---o---o---o---X2 >|\ |\ >| A1---A2---A3---U1

Re: [RFC] Contributing to Git (on Windows)

On 3/1/2018 11:44 PM, Jonathan Nieder wrote: Hi, Derrick Stolee wrote: Now, we'd like to make that document publicly available. These steps are focused on a Windows user, so we propose putting them in the git-for-windows/git repo under CONTRIBUTING.md. I have a pull request open for feedback

Re: Worktree silently deleted on git fetch/gc/log

On Fri, Mar 2, 2018 at 6:34 PM, Дилян Палаузов wrote: > Hello Duy, > > thanks for your answer. > > Your assumption is correct: when renaming the directory apparently I have > not adjusted /git/A/.git/worktrees/B/gitdir to the new location. > > I fixed the situation by

Hello

Am Mr.Sare Ouedraogo.i work in one of the prime bank here in Burkina Faso, i want the bank to transfer the money left by our late customer is a foreigner from Korea. can you invest this money and also help the poor' the amount value at $13,300,000.00 (Thirteen Million Three Hundred Thousand

Re: [RFC] Rebasing merges: a jorney to the ultimate solution(RoadClear)

On 02/03/18 11:17, Phillip Wood wrote: > > On 02/03/18 01:16, Igor Djordjevic wrote: >> >> Hi Sergey, >> >> On 01/03/2018 06:39, Sergey Organov wrote: >>> > (3) ---X1---o---o---o---o---o---X2 >|\ |\ >| A1---A2---A3---U1 | A1'--A2'--A3'--U1'

Re: [PATCH 00/11] Make the test suite pass with '-x' and /bin/sh

On Sat, Feb 24, 2018 at 12:39 AM, SZEDER Gábor wrote: > This patch series makes '-x' tracing of tests work reliably even when > running them with /bin/sh, and setting TEST_SHELL_PATH=bash will be > unnecessary. > > make GIT_TEST_OPTS='-x --verbose-log' test > > passes on