Re: [RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-10-11 Thread Christian Couder
On Fri, Oct 11, 2019 at 1:59 AM Jonathan Tan wrote: > > I'm going to start with pack-bitmap.h, then builtin/pack-objects.c. > > > int reuse_partial_packfile_from_bitmap(struct bitmap_index *, > > struct packed_git **packfile, > > -

What's cooking in git.git (Oct 2019, #03; Fri, 11)

2019-10-11 Thread Junio C Hamano
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. We may want to merge down fixes ac

Re: [RFC PATCH 04/10] ewah/bitmap: always allocate 2 more words

2019-10-11 Thread Christian Couder
On Fri, Oct 11, 2019 at 1:40 AM Jonathan Tan wrote: > > > From: Jeff King > > > > In a following patch we will allocate a variable number > > of words in some bitmaps. When iterating over the words we > > will need a mark to tell us when to stop iterating. Let's > > always allocate 2 more words,

Re: [RFC PATCH 05/10] pack-bitmap: don't rely on bitmap_git->reuse_objects

2019-10-11 Thread Christian Couder
On Fri, Oct 11, 2019 at 1:44 AM Jonathan Tan wrote: > > > As we now allocate 2 more words than necessary for each > > bitmap to serve as marks telling us that we can stop > > iterating over the words, we don't need to rely on > > bitmap_git->reuse_objects to stop iterating over the words. > > As P

[PATCH v4 2/2] format-patch: configure a command to generate the output directory name

2019-10-11 Thread Bert Wesarg
The 'format.outputDirectory' configuration is only able to store constant directory names. Though some may use $ git format-patch -o $(createdir) … to name the directory dynamically. Provide a new configuration to be able to store such a command too. Signed-off-by: Bert Wesarg --- Changes i

[PATCH v4 1/2] format-patch: create leading components of output directory

2019-10-11 Thread Bert Wesarg
'git format-patch -o ' did an equivalent of 'mkdir ' not 'mkdir -p ', which is being corrected. Avoid the usage of 'adjust_shared_perm' on the leading directories which may have security implications. Achieved by temporarily disabling of 'config.sharedRepository' like 'git init' does. Signed-off-

Re: [Outreachy] [PATCH] blame: Convert pickaxe_blame defined constants to enums

2019-10-11 Thread Wambui Karuga
On Thu, Oct 10, 2019 at 11:44:39AM -0700, Jonathan Tan wrote: > > Convert pickaxe_blame preprocessor constants in blame.h to an enum. > > Also replace previous instances of the constants with the new enum values. > > First of all, thanks for your initiative in finding a microproject and > making a

Re: [PATCH v2] send-pack: never fetch when checking exclusions

2019-10-11 Thread Derrick Stolee
On 10/11/2019 2:12 AM, Jeff King wrote: > On Tue, Oct 08, 2019 at 11:37:39AM -0700, Jonathan Tan wrote: > >> When building the packfile to be sent, send_pack() is given a list of >> remote refs to be used as exclusions. For each ref, it first checks if >> the ref exists locally, and if it does, pa

Grüße an dich mein lieber Freund

2019-10-11 Thread Mariam Abdul
Grüße an dich, mein lieber Freund, Mein Name ist Mariam Abdul, ich schreibe Ihnen diese Nachricht mit Tränen in den Augen. Der andauernde Bürgerkrieg in meinem Land Syrien hat mein Leben so sehr beeinflusst. Ich habe letztes Jahr meine Familie verloren. Mein Vater war vor seinem Tod ein reicher Ge

Re: [PATCH] parser: Unmangle From: headers that have been mangled for DMARC purposes

2019-10-11 Thread Christian Schoenebeck
On Freitag, 11. Oktober 2019 06:50:14 CEST Andrew Donnellan wrote: > On 11/10/19 3:36 pm, Andrew Donnellan wrote: > > It would be nice if Mailman could adopt X-Original-Sender too. As it is, > > (which I have gone ahead and reported as > https://gitlab.com/mailman/mailman/issues/641) Not stopping

Git Test Coverage Report (October 11)

2019-10-11 Thread Derrick Stolee
Here is today's test coverage report. The usual report format is available online [1], [2]. The report listed below is a new format that groups lines by the commit that introduced them [3]. Thanks Peff for the feedback on that idea. Note: the pu branch does not build due to interactions between ds

Adding a line after the signed-off git am -s

2019-10-11 Thread Daniel Lezcano
Hi all, Is there a way to specify a line to be added in the change-log after the SOB with git-am ? I would like to do something: git am -s -l "Link: https://lore.kernel.org/r/" Which will give: blabla Signed-off-by: aut...@kairnail.org Signed-off-by: commi...@kairnail.org Link: https://lore

Re: [PATCH v4 1/2] format-patch: create leading components of output directory

2019-10-11 Thread SZEDER Gábor
On Fri, Oct 11, 2019 at 10:36:41AM +0200, Bert Wesarg wrote: > Changes in v4: > * based on dl/format-patch-doc-test-cleanup and adopt it Thanks... but here I am nitpicking again, sorry :) > diff --git a/t/t4014-format-patch.sh b/t/t4014-format-patch.sh > index 72b09896cf..9facc3a79e 100755 > --

Re: [PATCH 3/3] sequencer: run post-commit hook

2019-10-11 Thread Phillip Wood
Hi Dscho On 10/10/2019 22:31, Johannes Schindelin wrote: Hi Phillip, On Thu, 10 Oct 2019, Phillip Wood via GitGitGadget wrote: From: Phillip Wood Prior to commit 356ee4659b ("sequencer: try to commit without forking 'git commit'", 2017-11-24) the sequencer would always run the post-commit h

Re: [PATCH] parser: Unmangle From: headers that have been mangled for DMARC purposes

2019-10-11 Thread Daniel Axtens
Hi, >> Neat. There was discussion on a similar issue recently in: >> >> >> https://public-inbox.org/git/305577c2-709a-b632-4056-658277117...@redhat.com/ >> >> where a possible solution was to get senders to use in-body From >> headers even when sending their own patches. > > I think that's a

Re: What's cooking in git.git (Oct 2019, #03; Fri, 11)

2019-10-11 Thread Elijah Newren
On Fri, Oct 11, 2019 at 12:35 AM Junio C Hamano wrote: > [Cooking] [...] > * en/fast-imexport-nested-tags (2019-10-04) 8 commits > (merged to 'next' on 2019-10-07 at 3e75779e10) > + fast-export: handle nested tags > + t9350: add tests for tags of things other than a commit > + fast-export:

Re: [PATCH v4 1/2] format-patch: create leading components of output directory

2019-10-11 Thread Bert Wesarg
On Fri, Oct 11, 2019 at 4:46 PM SZEDER Gábor wrote: > > On Fri, Oct 11, 2019 at 10:36:41AM +0200, Bert Wesarg wrote: > > Changes in v4: > > * based on dl/format-patch-doc-test-cleanup and adopt it > > Thanks... but here I am nitpicking again, sorry :) > > > diff --git a/t/t4014-format-patch.sh b

Re: [PATCH v4 1/2] format-patch: create leading components of output directory

2019-10-11 Thread Bert Wesarg
On Fri, Oct 11, 2019 at 5:45 PM Bert Wesarg wrote: > > On Fri, Oct 11, 2019 at 4:46 PM SZEDER Gábor wrote: > > > > On Fri, Oct 11, 2019 at 10:36:41AM +0200, Bert Wesarg wrote: > > > Changes in v4: > > > * based on dl/format-patch-doc-test-cleanup and adopt it > > > > Thanks... but here I am nit

Re: [PATCH] parser: Unmangle From: headers that have been mangled for DMARC purposes

2019-10-11 Thread Jeff King
On Sat, Oct 12, 2019 at 02:42:49AM +1100, Daniel Axtens wrote: > >> where a possible solution was to get senders to use in-body From > >> headers even when sending their own patches. > [...] > I'm not sure this solution is correct. > > If I take a patch from Andrew, backport it, and send to the l

Re: [PATCH] git-rev-list.txt: prune options in synopsis

2019-10-11 Thread Philip Oakley
On 11/10/2019 07:04, Jeff King wrote: On Fri, Oct 04, 2019 at 05:13:08PM -0700, Denton Liu wrote: The synopsis section in git-rev-list.txt has grown to be a huge list that probably needs its own synopsis. Since the list is huge, users may be given the false impression that the list is complete,

Re: [PATCH 01/11] graph: automatically track visible width of `strbuf`

2019-10-11 Thread Johannes Schindelin
Hi, On Thu, 10 Oct 2019, Denton Liu wrote: > On Fri, Oct 11, 2019 at 10:42:20AM +0900, Junio C Hamano wrote: > > Denton Liu writes: > > > > > static int calculate_width(const struct strbuf *row) > > > { > > > int in_termcode = 0; > > > int width = 0; > > > int i

Re: [PATCH] git-rev-list.txt: prune options in synopsis

2019-10-11 Thread Jeff King
On Fri, Oct 11, 2019 at 05:02:33PM +0100, Philip Oakley wrote: > Another case, of a different style, is that of `git bundle --all` which does > need mentioning that particular rev-list option as a major usage (I couldn't > manage to understand the three layers of man page that needed reading). >

Re: [PATCH v2] send-pack: never fetch when checking exclusions

2019-10-11 Thread Jeff King
On Fri, Oct 11, 2019 at 08:31:30AM -0400, Derrick Stolee wrote: > >> Ensure that these lazy fetches do not occur. > > > > That makes sense. For similar reasons, should we be using > > OBJECT_INFO_QUICK here? If the other side has a bunch of ref tips that > > we don't have, we'll end up re-scannin

Re: [PATCH v4 1/2] format-patch: create leading components of output directory

2019-10-11 Thread SZEDER Gábor
On Fri, Oct 11, 2019 at 05:47:44PM +0200, Bert Wesarg wrote: > > > > +test_expect_success 'format-patch -o with no leading directories' ' > > > > + rm -fr patches && > > > > + git format-patch -o patches master..side && > > > > + count=$(git rev-list --count master..side) && > > > > +

Re: [PATCH v2 1/1] fsmonitor: don't fill bitmap with entries to be removed

2019-10-11 Thread William Baker
On 10/10/19 4:22 AM, SZEDER Gábor wrote: >>> +# This test covers staging/unstaging files that appear at the end of the >>> index. >>> +# Test files with names beginning with 'z' are used under the assumption >>> that >>> +# earlier tests do not add/leave index entries that sort below them. > >

Re: What's cooking in git.git (Oct 2019, #03; Fri, 11)

2019-10-11 Thread Junio C Hamano
Elijah Newren writes: >> * en/fast-imexport-nested-tags (2019-10-04) 8 commits >> (merged to 'next' on 2019-10-07 at 3e75779e10) >> + fast-export: handle nested tags >> ... >> + fast-export: fix exporting a tag and nothing else >> >> Updates to fast-import/export. >> >> Will merge to 'mast

Re: [PATCH 06/11] graph: tidy up display of left-skewed merges

2019-10-11 Thread James Coglan
On 10/10/2019 18:19, Derrick Stolee wrote: > On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: >> +++ b/t/t4215-log-skewed-merges.sh >> @@ -0,0 +1,42 @@ >> +#!/bin/sh >> + >> +test_description='git log --graph of skewed merges' >> + >> +. ./test-lib.sh >> + >> +test_expect_success 'setup

Re: [PATCH 07/11] graph: commit and post-merge lines for left-skewed merges

2019-10-11 Thread James Coglan
On 10/10/2019 18:49, Derrick Stolee wrote: > On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: >> From: James Coglan >> >> Following the introduction of "left-skewed" merges, which are merges >> whose first parent fuses with another edge to its left, we have some >> more edge cases to d

Re: [PATCH 01/11] graph: automatically track visible width of `strbuf`

2019-10-11 Thread James Coglan
Hi Johannes, On 10/10/2019 22:07, Johannes Schindelin wrote: > Hi James, > > On Thu, 10 Oct 2019, James Coglan via GitGitGadget wrote: > >> From: James Coglan >> >> All the output functions in `graph.c` currently keep track of how many >> printable chars they've written to the buffer, before ca

Re: [PATCH 01/11] graph: automatically track visible width of `strbuf`

2019-10-11 Thread James Coglan
On 11/10/2019 17:02, Johannes Schindelin wrote: > Hi, > > On Thu, 10 Oct 2019, Denton Liu wrote: > >> On Fri, Oct 11, 2019 at 10:42:20AM +0900, Junio C Hamano wrote: >>> Denton Liu writes: >>> static int calculate_width(const struct strbuf *row) { int in_termcode

Re: [PATCH v5] documentation: add tutorial for object walking

2019-10-11 Thread SZEDER Gábor
On Thu, Oct 10, 2019 at 08:19:32AM -0700, Emily Shaffer wrote: > diff --git a/Documentation/MyFirstObjectWalk.txt > b/Documentation/MyFirstObjectWalk.txt > new file mode 100644 > index 00..7085f17072 > --- /dev/null > +++ b/Documentation/MyFirstObjectWalk.txt > @@ -0,0 +1,905 @@ > +My Firs

[PATCH v2 0/1] doc: Add a note about ~/.zsh/_git file

2019-10-11 Thread Max Belsky via GitGitGadget
Hey, Today I've spent a few hours to understand why git-completion doesn't work in my zsh shell. It was because I thought ~/.zsh/_git should be a dictionary with git-completion.zsh file. I think this change may save some hours for someone else. Maxim Belsky (1): doc: Change zsh git completion

[PATCH v2 1/1] doc: Change zsh git completion file name

2019-10-11 Thread Maxim Belsky via GitGitGadget
From: Maxim Belsky The original comment does not describe type of ~/.zsh/_git explicitly and zsh does not warn or fail if a user create it as a dictionary. So unexperienced users could be misled by the original comment. There is a small update to clarify it. Signed-off-by: Maxim Belsky Helped-

Re: [RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-10-11 Thread Jeff King
On Thu, Oct 10, 2019 at 04:59:52PM -0700, Jonathan Tan wrote: > > +/* > > + * Record the offsets needed in our reused packfile chunks due to > > + * "gaps" where we omitted some objects. > > + */ > > +static struct reused_chunk { > > + off_t start; > > + off_t offset; > > +} *reused_chunks; >

Re: [RFC PATCH 04/10] ewah/bitmap: always allocate 2 more words

2019-10-11 Thread Jeff King
On Fri, Oct 11, 2019 at 09:49:53AM +0200, Christian Couder wrote: > > I think this should be squashed with patch 3, adding to that commit > > message "since word_alloc might be 0, we need to change the growth > > function". (Or just make the minimum word_alloc be 1 or 32 or something > > positive,

Re: [PATCH] parser: Unmangle From: headers that have been mangled for DMARC purposes

2019-10-11 Thread Ian Kelling
Christian Schoenebeck writes: > 4. MTA's should also address this DKIM issue more accurately. I agree that Exim should be changed as you suggest. > > By taking these things into account, emails of domains with strict DMARC > policies are no longer munged on gnu lists. Additional info: Migra

[PATCH] git-compat-util: fix documentation syntax

2019-10-11 Thread Beat Bolli
The parameter marker for x was garbled in its introduction in 89c855ed3c ("git-compat-util.h: implement a different ARRAY_SIZE macro for for safely deriving the size of array", 2015-04-30). Signed-off-by: Beat Bolli --- git-compat-util.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) dif

[PATCH] utf8: use ARRAY_SIZE() in git_wcwidth()

2019-10-11 Thread Beat Bolli
This macro has been available globally since b4f2a6ac92 ("Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))", 2006-03-09), so let's use it. Signed-off-by: Beat Bolli --- It's idle to speculate about why the macro wasn't used in the original 9e83266525 ("commit-tree: encourage UTF-8 commit messag

[PATCH v2] utf8: use ARRAY_SIZE() in git_wcwidth()

2019-10-11 Thread Beat Bolli
This macro has been available globally since b4f2a6ac92 ("Use #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))", 2006-03-09), so let's use it. Signed-off-by: Beat Bolli --- Brown paperbag fix. Sorry! It's idle to speculate about why the macro wasn't used in the original 9e83266525 ("commit-tree: e

Re: [Outreachy] [PATCH] blame: Convert pickaxe_blame defined constants to enums

2019-10-11 Thread Jonathan Tan
> Jonathan Tan writes: > > >> - if ((opt & PICKAXE_BLAME_COPY_HARDEST) > >> - || ((opt & PICKAXE_BLAME_COPY_HARDER) > >> + if ((opt & BLAME_COPY_HARDEST) > >> + || ((opt & BLAME_COPY_HARDER) > > > > Any reason why the names are renamed to omit "PICKAXE_"? In particular, > > these name

Re: [Outreachy] [PATCH] blame: Convert pickaxe_blame defined constants to enums

2019-10-11 Thread Jonathan Tan
> > Any reason why the names are renamed to omit "PICKAXE_"? In particular, > > these names are still global, so it is good to retain the extra context. > > > > (This doesn't mean that you are wrong to remove them - I just gave my > > opinion, and a reason for my opinion. If you had a reason to re

[PATCH v4 3/3] format-patch: teach --cover-from-description option

2019-10-11 Thread Denton Liu
Before, when format-patch generated a cover letter, only the body would be populated with a branch's description while the subject would be populated with placeholder text. However, users may want to have the subject of their cover letter automatically populated in the same way. Teach format-patch

[PATCH v4 1/3] format-patch: remove erroneous and condition

2019-10-11 Thread Denton Liu
Commit 30984ed2e9 (format-patch: support deep threading, 2009-02-19), introduced the following lines: #define THREAD_SHALLOW 1 [...] thread = git_config_bool(var, value) && THREAD_SHALLOW; Since git_config_bool() returns a bool, the trailing `&& THREAD_SHALLOW` is a no-o

[PATCH v4 0/3] format-patch: learn --cover-from-description option

2019-10-11 Thread Denton Liu
Hi all, since 'dl/format-patch-doc-test-cleanup' has calmed down and merged into 'master', I think now's a good time to revive this topic. I've incorporated Philip's --cover-letter-from-description idea (and shortened it so it's not so verbose) so now it should be a lot more general than the old --

[PATCH v4 2/3] format-patch: use enum variables

2019-10-11 Thread Denton Liu
Before, `thread` and `config_cover_letter` were defined as ints even though they behaved as enums. Define actual enums and change these variables to use these new definitions. Signed-off-by: Denton Liu --- builtin/log.c | 30 +- 1 file changed, 17 insertions(+), 13 de

[PATCH v4 4/3] fixup! format-patch: teach --cover-from-description option

2019-10-11 Thread Denton Liu
Signed-off-by: Denton Liu --- Documentation/git-format-patch.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-format-patch.txt b/Documentation/git-format-patch.txt index 86114e4c22..4c652c97f5 100644 --- a/Documentation/git-format-patch.txt +++ b/Document

Re: [PATCH v10 18/36] merge-recursive: add get_directory_renames()

2019-10-11 Thread Elijah Newren
// Dropping a few folks from the cc list as the thread is so old that I think it should just be the normal git mailing list. Hi Dscho, On Wed, Oct 9, 2019 at 1:39 PM Johannes Schindelin wrote: > > Hi Elijah, > > sorry about the blast from the past, but I just stumbled over something > I could no

Donation Of $1,500.000.00 for you and family

2019-10-11 Thread Pooja Sikka
Donation Of $1,500.000.00 for you and family You have been awarded $1,500,000.00, by Shiv Nadar Foundation, Your email address was chosen at random. Kindly get back to us at your earliest convenience, so we know your email address is valid. For more details Google Shiv Nadar. Sincerely, Pooja

Re: [Outreachy] [PATCH] blame: Convert pickaxe_blame defined constants to enums

2019-10-11 Thread Wambui Karuga
On Fri, Oct 11, 2019 at 11:48:03AM -0700, Jonathan Tan wrote: > > > Any reason why the names are renamed to omit "PICKAXE_"? In particular, > > > these names are still global, so it is good to retain the extra context. > > > > > > (This doesn't mean that you are wrong to remove them - I just gave

[PATCH v3 0/1] fsmonitor: don't fill bitmap with entries to be removed

2019-10-11 Thread William Baker via GitGitGadget
This is the third iteration of changes to fix the segfault that I encountered while testing fsmonitor. This iteration includes the following updates for feedback I received on v2: * Update the new test case to use its own dedicated test repository This latest v3 series has been reviewed by Dscho

[PATCH v3 1/1] fsmonitor: don't fill bitmap with entries to be removed

2019-10-11 Thread William Baker via GitGitGadget
From: William Baker While doing some testing with fsmonitor enabled I found that git commands would segfault after staging and unstaging an untracked file. Looking at the crash it appeared that fsmonitor_ewah_callback was attempting to adjust bits beyond the bounds of the index cache. Digging i

bug: "rev-parse --short" with "--not --remote"

2019-10-11 Thread Brent Casavant
Hello, I noticed what appears to be a bug in rev-parse with an admittedly somewhat unusual combination of arguments. Compare the output of the following: % git rev-parse HEAD --not --remotes=origin 3de09080eb219149a8596dc21915d5a496cba171 ^4fb157bf360413fe3fad38d03b02ce7232d12961 ^757cfa6938c3

Re: What's cooking in git.git (Oct 2019, #03; Fri, 11)

2019-10-11 Thread Elijah Newren
On Fri, Oct 11, 2019 at 9:42 AM Junio C Hamano wrote: > > Elijah Newren writes: > > >> * en/fast-imexport-nested-tags (2019-10-04) 8 commits > >> (merged to 'next' on 2019-10-07 at 3e75779e10) > >> + fast-export: handle nested tags > >> ... > >> + fast-export: fix exporting a tag and nothing

[PATCH 2/2] merge-recursive: fix merging a subdirectory into the root directory

2019-10-11 Thread Elijah Newren via GitGitGadget
From: Elijah Newren We allow renaming all entries in e.g. a directory named z/ into a directory named y/ to be detected as a z/ -> y/ rename, so that if the other side of history adds any files to the directory z/ in the mean time, we can provide the hint that they should be moved to y/. There i

[PATCH 1/2] merge-recursive: clean up get_renamed_dir_portion()

2019-10-11 Thread Elijah Newren via GitGitGadget
From: Elijah Newren Dscho noted a few things making this function hard to follow. Restructure it a bit and add comments to make it easier to follow. The restructurings include: * There was a special case if-check at the end of the function checking whether someone just renamed a file with

[PATCH 0/2] Dir rename fixes

2019-10-11 Thread Elijah Newren via GitGitGadget
This series improves a couple things found after looking into things Dscho flagged: * clarify and slightly restructure code in the get_renamed_dir_portion() function * extend support of detecting renaming/merging of one directory into another to support the root directory as a target direc

Re: bug: "rev-parse --short" with "--not --remote"

2019-10-11 Thread Jeff King
On Fri, Oct 11, 2019 at 03:10:33PM -0500, Brent Casavant wrote: > I noticed what appears to be a bug in rev-parse with an admittedly > somewhat unusual combination of arguments. > > Compare the output of the following: > > % git rev-parse HEAD --not --remotes=origin > 3de09080eb219149a8596dc2191

Re: [RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-10-11 Thread Jonathan Tan
> > This makes sense - offsets may be different when we omit objects from > > the packfile. I think this can be computed by calculating the number of > > zero bits between the current object's index and the nth object prior > > (where n is the offset) in the bitmap resulting from > > reuse_partial_

Re: [PATCH v3] git-gui: add a readme

2019-10-11 Thread Pratyush Yadav
I'll take the silence to mean there are no further objections, and will merge this version in to 'master'. On 08/10/19 05:47PM, Pratyush Yadav wrote: > It is a good idea to have a readme so people finding the project can > know more about it, and know how they can get involved. > > Signed-off-by

Re: [PATCH v3 01/17] sparse-checkout: create builtin with 'list' subcommand

2019-10-11 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > +SPARSE CHECKOUT > + > + > +"Sparse checkout" allows populating the working directory sparsely. > +It uses the skip-worktree bit (see linkgit:git-update-index[1]) to tell > +Git whether a file in the working di

Re: [PATCH v3 00/13] ci: include a Visual Studio build & test in our Azure Pipeline

2019-10-11 Thread Johannes Schindelin
Hi Thomas & Junio, On Mon, 7 Oct 2019, Thomas Gummerer wrote: > On 10/07, Junio C Hamano wrote: > > Johannes Schindelin writes: > > > > > Date: Fri, 04 Oct 2019 08:09:25 -0700 (PDT) > > > [...] > > > X-Google-Original-Date: Fri, 04 Oct 2019 15:09:10 GMT > > > [...] > > > > > > I am fai

Re: [PATCH v2] send-pack: never fetch when checking exclusions

2019-10-11 Thread Jonathan Tan
> As a general rule (and why I'm raising this issue in reply to Jonathan's > patch), I think most or all sites that want OBJECT_INFO_QUICK will want > SKIP_FETCH_OBJECT as well, and vice versa. The reasoning is generally > the same: > > - it's OK to racily have a false negative (we'll still be c

Re: [PATCH v3 02/17] sparse-checkout: create 'init' subcommand

2019-10-11 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > ++ > +The init subcommand also enables the 'extensions.worktreeConfig' setting > +and sets the `core.sparseCheckout` setting in the worktree-specific config > +file. This prevents the sparse-checkout feature from interfering w

Re: [PATCH v3 03/17] clone: add --sparse mode

2019-10-11 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > During the 'git sparse-checkout init' call, we must first look > to see if HEAD is valid, since 'git clone' does not have a valid > HEAD. ...does not have a valid HEAD by the time git_sparse_checkout_init() is called? > The

Re: [PATCH v2 04/11] sparse-checkout: 'set' subcommand

2019-10-11 Thread Elijah Newren
On Mon, Oct 7, 2019 at 11:26 AM Derrick Stolee wrote: > > On 10/5/2019 8:30 PM, Elijah Newren wrote: > > On Sat, Oct 5, 2019 at 3:44 PM Elijah Newren wrote: > >> > >> On Thu, Sep 19, 2019 at 3:07 PM Derrick Stolee via GitGitGadget > >> wrote: > >>> +static int write_patterns_and_update(struct pa

[PATCH v3] stash: avoid recursive hard reset on submodules

2019-10-11 Thread Jakob Jarmar
git stash push does not recursively stash submodules, but if submodule.recurse is set, it may recursively reset --hard them. Having only the destructive action recurse is likely to be surprising behaviour, and unlikely to be desirable, so the easiest fix should be to ensure that the call to git res

Re: [PATCH v3 04/17] sparse-checkout: 'set' subcommand

2019-10-11 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > The 'git sparse-checkout set' subcommand takes a list of patterns > as arguments and writes them to the sparse-checkout file. Then, it > updates the working directory using 'git read-tree -mu HEAD'.

Re: [PATCH v4 1/1] Make gitdir work with worktrees, respect core.hooksPath, etc

2019-10-11 Thread Pratyush Yadav
Hi Johannes, Thanks for the re-roll. Some comments below... On 08/10/19 04:33AM, Johannes Schindelin via GitGitGadget wrote: > From: Johannes Schindelin > > Since v2.9.0, Git knows about the config variable core.hookspath that > allows overriding the path to the directory containing the Git hoo

Re: [PATCH v3 05/17] sparse-checkout: add '--stdin' option to set subcommand

2019-10-11 Thread Elijah Newren
On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget wrote: > > From: Derrick Stolee > > The 'git sparse-checkout set' subcommand takes a list of patterns > and places them in the sparse-checkout file. Then, it updates the > working directory to match those patterns. For a large list of

Re: [PATCH v3 04/17] sparse-checkout: 'set' subcommand

2019-10-11 Thread Elijah Newren
On Fri, Oct 11, 2019 at 3:26 PM Elijah Newren wrote: > > On Mon, Oct 7, 2019 at 1:08 PM Derrick Stolee via GitGitGadget > Looks good, thanks for the fixes. I'm still slightly worried about > folks not looking at the docs and calling sparse-checkout set without > calling init, and then being nega

Re: [PATCH v5] documentation: add tutorial for object walking

2019-10-11 Thread Emily Shaffer
On Fri, Oct 11, 2019 at 02:50:34PM +0900, Junio C Hamano wrote: > Emily Shaffer writes: > > > @@ -77,6 +77,7 @@ API_DOCS = $(patsubst %.txt,%,$(filter-out > > technical/api-index-skel.txt technica > > SP_ARTICLES += $(API_DOCS) > > > > TECH_DOCS += MyFirstContribution > > +TECH_DOCS += MyFir

Re: [PATCH v5] documentation: add tutorial for object walking

2019-10-11 Thread Emily Shaffer
On Fri, Oct 11, 2019 at 07:50:10PM +0200, SZEDER Gábor wrote: > On Thu, Oct 10, 2019 at 08:19:32AM -0700, Emily Shaffer wrote: > > diff --git a/Documentation/MyFirstObjectWalk.txt > > b/Documentation/MyFirstObjectWalk.txt > > new file mode 100644 > > index 00..7085f17072 > > --- /dev/null

Re: What's cooking in git.git (Oct 2019, #03; Fri, 11)

2019-10-11 Thread Junio C Hamano
Elijah Newren writes: > Did I shoot myself in the foot by being quick to jump on Rene's couple > of cosmetic touch-up suggestions he posted over a week after the > series was originally posted? If the suggested updates were simple enough to do and would improve the result sufficiently (which is

[PATCH v6] documentation: add tutorial for object walking

2019-10-11 Thread Emily Shaffer
Existing documentation on object walks seems to be primarily intended as a reference for those already familiar with the procedure. This tutorial attempts to give an entry-level guide to a couple of bare-bones object walks so that new Git contributors can learn the concepts without having to wade t

Re: [RFC PATCH 10/10] pack-objects: improve partial packfile reuse

2019-10-11 Thread Junio C Hamano
Jeff King writes: > The current code does so by creating a new entry in the reused_chunks > array. In the worst case that can grow to have the same number of > entries as we have objects. So this code was an attempt to pad the > header of a shrunken entry to keep it the same size. I don't remembe

Re: [PATCH 01/11] graph: automatically track visible width of `strbuf`

2019-10-11 Thread Junio C Hamano
James Coglan writes: > - We don't want a general solution to this problem for everything > `strbuf` could be used for; it only needs to address the graph > padding problem. Of course. Somebody may use strbuf to hold rows of a table and you do not want to contaminate strbuf with fields like widt

Re: [Outreachy] [PATCH] blame: Convert pickaxe_blame defined constants to enums

2019-10-11 Thread Junio C Hamano
Jonathan Tan writes: >> > Also, I have a slight preference for putting "= 02" on the BLAME_COPY >> > line but that is not necessary. >> >> That is absolutely necessary; it is not like "we do not care what >> exact value _COPY gets; it can be any value as long as it is _MOVE >> plus 1", as these

Re: [PATCH v2] send-pack: never fetch when checking exclusions

2019-10-11 Thread Junio C Hamano
Jeff King writes: > As a general rule (and why I'm raising this issue in reply to Jonathan's > patch), I think most or all sites that want OBJECT_INFO_QUICK will want > SKIP_FETCH_OBJECT as well, and vice versa. The reasoning is generally > the same: > > - it's OK to racily have a false negativ

Re: What's cooking in git.git (Oct 2019, #03; Fri, 11)

2019-10-11 Thread Junio C Hamano
Junio C Hamano writes: > By the way, I think I made a mistake in my calendar math. > > This topic was merged to 'next' on the 7th and it is not especially > tricky; unless I (or somebody else) find glaring issues in it during > the final sanity check before merging it to 'master' during the next

Re: Adding a line after the signed-off git am -s

2019-10-11 Thread Junio C Hamano
Daniel Lezcano writes: > I would like to do something: > > git am -s -l "Link: https://lore.kernel.org/r/" > > Which will give: > > blabla > > Signed-off-by: aut...@kairnail.org > Signed-off-by: commi...@kairnail.org > Link: https://lore.kernel.org/r/ > > This way it is compatible with patchwork,

Re: [PATCH v3 1/1] fsmonitor: don't fill bitmap with entries to be removed

2019-10-11 Thread Junio C Hamano
"William Baker via GitGitGadget" writes: > +# Test staging/unstaging files that appear at the end of the index. Test > +# file names begin with 'z' so that they are sorted to the end of the index. Well, the test is now done in a freshly created repository, so the z* files are the only thing yo

Re: [PATCH v2 1/1] doc: Change zsh git completion file name

2019-10-11 Thread Junio C Hamano
"Maxim Belsky via GitGitGadget" writes: > Signed-off-by: Maxim Belsky > Helped-by: Johannes Schindelin > Helped-by: Junio C Hamano No need to resend (as I'll fix it up locally while queuing), but your sign-off comes last, as we keep these things chronological. With help from others, you wrote

Re: [PATCH 06/11] graph: tidy up display of left-skewed merges

2019-10-11 Thread Derrick Stolee
On 10/11/2019 12:50 PM, James Coglan wrote: > On 10/10/2019 18:19, Derrick Stolee wrote: >> On 10/10/2019 12:13 PM, James Coglan via GitGitGadget wrote: >>> +++ b/t/t4215-log-skewed-merges.sh >>> @@ -0,0 +1,42 @@ >>> +#!/bin/sh >>> + >>> +test_description='git log --graph of skewed merges' >>> + >>

Re: [PATCH v3] stash: avoid recursive hard reset on submodules

2019-10-11 Thread Junio C Hamano
Jakob Jarmar writes: > diff --git a/t/t3906-stash-submodule.sh b/t/t3906-stash-submodule.sh > index d7219d6f8f..83106fa958 100755 > --- a/t/t3906-stash-submodule.sh > +++ b/t/t3906-stash-submodule.sh > @@ -1,6 +1,6 @@ > #!/bin/sh > > -test_description='stash apply can handle submodules' > +tes

Re: [PATCH v2] utf8: use ARRAY_SIZE() in git_wcwidth()

2019-10-11 Thread Junio C Hamano
Beat Bolli writes: > diff --git a/utf8.c b/utf8.c > index 3b42fadffd..5c8f151f75 100644 > --- a/utf8.c > +++ b/utf8.c > @@ -95,13 +95,11 @@ static int git_wcwidth(ucs_char_t ch) > return -1; > > /* binary search in table of non-spacing characters */ > - if (bisearch(ch,

Re: [PATCH v4 2/3] format-patch: use enum variables

2019-10-11 Thread Junio C Hamano
Denton Liu writes: > -#define THREAD_SHALLOW 1 > -#define THREAD_DEEP 2 > -static int thread; > +enum thread_level { > + THREAD_UNSET, > + THREAD_SHALLOW, > + THREAD_DEEP > +}; > +static enum thread_level thread; As the assignment of values do not change, this is a safe conversion ev

Re: [PATCH v4 3/3] format-patch: teach --cover-from-description option

2019-10-11 Thread Junio C Hamano
Denton Liu writes: > +format.coverFromDescription:: > + The default mode for format-patch to determine which parts of > + the cover letter will be populated using the branch's > + description. See the `--cover-from-description` option in > + linkgit:git-format-patch[1]. > + > for

Re: [PATCH v4 0/3] format-patch: learn --cover-from-description option

2019-10-11 Thread Junio C Hamano
Denton Liu writes: > Changes since v3: > > * Change --infer-cover-subject to --cover-from-description > > * No more test cleanup patches (they were merged in > 'dl/format-patch-doc-test-cleanup') With these patches, t4013 and t9902 seem to break, when queued on top of dl/format-patch-doc-test-