[PATCH 11/11] pack-objects: increase pack file limit to 4096

When OE_IN_PACK_BITS was added, we didn't have many bits left to spare so the max number of packs that pack-objects could handle was limited to 256. Now we have more spare bits, let's increase it to 4096 to be on the safe side. If you have more than this many packs, you may need to reconsider if

[PATCH 10/11] 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 f339f0411a..52087b32e5 100644 --- a/pack-objects.h +++ b/pack-objects.h @@ -33,12 +33,10 @@ struct

[PATCH 00/11] 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

Re: Reduce pack-objects memory footprint?

On Wed, Feb 28, 2018 at 06:22:33PM +, Eric Wong wrote: > Duy Nguyen wrote: > > which saves 12 bytes (or another 74 MB). 222 MB total is plenty of > > space to keep some file cache from being evicted. > > Nice! I can definitely benefit from lower memory usage when >

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

On 1 March 2018 at 08:36, Jeff King wrote: > On Wed, Feb 28, 2018 at 05:51:14PM +0100, demerphq wrote: > >> I would look into putting it into a module and then using the PERL5OPT >> environment var to have it loaded automagically in any of your perl >> scripts. >> >> For instance

[PATCH 07/11] 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 256 (still unreasonably high for a repo to work well). If you have more than 256 packs, you'll need

[PATCH 08/11] pack-objects: faster reverse packed_git lookup

We do a linear search for in_pack index in create_object_entry(). This function is called for every available object in the worst case (and on linux-2.6.git, that's about 6.5M). Try to avoid that by saving the index in packed_git. Since we should not have zillions of packs, this extra space should

[PATCH 09/11] 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 04/11] 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 06/11] 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 02/11] 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 01/11] 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 05/11] 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 03/11] 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 1/1] gc --auto: exclude the largest giant pack in low-memory config

pack-objects could be a big memory hog especially on large repos, everybody knows that. The suggestion to stick a .keep file on the largest pack to avoid this problem is also known for a long time. Let's do the suggestion automatically instead of waiting for people to come to Git mailing list and

[PATCH/RFC 0/1] Avoid expensive 'repack -ad' in gc --auto

The series [1] I just sent helps reduce pack-objects memory footprint a bit. But even then it's still a huge memory hog. So this patch makes a special treatment for gc --auto: avoid it completely. The trick here is not new (pinning the largest pack with a .keep file). It's just never done

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

On Thu, Mar 01 2018, Nguyễn Thái Ngọc Duy jotted: > 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

git-gui: CTRL/CMD + numpad ENTER does not invoke same command as "regular" ENTER

In git-gui, we can hit CTRL/CMD+ENTER to create a commit. However, using the numpad ENTER does not invoke the same command. I propose that both numpad ENTER and "regular" ENTER should invoke the same command.

Re: [PATCH 07/11] pack-objects: move in_pack out of struct object_entry

On Thu, Mar 01, 2018 at 04:10:48PM +0700, Nguyễn Thái Ngọc Duy wrote: > 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 256 (still >

Re: [PATCH v1] dir.c: don't flag the index as dirty for changes to the untracked cache

On 3/1/2018 2:42 AM, Jeff King wrote: On Wed, Feb 28, 2018 at 01:27:03PM -0800, Junio C Hamano wrote: Somehow this topic has been hanging without getting further attention for too long. It's time to wrap it up and moving it forward. How about this? -- >8 -- From: Junio C Hamano

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

--- git-gui/git-gui.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh index 91c00e648..6de74ce63 100755 --- a/git-gui/git-gui.sh +++ b/git-gui/git-gui.sh @@ -3867,6 +3867,7 @@ bind . <$M1B-Key-equal> {show_more_context;break} bind .

RE: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

On March 1, 2018 2:36 AM, Jeff King wrote: > On Wed, Feb 28, 2018 at 05:51:14PM +0100, demerphq wrote: > > > I would look into putting it into a module and then using the PERL5OPT > > environment var to have it loaded automagically in any of your perl > > scripts. > > > > For instance if you put

Re: ref-filter: how to improve the code

2018-02-28 16:25 GMT+03:00 Jeff King : > On Sun, Feb 25, 2018 at 09:28:25PM +0300, Оля Тележная wrote: > >> I am trying to remove cat-file formatting part and reuse same >> functionality from ref-filter. >> I have a problem that cat-file sometimes needs to continue running >> even

[PATCH v4 5/9] t3701: add failing test for pathological context lines

From: Phillip Wood When a hunk is skipped by add -i the offsets of subsequent hunks are not adjusted to account for any missing insertions due to the skipped hunk. Most of the time this does not matter as apply uses the context lines to apply the subsequent hunks in

[PATCH v4 0/9] Correct offsets of hunks when one is skipped

From: Phillip Wood I've fixed the second patch to match what was in pu and added some extra code to patch 4 to handle zero sha1 hashes where the length varies. Cover letter to v1: While working on a patch series to stage selected lines from a hunk without having to

[PATCH v4 1/9] add -i: add function to format hunk header

From: Phillip Wood This code is duplicated in a couple of places so make it into a function as we're going to add some more callers shortly. Signed-off-by: Phillip Wood --- git-add--interactive.perl | 21 +++-- 1 file

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

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 can be used to adjust the offsets of subsequent hunks. If an edited hunk is subsequently split then the

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

From: Phillip Wood When a file has no trailing new line at the end diff records this by appending "\ No newline at end of file" below the last line of the file. This line should not be counted in the hunk header. Fix the splitting and coalescing code to count files

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

From: Phillip Wood 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

[PATCH v4 2/9] t3701: indent here documents

From: Phillip Wood Indent here documents in line with the current style for tests. While at it, quote the end marker of here-docs that do not use variable interpolation. Signed-off-by: Phillip Wood Signed-off-by: Junio C Hamano

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

From: Phillip Wood Now that add -p counts patches properly it should be possible to turn off the '--recount' option when invoking 'git apply' Signed-off-by: Phillip Wood --- Notes: I can't think of a reason why this shouldn't be OK

[PATCH v4 3/9] t3701: use test_write_lines and write_script

From: Phillip Wood Simplify things slightly by using the above helpers. Signed-off-by: Phillip Wood --- Notes: changes since v2 - fixed use of test_set_editor to match what was in pu t/t3701-add-interactive.sh | 33

Re: [PATCH v3 2/9] t3701: indent here documents

Hi Junio On 28/02/18 15:37, Junio C Hamano wrote: > Phillip Wood writes: > >> Is there an easy way for contributors to compare the branch they post to >> what ends up it pu? > > Distributed work is pretty much symmetric, so it can be done the > same way as one would

[GSoC][PATCH v2] userdiff: add built-in pattern for golang

This adds xfuncname and word_regex patterns for golang, a quite popular programming language. It also includes test cases for the xfuncname regex (t4018) and updated documentation. The xfuncname regex finds functions, structs and interfaces. Although the Go language prohibits the opening brace

Re: [PATCH 07/11] pack-objects: move in_pack out of struct object_entry

On Thu, Mar 01 2018, Nguyễn Thái Ngọc Duy jotted: > pack. Use an index isntead since the number of packs should be s/isntead/instead/ > This limits the number of packs we can handle to 256 (still > unreasonably high for a repo to work well). If you have more than 256 > packs, you'll need an

[PATCH v4 6/9] add -p: adjust offsets of subsequent hunks when one is skipped

From: Phillip Wood Since commit 8cbd431082 ("git-add--interactive: replace hunk recounting with apply --recount", 2008-7-2) if a hunk is skipped then we rely on the context lines to apply subsequent hunks in the right place. While this works most of the time it is

Good day, I am contacting you in regards to my late client who bears the same surname with you. Please, contact me back urgently for details about this message. Barrister Ransley Bethel (ESQ).

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

On 1 March 2018 at 16:08, Jeff King wrote: > On Thu, Mar 01, 2018 at 09:28:31AM -0500, Randall S. Becker wrote: > >> > It's not clear to me though if we just want to tweak the programs run in >> > the >> > test scripts in order to get test_must_fail to stop complaining, or if we

Re: ref-filter: how to improve the code

On Thu, Mar 01, 2018 at 02:17:09PM +0300, Оля Тележная wrote: > >> I tried to replace all die("...") with `return error("...")` and > >> finally exit(), but actual problem is that we print "error:..." > >> instead of "fatal:...", and it looks funny. > > > > If you do that, then

Re: [PATCH v3 2/9] t3701: indent here documents

Phillip Wood writes: > Thanks for the tips, tbdiff looks useful (I just need to learn to read > diffs of diffs!). I also find rebasing them on a common ancestor useful > but its a bit tedious. Yes, comparing two versions of a series is somewhat unusual and needs

Re: [Problem] test_must_fail makes possibly questionable assumptions about exit_code.

On Thu, Mar 01, 2018 at 09:28:31AM -0500, Randall S. Becker wrote: > > It's not clear to me though if we just want to tweak the programs run in the > > test scripts in order to get test_must_fail to stop complaining, or if we > > consider the unusual exit codes from our perl-based Git programs to

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

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. You can find the changes

Re: [PATCH v4 03/35] pkt-line: add delim packet support

Junio C Hamano writes: > Brandon Williams writes: > >> One of the design goals of protocol-v2 is to improve the semantics of >> flush packets. Currently in protocol-v1, flush packets are used both to >> indicate a break in a list of packet lines as well as

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

On 1 March 2018 at 20:24, Junio C Hamano wrote: > Jeff King writes: > >> IMHO the result is easier to follow. Except for one case: >> >>> [...] >> >> where I think the logic just ends up repeating itself. > > Yup, this one I also had a bit of trouble with.

Re: [PATCH v4 02/35] pkt-line: allow peeking a packet line without consuming it

Brandon Williams writes: > +enum packet_read_status packet_reader_read(struct packet_reader *reader) > +{ > + if (reader->line_peeked) { > + reader->line_peeked = 0; > + return reader->status; > + } > + > + reader->status =

Re: [PATCH v4 00/35] protocol version 2

Brandon Williams writes: > I've tried to keep building on the same base that I started with when > sending out a new version of series, mostly because I thought it was > easier to see what was different between rounds. Yes. It indeed is easier to see the evolution if the

Re: [PATCH v4 03/35] pkt-line: add delim packet support

On 03/01, Junio C Hamano wrote: > Junio C Hamano writes: > > > Brandon Williams writes: > > > >> One of the design goals of protocol-v2 is to improve the semantics of > >> flush packets. Currently in protocol-v1, flush packets are used both to > >>

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

Brandon Williams writes: > Documentation/technical/protocol-v2.txt | 171 Unlike other things in Documentation/technical/, this is not listed on TECH_DOCS list in Documentation/Makefile. Shouldn't it be?

Re: [PATCH v4 00/35] protocol version 2

On 03/01, Junio C Hamano wrote: > Brandon Williams writes: > > > Lots of changes since v3 (well more than between v2 and v3). Thanks for > > all of the reviews on the last round, the series is getting more > > polished. > > > > * Eliminated the "# service" line from the

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

Jeff King writes: > IMHO the result is easier to follow. Except for one case: > >> -if (active_cache_changed || force_write) { >> -if (newfd < 0) { >> -if (refresh_args.flags & REFRESH_QUIET) >> -exit(128); >> -

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

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 > can be used to adjust the offsets of subsequent

Re: [PATCH v4 05/35] upload-pack: factor out processing lines

Brandon Williams writes: > Factor out the logic for processing shallow, deepen, deepen_since, and > deepen_not lines into their own functions to simplify the > 'receive_needs()' function in addition to making it easier to reuse some > of this logic when implementing

Re: [PATCH v4 06/35] transport: use get_refs_via_connect to get refs

Brandon Williams writes: > Remove code duplication and use the existing 'get_refs_via_connect()' > function to retrieve a remote's heads in 'fetch_refs_via_pack()' and > 'git_transport_push()'. > > Signed-off-by: Brandon Williams > --- > transport.c | 18

Re: [PATCH v4 03/35] pkt-line: add delim packet support

Brandon Williams writes: > One of the design goals of protocol-v2 is to improve the semantics of > flush packets. Currently in protocol-v1, flush packets are used both to > indicate a break in a list of packet lines as well as an indication that > one side has finished

Re: Obsolete instruction in SubmittingPatches?

Andrei Rybak writes: > On 01.03.2018 0:54, Junio C Hamano wrote: >> Andrei Rybak writes: >> >>> Is this part of guidelines obsolete, or am I not understanding this >>> correctly? >> >> I am merely being nice (but only on "time-permitting" basis). > >

Re: [RFC PATCH] color: respect the $NO_COLOR convention

Junio C Hamano writes: > Leah Neukirchen writes: > >> NO_COLOR (http://no-color.org/) is a comprehensive approach to disable >> colors by default for all tools: > > The list of software that supports that "convention" is, eh, > respectable. Is it really a

[RFC] Contributing to Git (on Windows)

We (Git devs at Microsoft) have had several people start contributing to Git over the past few years (I'm the most-recent addition). As we on-boarded to Git development on our Windows machines, we collected our setup steps on an internal wiki page. Now, we'd like to make that document

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

On Thu, Mar 1, 2018 at 9:39 AM, Birger Skogeng Pedersen wrote: > --- Please sign-off on your patch. See Documentation/SubmittingPatches. Also, it would be helpful to write at least a short commit message justifying the change. The reason you gave in your lead-in email[1]

Re: Obsolete instruction in SubmittingPatches?

On 01.03.2018 0:54, Junio C Hamano wrote: > Andrei Rybak writes: > >> Is this part of guidelines obsolete, or am I not understanding this >> correctly? > > I am merely being nice (but only on "time-permitting" basis). > Does that mean that the integration of a series is

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

On Wed, Feb 28, 2018 at 7:44 AM, Дилян Палаузов wrote: > A (branch master) and > B (branch g) which is a worktree of the first. > > /git/B g>$ git fetch > [...] > From https://... >13e4c55a0..02655d5fb g -> origin/g >c37a3ca25..bc7888511 master ->

Re: The case for two trees in a commit ("How to make rebase less modal")

Hi, Stefan Beller wrote: > $ git hash-object --stdin -w -t commit < tree c70b4a33a0089f15eb3b38092832388d75293e86 > parent 105d5b91138ced892765a84e771a061ede8d63b8 > author Stefan Beller 1519859216 -0800 > committer Stefan Beller 1519859216 -0800 > tree

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

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 04/11] pack-objects: use bitfield for object_entry::depth

Nguyễn Thái Ngọc Duy writes: > 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

Re: The case for two trees in a commit ("How to make rebase less modal")

Stefan Beller writes: > $ git hash-object --stdin -w -t commit < tree c70b4a33a0089f15eb3b38092832388d75293e86 > parent 105d5b91138ced892765a84e771a061ede8d63b8 > author Stefan Beller 1519859216 -0800 > committer Stefan Beller

Re: [RFC PATCH] color: respect the $NO_COLOR convention

Leah Neukirchen writes: > You are right in calling this out an emerging new thing, but the > second list of that page proves that it will be useful to settle on a > common configuration, and my hope is by getting a few popular projects > on board, others will soon follow. It

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

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 =~ /^\+/) { > - $n_cnt++; > +

Re: [PATCH 09/11] pack-objects: refer to delta objects by index instead of pointer

Nguyễn Thái Ngọc Duy writes: > 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

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

Hello, /git/A/.git/worktrees/b/ is missing - that is the point. /git/B/,git wasn't modified since the worktree was created, cat: gitdir: /git/A/.git/worktrees/b Regards Дилян On 03/01/18 19:09, Eric Sunshine wrote: On Wed, Feb 28, 2018 at 7:44 AM, Дилян Палаузов

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

On Thu, Mar 1, 2018 at 2:24 PM, Дилян Палаузов wrote: > /git/A/.git/worktrees/b/ is missing - that is the point. > /git/B/,git wasn't modified since the worktree was created, cat: > gitdir: /git/A/.git/worktrees/b I'll assume that the lowercase 'b' was a typo in your

Re: [PATCH 07/11] pack-objects: move in_pack out of struct object_entry

Nguyễn Thái Ngọc Duy writes: > 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 256 (still > unreasonably high for a repo

Re: [PATCH v4 00/35] protocol version 2

Brandon Williams writes: > Lots of changes since v3 (well more than between v2 and v3). Thanks for > all of the reviews on the last round, the series is getting more > polished. > > * Eliminated the "# service" line from the response from an HTTP >server. This means

Re: The case for two trees in a commit ("How to make rebase less modal")

Jacob Keller writes: > How does this let you defer a conflict? A future commit which modified > blobs in that tree wouldn't know what version of the trees/blobs to > actually use? Clearly future commits could record their own trees, but > how would they generate the

Re: [PATCH/RFC 1/1] gc --auto: exclude the largest giant pack in low-memory config

Nguyễn Thái Ngọc Duy writes: > pack-objects could be a big memory hog especially on large repos, > everybody knows that. The suggestion to stick a .keep file on the > largest pack to avoid this problem is also known for a long time. Yup, but not that it is not "largest"

Re: [GSoC][PATCH v2] userdiff: add built-in pattern for golang

On Thu, Mar 1, 2018 at 6:19 AM, Alban Gruin wrote: > This adds xfuncname and word_regex patterns for golang, a quite > popular programming language. It also includes test cases for the > xfuncname regex (t4018) and updated documentation. > > The xfuncname regex finds

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

On Fri, Mar 2, 2018 at 3:14 AM, Eric Sunshine wrote: > As far as I know, there isn't any code in Git which would > automatically remove the .git/worktrees/B directory, so it's not clear > how that happened. "git worktree prune" does, which is called by "git gc" and that

[PATCH 2/2] parse-options: remove the unused parse_opt_commits() function

Commit fcfba37337 ('ref-filter: make "--contains " less chatty if is invalid', 2018-02-23), removed the last use of the callback function parse_opt_commits(). Remove this function declaration and definition, since it is now dead code. Signed-off-by: Ramsay Jones

Re: [PATCH v4 03/35] pkt-line: add delim packet support

Brandon Williams writes: > On 03/01, Junio C Hamano wrote: > ... >> Hmph, strictly speaking, the "delim" does not have to be a part of >> how packetized stream is defined. As long as we stop abusing flush >> as "This is merely an end of one segment of what I say." and make it

Re: [PATCH/RFC 1/1] gc --auto: exclude the largest giant pack in low-memory config

On Fri, Mar 2, 2018 at 1:14 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> pack-objects could be a big memory hog especially on large repos, >> everybody knows that. The suggestion to stick a .keep file on the >> largest pack to avoid this

Re: [PATCH 2/2] parse-options: remove the unused parse_opt_commits() function

Ramsay Jones wrote: > Commit fcfba37337 ('ref-filter: make "--contains " less chatty if > is invalid', 2018-02-23), removed the last use of the callback > function parse_opt_commits(). Remove this function declaration and > definition, since it is now dead code. > > Signed-off-by: Ramsay Jones

Re: [PATCH 07/11] pack-objects: move in_pack out of struct object_entry

On Thu, Mar 1, 2018 at 9:49 PM, Jeff King wrote: > On Thu, Mar 01, 2018 at 04:10:48PM +0700, Nguyễn Thái Ngọc Duy wrote: > >> 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. >>

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

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' > > >| \ | > > >| M | > > >|

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

First, background. I encountered a bug on Debian Stretch, using this git version: $ git --version git version 2.11.0 The bug is that in the midst of running git -c interactive.diffFilter="git diff --word-diff --color" add --patch and after having answered "y" to some patches and "n" to

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

On Thu, Mar 1, 2018 at 8:33 PM, Ævar Arnfjörð Bjarmason wrote: > > On Thu, Mar 01 2018, Nguyễn Thái Ngọc Duy jotted: > >> 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

[PATCH 0/2] sparse warning on next branch

Tonight's build had a sparse warning and an additional ./static-check.pl symbol appear on the 'next' branch. As you know, I like to catch these on the 'pu' branch before they graduate to 'next', but it seems that I missed these! :( (The 'pu' branch is quite noisy with regard to sparse and

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

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?" warning for that symbol. Thanks for catching it! > In

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

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?" warning for that symbol. In order to suppress the warning, mark that function as

[no subject]

hihttp://bit.ly/2oxaeuW William Broady

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

Hi Igor, Igor Djordjevic writes: > Hi Sergey, > > On 01/03/2018 06:39, Sergey Organov wrote: [...] >> >> Yeah, I now see it myself. I'm sorry for being lazy and not inspecting >> this more carefully in the first place. > > No problem, that`s why we`re discussing

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

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 [1]. I'll read comments on that PR or in

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

Hi, Sam Kuper wrote: > First, background. I encountered a bug on Debian Stretch, using this > git version: > > $ git --version > git version 2.11.0 > > The bug is that in the midst of running > > git -c interactive.diffFilter="git diff --word-diff --color" add --patch > > and after having

[RFC PATCH] color: respect the $NO_COLOR convention

When the NO_COLOR environment variable is set to any value, default to disabling color, i.e. resolve 'auto' to false. NO_COLOR (http://no-color.org/) is a comprehensive approach to disable colors by default for all tools: > All command-line software which outputs text with ANSI color added >

Re: [RFC PATCH] color: respect the $NO_COLOR convention

Leah Neukirchen writes: > NO_COLOR (http://no-color.org/) is a comprehensive approach to disable > colors by default for all tools: The list of software that supports that "convention" is, eh, respectable. Is it really a "convention" yet, or yet another thing the user needs to

Re: Bug: git log: boundary commits do not respect order (e.g. date-order, topo-order) 2

I just wanted to follow up -- what do you think? On Thu, Feb 22, 2018 at 9:21 PM, Josh Tepper wrote: > My use case is that when combined with --graph, the ordering is > necessary to render a reasonable looking commit graph; by placing the > commits at the end, each boundary