Documentation Breakage at 2.5.6

2017-12-05 Thread Randall S. Becker
Hi All, I'm trying to upgrade the NonStop port from 2.3.7 upward eventually to 2.15.1 and hit a snag on documentation. The xmlto component is a bit new to me and I hit the following error: XMLTO git-remote-testgit.1 xmlto: /home/git/git/Documentation/git-remote-testgit.xml does not validate

Re: [PATCH v2 0/9] rebase -i: add config to abbreviate command names

2017-12-05 Thread liam Beguin
On 05/12/17 05:21 PM, Junio C Hamano wrote: > Liam Beguin writes: > >> This series will add the 'rebase.abbreviateCommands' configuration >> option to allow `git rebase -i` to default to the single-letter command >> names when generating the todo list. >> >> Using

git send-email could check for no To: line

2017-12-05 Thread Matthew Wilcox
I keep coming up with new and innovative ways to send stupid-looking emails with git send-email. Please save me from myself. My latest SNAFU is to spend so much time setting up the 'cc' list in the git-format-patch step that I completely forgot to put anybody on the 'to' line, and even being

Re: [PATCH v7 4/7] checkout: describe_detached_head: remove ellipsis after committish

2017-12-05 Thread Ann T Ropea
We do not want an ellipsis displayed following an (abbreviated) SHA-1 value. The days when this was necessary to indicate the truncation to lower-level Git commands and/or the user are bygone. However, to ease the transition, the ellipsis will still be printed if the user sets the environment

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-05 Thread Philip Oakley
From: "Jeff Hostetler" Sent: Monday, December 04, 2017 3:36 PM On 12/2/2017 11:30 AM, Philip Oakley wrote: From: "Jeff Hostetler" Sent: Friday, December 01, 2017 2:30 PM On 11/30/2017 8:51 PM, Vitaly Arbuzov wrote: I think it would be great

[PATCH v4 2/2] git-prompt: fix reading files with windows line endings

2017-12-05 Thread Robert Abel
If any of the files read by __git_eread have \r\n line endings, read will only strip \n, leaving \r. This results in an ugly prompt, where instead of user@pc MINGW64 /path/to/repo (BARE:master) the last parenthesis is printed over the beginning of the prompt like )ser@pc MINGW64

[PATCH v4 1/2] git-prompt: make __git_eread intended use explicit

2017-12-05 Thread Robert Abel
__git_eread is used to read a single line of a given file (if it exists) into a single variable stripping the EOL. This patch removes the unused capability to split file contents into tokens by passing multiple variable names. Add a comment and explicitly use $2 instead of misleading $@ as

Re: [PATCH v2 1/2] git-prompt: make __git_eread intended use explicit

2017-12-05 Thread Robert Abel
Dear Junio, I'm amazed at how much time and energy you spend on correcting these essentially non-issues in my git commit messages for a quadruple-liner code change. I'll resend both patches one last time addressing the grave issue of the informative mention of multi-line files. Regards, Robert

Re: [PATCH] diff-tree: read the index so attribute checks work in bare repositories

2017-12-05 Thread Eric Sunshine
On Tue, Dec 5, 2017 at 5:13 PM, Brandon Williams wrote: > A regression was introduced in 557a5998d (submodule: remove > gitmodules_config, 2017-08-03) to how attribute processing was handled > in bare repositories when running the diff-tree command. > > By default the attribute

Re: [PATCH] diff-tree: read the index so attribute checks work in bare repositories

2017-12-05 Thread Junio C Hamano
Brandon Williams writes: > A regression was introduced in 557a5998d (submodule: remove > gitmodules_config, 2017-08-03) to how attribute processing was handled > in bare repositories when running the diff-tree command. > > By default the attribute system will first try to read

Re: [PATCH] diff-tree: read the index so attribute checks work in bare repositories

2017-12-05 Thread Stefan Beller
On Tue, Dec 5, 2017 at 2:13 PM, Brandon Williams wrote: > A regression was introduced in 557a5998d (submodule: remove > gitmodules_config, 2017-08-03) to how attribute processing was handled > in bare repositories when running the diff-tree command. > > By default the attribute

Re: [PATCH] diff-tree: read the index so attribute checks work in bare repositories

2017-12-05 Thread Brandon Williams
On 12/05, Ben Boeckel wrote: > On Tue, Dec 05, 2017 at 14:13:37 -0800, Brandon Williams wrote: > > This patch should fix the regression. Let me know if it doesn't solve the > > issue and I'll investigate some more. > > Our test suite passes again. Thanks! Of course! Glad I could help :) > >

Re: [PATCH] diff-tree: read the index so attribute checks work in bare repositories

2017-12-05 Thread Ben Boeckel
On Tue, Dec 05, 2017 at 14:13:37 -0800, Brandon Williams wrote: > This patch should fix the regression. Let me know if it doesn't solve the > issue and I'll investigate some more. Our test suite passes again. Thanks! Acked-by: Ben Boeckel --Ben

Re: [WIP 2/2] submodule: read-only super-backed ref backend

2017-12-05 Thread Stefan Beller
On Fri, Dec 1, 2017 at 2:50 PM, Jonathan Tan wrote: > Note that a few major parts are still missing: > - special handling of the current branch of the superproject > - writing (whether "refs/..." to the superproject as an index change or >a commit, or

Re: [PATCH v2 0/9] rebase -i: add config to abbreviate command names

2017-12-05 Thread Junio C Hamano
Liam Beguin writes: > This series will add the 'rebase.abbreviateCommands' configuration > option to allow `git rebase -i` to default to the single-letter command > names when generating the todo list. > > Using single-letter command names can present two benefits. First,

Re: [RFE] Inverted sparseness (amended)

2017-12-05 Thread Philip Oakley
From: "Randall S. Becker" On December 3, 2017 6:14 PM, Philip Oakley wrote a nugget of wisdom: From: "Randall S. Becker" [...] If using the empty tree part doesn't pass muster (i.e. showing nothing isn't sufficient), then the narrow clone

[PATCH] diff-tree: read the index so attribute checks work in bare repositories

2017-12-05 Thread Brandon Williams
A regression was introduced in 557a5998d (submodule: remove gitmodules_config, 2017-08-03) to how attribute processing was handled in bare repositories when running the diff-tree command. By default the attribute system will first try to read ".gitattribute" files from the working tree and then

Re: [PATCH v6 09/12] fixup: sha1_file: convert gotos to break/continue

2017-12-05 Thread Jeff Hostetler
On 12/5/2017 3:54 PM, Junio C Hamano wrote: Jeff Hostetler writes: From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- sha1_file.c | 40 1 file changed, 20

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

2017-12-05 Thread Junio C Hamano
Dan Jacques writes: > Thanks for checking! The patch that you quoted above looks like it's from > this "v4" thread; however, the patch that you are diffing against in your > latest reply seems like it is from an earlier version. > > I believe that the $(pathsep) changes in your

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

2017-12-05 Thread Dan Jacques
Johannes Sixt wrote: > I don't know what I tested last week; most likely not the version of the > patch I quoted above. > > Today's version, with the tip at 5d7f59c391ce, is definitely bogus > with its quoting. It needs the patch below, otherwise an unquoted > semicolon may be expanded from

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

2017-12-05 Thread Junio C Hamano
Johannes Sixt writes: > Today's version, with the tip at 5d7f59c391ce, is definitely bogus > with its quoting. It needs the patch below, otherwise an unquoted > semicolon may be expanded from $(pathsep). This would terminate the sed > command, of course. Of course ;-) Somehow I

Re: [PATCH v6 09/12] fixup: sha1_file: convert gotos to break/continue

2017-12-05 Thread Junio C Hamano
Jeff Hostetler writes: > + while (1) { > + if (find_pack_entry(real, )) > + break; > > + /* Most likely it's a loose object. */ > + if (!sha1_loose_object_info(real, oi, flags)) > + return

Re: [PATCH v6 09/12] fixup: sha1_file: convert gotos to break/continue

2017-12-05 Thread Junio C Hamano
Jeff Hostetler writes: > From: Jeff Hostetler > > Signed-off-by: Jeff Hostetler > --- > sha1_file.c | 40 > 1 file changed, 20 insertions(+), 20 deletions(-) The second (i.e.

Re: [PATCH v4 1/4] Makefile: generate Perl header from template file

2017-12-05 Thread Johannes Sixt
Am 01.12.2017 um 18:25 schrieb Johannes Sixt: > Am 01.12.2017 um 18:13 schrieb Johannes Schindelin: >> Hi Hannes, >> >> On Fri, 1 Dec 2017, Johannes Sixt wrote: >> >>> Am 29.11.2017 um 16:56 schrieb Dan Jacques: @@ -1989,6 +1986,15 @@ GIT-PERL-DEFINES: FORCE     echo "$$FLAGS"

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-05 Thread Jonathan Nieder
Hi, Jeff Hostetler wrote: > On 12/2/2017 1:24 PM, Philip Oakley wrote: >> From: "Jeff Hostetler" >> Sent: Friday, December 01, 2017 5:23 PM >>> Discussing this feature in the context of the defense industry >>> makes me a little nervous.  (I used to be in that area.) >>

Re: [PATCH v6 00/12] Partial clone part 2: fsck and promisors

2017-12-05 Thread Jonathan Tan
On Tue, 5 Dec 2017 16:58:42 + Jeff Hostetler wrote: > From: Jeff Hostetler > > This is V6 of part 2 of partial clone. This assumes V6 of part 1 > is already present. This version fixes a problem in fetch-pack > observed in V5. It also

Re: [WIP 1/2] submodule: refactor acquisition of superproject info

2017-12-05 Thread Stefan Beller
On Fri, Dec 1, 2017 at 2:50 PM, Jonathan Tan wrote: > Signed-off-by: Jonathan Tan > --- > submodule.c | 76 > + > submodule.h | 3 +++ This patch reads very similar to [1], which

Re: [PATCH v1 1/2] t/README: remove mention of adding copyright notices

2017-12-05 Thread Jonathan Nieder
Hi, Thomas Gummerer wrote: > We generally no longer include copyright notices in new test scripts. > However t/README still mentions it as something to include at the top of > every new script. Where can I read more about this change? Was it a deliberate change or something that simply

Re: gitattributes not read for diff-tree anymore in 2.15?

2017-12-05 Thread Ben Boeckel
On Tue, Dec 05, 2017 at 10:16:45 -0800, Brandon Williams wrote: > Perfect, thanks! OK, attached is a shell script which recreates the issue. I haven't been able to get it to happen without the `GIT_WORK_TREE` and `GIT_INDEX_FILE` setup involved, so that seems to be important. I reran the bisect

Re: [PATCH v1 2/2] t/README: document test_cmp_rev

2017-12-05 Thread Jonathan Nieder
Hi, Thomas Gummerer wrote: > test_cmp_rev is a useful function that's used in quite a few test > scripts. It is however not documented in t/README. Document it. > > Signed-off-by: Thomas Gummerer > --- > t/README | 5 + > 1 file changed, 5 insertions(+)

RE: [RFE] Inverted sparseness (amended)

2017-12-05 Thread Randall S. Becker
On December 3, 2017 6:14 PM, Philip Oakley wrote a nugget of wisdom: >From: "Randall S. Becker" >Sent: Friday, December 01, 2017 6:31 PM >> On December 1, 2017 1:19 PM, Jeff Hostetler wrote: >>>On 12/1/2017 12:21 PM, Randall S. Becker wrote: I recently encountered a

Re: [PATCH v2] pathspec: only match across submodule boundaries when requested

2017-12-05 Thread Junio C Hamano
Brandon Williams writes: > Commit 74ed43711fd (grep: enable recurse-submodules to work on > objects, 2016-12-16) taught 'tree_entry_interesting()' to be able to > match across submodule boundaries in the presence of wildcards. This is > done by performing literal matching up

Re: How hard would it be to implement sparse fetching/pulling?

2017-12-05 Thread Jeff Hostetler
On 12/2/2017 1:24 PM, Philip Oakley wrote: From: "Jeff Hostetler" Sent: Friday, December 01, 2017 5:23 PM On 11/30/2017 6:43 PM, Philip Oakley wrote: [...] Discussing this feature in the context of the defense industry makes me a little nervous.  (I used to be in

Re: gitattributes not read for diff-tree anymore in 2.15?

2017-12-05 Thread Brandon Williams
On 12/05, Ben Boeckel wrote: > On Mon, Dec 04, 2017 at 15:03:55 -0800, Brandon Williams wrote: > > Reading the attributes files should be done regardless if the gitmodules > > file is read. The gitmodules file should only come into play if you are > > dealing with submodules. > > Yeah, it

[PATCH v3 9/9] t3404: add test case for abbreviated commands

2017-12-05 Thread Liam Beguin
Make sure the todo list ends up using single-letter command abbreviations when the rebase.abbreviateCommands is enabled. This configuration option should not change anything else. Signed-off-by: Liam Beguin --- t/t3404-rebase-interactive.sh | 22 ++ 1

[PATCH v3 5/9] rebase -i: replace reference to sha1 with oid

2017-12-05 Thread Liam Beguin
Since we are trying to abstract the hash function name elsewhere in the code base, lets use OID instead of SHA-1 in the rebase--helper too. Signed-off-by: Liam Beguin --- builtin/rebase--helper.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git

[PATCH v2 0/9] rebase -i: add config to abbreviate command names

2017-12-05 Thread Liam Beguin
Hi everyone, This series will add the 'rebase.abbreviateCommands' configuration option to allow `git rebase -i` to default to the single-letter command names when generating the todo list. Using single-letter command names can present two benefits. First, it makes it easier to change the action

[PATCH v3 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Liam Beguin
Update functions used in the rebase--helper so that they take a generic 'flags' parameter instead of a growing list of options. Signed-off-by: Liam Beguin --- builtin/rebase--helper.c | 13 +++-- sequencer.c | 9 + sequencer.h |

[PATCH v3 7/9] rebase -i -x: add exec commands via the rebase--helper

2017-12-05 Thread Liam Beguin
Recent work on `git-rebase--interactive` aims to convert shell code to C. Even if this is most likely not a big performance enhancement, let's convert it too since a coming change to abbreviate command names requires it to be updated. Signed-off-by: Liam Beguin ---

[PATCH v3 4/9] rebase -i: refactor transform_todo_ids

2017-12-05 Thread Liam Beguin
The transform_todo_ids function is a little hard to read. Lets try to make it easier by using more of the strbuf API. Also, since we'll soon be adding command abbreviations, let's rename the function so it's name reflects that change. Signed-off-by: Liam Beguin ---

[PATCH v3 2/9] Documentation: use preferred name for the 'todo list' script

2017-12-05 Thread Liam Beguin
Use "todo list" instead of "instruction list" or "todo-list" to reduce further confusion regarding the name of this script. Signed-off-by: Liam Beguin --- Documentation/rebase-config.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git

[PATCH v3 8/9] rebase -i: learn to abbreviate command names

2017-12-05 Thread Liam Beguin
`git rebase -i` already know how to interpret single-letter command names. Teach it to generate the todo list with these same abbreviated names. Based-on-patch-by: Johannes Schindelin Signed-off-by: Liam Beguin ---

[PATCH v3 1/9] Documentation: move rebase.* configs to new file

2017-12-05 Thread Liam Beguin
Move all rebase.* configuration variables to a separate file in order to remove duplicates, and include it in config.txt and git-rebase.txt. The new descriptions are mostly taken from config.txt as they are more verbose. Signed-off-by: Liam Beguin ---

[PATCH v3 3/9] rebase -i: set commit to null in exec commands

2017-12-05 Thread Liam Beguin
Make sure commit is set to NULL when parsing exec instructions from the todo list. If not, we may try to access an uninitialized address later while updating the todo list. Signed-off-by: Liam Beguin --- sequencer.c | 1 + 1 file changed, 1 insertion(+) diff --git

Re: [PATCH] Documentation/git-clone: improve description for submodule recursing

2017-12-05 Thread Junio C Hamano
Stefan Beller writes: > There have been a few complaints on the mailing list that git-clone doesn't > respect the `submodule.recurse` setting, which every other command (that > potentially knows how to deal with submodules) respects. In case of clone > this is not beneficial

[PATCH v6 01/14] upload-pack: add object filtering for partial clone

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Teach upload-pack to negotiate object filtering over the protocol and to send filter parameters to pack-objects. This is intended for partial clone and fetch. The idea to make upload-pack configurable using uploadpack.allowFilter comes from Jonathan

[PATCH v6 04/14] fetch-pack: test support excluding large blobs

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Created tests to verify fetch-pack and upload-pack support for excluding large blobs using --filter=blobs:limit= parameter. Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler ---

[PATCH v6 08/14] fixup: fetch: update --blob-max-bytes to --fitler

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- t/t5500-fetch-pack.sh | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/t/t5500-fetch-pack.sh b/t/t5500-fetch-pack.sh index 65fc7bb..ec9ba9b 100755 ---

[PATCH v6 07/14] fixup: fetch: update error messages from --blob-max-bytes to --filter

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/fetch.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builtin/fetch.c b/builtin/fetch.c index 05d0b1a..14aab71 100644 --- a/builtin/fetch.c +++

[PATCH v6 09/14] fixup: connected: conditionally pass --exclude-promisor-objects to rev-list

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Teach connected.c to only pass --exclude-promisor-objects to rev-list when partial clone is enabled. Signed-off-by: Jeff Hostetler --- connected.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git

[PATCH v6 10/14] partial-clone: define partial clone settings in config

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Create get and set routines for "partial clone" config settings. These will be used in a future commit by clone and fetch to remember the promisor remote and the default filter-spec. Signed-off-by: Jeff Hostetler --- cache.h

[PATCH v6 05/14] fetch: refactor calculation of remote list

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Separate out the calculation of remotes to be fetched from and the actual fetching. This will allow us to include an additional step before the actual fetching in a subsequent commit. Signed-off-by: Jonathan Tan ---

[PATCH v6 06/14] fetch: support filters

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Teach fetch to support filters. This is only allowed for the remote configured in extensions.partialcloneremote. Signed-off-by: Jonathan Tan --- builtin/fetch.c | 23 +-- connected.c |

[PATCH v6 03/14] fetch-pack: add --no-filter

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Fixup fetch-pack to accept --no-filter to be consistent with rev-list and pack-objects. Signed-off-by: Jeff Hostetler --- builtin/fetch-pack.c | 4 1 file changed, 4 insertions(+) diff --git a/builtin/fetch-pack.c

[PATCH v6 02/14] fetch-pack, index-pack, transport: partial clone

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- builtin/fetch-pack.c | 4 fetch-pack.c | 13 + fetch-pack.h | 2 ++ transport-helper.c | 5 + transport.c | 4 transport.h |

[PATCH v6 13/14] fetch-pack: restore save_commit_buffer after use

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan In fetch-pack, the global variable save_commit_buffer is set to 0, but not restored to its original value after use. In particular, if show_log() (in log-tree.c) is invoked after fetch_pack() in the same process, show_log() will return before

[PATCH v6 14/14] t5616: end-to-end tests for partial clone

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Additional end-to-end tests for partial clone. Signed-off-by: Jeff Hostetler --- t/t5616-partial-clone.sh | 125 +++ 1 file changed, 125 insertions(+) create mode 100755

[PATCH v6 00/14] Parial clone part 3: clone, fetch, fetch-pack, upload-pack, and tests

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler This is V6 of part 3 of partial clone. It assumes that V6 of parts 1 and 2 are already present. This version is refactors and reorders commits to better combine new functionality and tests. It contains 3 fixup commits that should be squashed after

[PATCH v6 12/14] unpack-trees: batch fetching of missing blobs

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan When running checkout, first prefetch all blobs that are to be updated but are missing. This means that only one pack is downloaded during such operations, instead of one per missing blob. This operates only on the blob level - if a repository has a

[PATCH v6 11/14] clone: partial clone

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Signed-off-by: Jonathan Tan Signed-off-by: Jeff Hostetler --- builtin/clone.c | 22 -- t/t5601-clone.sh | 49 + 2 files changed,

[PATCH v6 10/12] fixup: sha1_file: add TODO

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- sha1_file.c | 4 1 file changed, 4 insertions(+) diff --git a/sha1_file.c b/sha1_file.c index ce67f27..dd956e2 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1196,6 +1196,10 @@ int

[PATCH v6 06/12] index-pack: refactor writing of .keep files

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan In a subsequent commit, index-pack will be taught to write ".promisor" files which are similar to the ".keep" files it knows how to write. Refactor the writing of ".keep" files, so that the implementation of writing ".promisor" files becomes easier.

[PATCH v6 07/12] introduce fetch-object: fetch one promisor object

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Introduce fetch-object, providing the ability to fetch one object from a promisor remote. This uses fetch-pack. To do this, the transport mechanism has been updated with 2 flags, "from-promisor" to indicate that the resulting pack comes from a

[PATCH v6 12/12] gc: do not repack promisor packfiles

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Teach gc to stop traversal at promisor objects, and to leave promisor packfiles alone. This has the effect of only repacking non-promisor packfiles, and preserves the distinction between promisor packfiles and non-promisor packfiles. Signed-off-by:

[PATCH v6 11/12] rev-list: support termination at promisor objects

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Teach rev-list to support termination of an object traversal at any object from a promisor remote (whether one that the local repo also has, or one that the local repo knows about because it has another promisor object that references it). This will

[PATCH v6 08/12] sha1_file: support lazily fetching missing objects

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Teach sha1_file to fetch objects from the remote configured in extensions.partialclone whenever an object is requested but missing. The fetching of objects can be suppressed through a global variable. This is used by fsck and index-pack. However, by

[PATCH v6 09/12] fixup: sha1_file: convert gotos to break/continue

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- sha1_file.c | 40 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index fc7718a..ce67f27 100644 ---

[PATCH v6 03/12] fsck: support refs pointing to promisor objects

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat refs referring to missing promisor objects as an error when extensions.partialclone is set. For the purposes of warning about no default refs, such refs are still treated as legitimate refs. Signed-off-by: Jonathan Tan

[PATCH v6 05/12] fsck: support promisor objects as CLI argument

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat missing promisor objects provided on the CLI as an error when extensions.partialclone is set. Signed-off-by: Jonathan Tan --- builtin/fsck.c | 2 ++ t/t0410-partial-clone.sh | 13

[PATCH v6 04/12] fsck: support referenced promisor objects

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Teach fsck to not treat missing promisor objects indirectly pointed to by refs as an error when extensions.partialclone is set. Signed-off-by: Jonathan Tan --- builtin/fsck.c | 11 +++

[PATCH v6 00/12] Partial clone part 2: fsck and promisors

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler This is V6 of part 2 of partial clone. This assumes V6 of part 1 is already present. This version fixes a problem in fetch-pack observed in V5. It also contains 2 "fixup" commits that are WIP responses to comments on V5. Part 2 is concerned with

[PATCH v6 02/12] fsck: introduce partialclone extension

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Currently, Git does not support repos with very large numbers of objects or repos that wish to minimize manipulation of certain blobs (for example, because they are very large) very well, even if the user operates mostly on part of the repo, because

[PATCH v6 01/12] extension.partialclone: introduce partial clone extension

2017-12-05 Thread Jeff Hostetler
From: Jonathan Tan Introduce new repository extension option: `extensions.partialclone` See the update to Documentation/technical/repository-version.txt in this patch for more information. Signed-off-by: Jonathan Tan ---

[PATCH v6 1/3] list-objects-filter-options: fix 'keword' typo in comment

2017-12-05 Thread Jeff Hostetler
From: Christian Couder Signed-off-by: Christian Couder Signed-off-by: Jeff Hostetler --- list-objects-filter-options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/list-objects-filter-options.c

[PATCH v6 2/3] list-objects-filter-options: support --no-filter

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Teach opt_parse_list_objects_filter() to take --no-filter option and to free the contents of struct filter_options. This command line argument will be automatically inherited by commands using OPT_PARSE_LIST_OBJECTS_FILTER(); this includes

[PATCH v6 3/3] rev-list: support --no-filter argument

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Teach rev-list to support --no-filter to override a previous --filter= argument. This is to be consistent with commands that use OPT_PARSE macros. Signed-off-by: Jeff Hostetler --- Documentation/rev-list-options.txt | 15

[PATCH v6 0/3] Partial clone part 1: object filtering

2017-12-05 Thread Jeff Hostetler
From: Jeff Hostetler Here is V6 of the list-object filtering, rev-list, and pack-objects. This is an incremental patch series to be applied on top of V5 which is already in 'next'. This version fixes a typo, add the --no-filter option, eliminates a couple of asserts(),

Re: [PATCH 3/4] Makefile: use the sha1collisiondetection submodule by default

2017-12-05 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Change the build process so that instead of needing to supply > DC_SHA1_SUBMODULE=YesPlease to use the sha1collisiondetection > submodule instead of the copy of the same code shipped in the sha1dc > directory, it uses the submodule by default

Re: [PATCH v5 07/10] introduce fetch-object: fetch one promisor object

2017-12-05 Thread Jeff Hostetler
On 12/2/2017 3:33 PM, Christian Couder wrote: On Tue, Nov 21, 2017 at 10:07 PM, Jeff Hostetler wrote: From: Jonathan Tan +void fetch_object(const char *remote_name, const unsigned char *sha1) +{ + struct remote *remote; +

RE: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Kerry, Richard
Indeed so. In which case it is short for "selling short", or possibly "short selling". Of course a little searching shows that "shorted" could mean some other things, including possibly the meaning originally suggested. Nevertheless it seems to me that "shortened" is the most appropriate word in

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Junio C Hamano
"Kerry, Richard" writes: > "Shorted" is what happens when you put a piece of wire across the terminals > of a battery ... (bang, smoke, etc). > It's short for "short-circuited". Or it is what you do to something that you sell and that you yet do not own, expecting that

Re: [PATCH v6 4/7] checkout: describe_detached_head: remove ellipsis after committish

2017-12-05 Thread Junio C Hamano
Ann T Ropea writes: > v6: polish to take Junio's comments from > into account > t/t2020-checkout-detach.sh| 114 > ++ > ... Thanks; with this one replaced, I'd expect that poisoned

Re: [PATCH v5 08/10] sha1_file: support lazily fetching missing objects

2017-12-05 Thread Jeff Hostetler
On 12/2/2017 1:29 PM, Christian Couder wrote: On Tue, Nov 21, 2017 at 10:07 PM, Jeff Hostetler wrote: From: Jonathan Tan [...] int sha1_object_info_extended(const unsigned char *sha1, struct object_info *oi, unsigned flags) { [...]

Re: [PATCH v5 10/10] gc: do not repack promisor packfiles

2017-12-05 Thread Jeff Hostetler
On 12/2/2017 12:39 PM, Christian Couder wrote: On Tue, Nov 21, 2017 at 10:07 PM, Jeff Hostetler wrote: From: Jonathan Tan pack_as_from_promisor () { HASH=$(git -C repo pack-objects .git/objects/pack/pack) &&

Re: gitattributes not read for diff-tree anymore in 2.15?

2017-12-05 Thread Ben Boeckel
On Mon, Dec 04, 2017 at 15:03:55 -0800, Brandon Williams wrote: > Reading the attributes files should be done regardless if the gitmodules > file is read. The gitmodules file should only come into play if you are > dealing with submodules. Yeah, it doesn't seem to make sense why this commit

Re: [PATCH] imap-send: URI encode server folder

2017-12-05 Thread Junio C Hamano
Eric Sunshine writes: > ... Can you > expand the commit message a bit to make it more self-contained? At > minimum, perhaps show the error message you were experiencing, and > cite (as Daniel pointed out) RFC 3986 and the bit about a "legal" URL > not containing

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread liam Beguin
Hi, On 05/12/17 07:41 AM, Kerry, Richard wrote: > > "Shorted" is what happens when you put a piece of wire across the terminals > of a battery ... (bang, smoke, etc). > It's short for "short-circuited". > Yes, I think you mean "shortened" in this case. > Thanks for the explanation. Sorry, my

[PATCH v3] git-gui: Prevent double UTF-8 conversion

2017-12-05 Thread Łukasz Stelmach
Convert author's name and e-mail address from the UTF-8 (or any other) encoding in load_last_commit function the same way commit message is converted. Amending commits in git-gui without such conversion breaks UTF-8 strings. For example, "\305\201ukasz" (as written by git cat-file) becomes

Re: [PATCH 3/4] Makefile: use the sha1collisiondetection submodule by default

2017-12-05 Thread Ævar Arnfjörð Bjarmason
On Tue, Dec 05 2017, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >>> I'm not sure how I feel about this. I see your point that there's no >>> real value in maintaining two systems indefinitely. At the same time, I >>> wonder how much value the submodule

Re: [PATCH 3/4] Makefile: use the sha1collisiondetection submodule by default

2017-12-05 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: >> I'm not sure how I feel about this. I see your point that there's no >> real value in maintaining two systems indefinitely. At the same time, I >> wonder how much value the submodule strategy is actually bringing us. >> >> IOW, are we agreed

Re: [PATCH v2 1/2] git-prompt: make __git_eread intended use explicit

2017-12-05 Thread Junio C Hamano
Robert Abel writes: > On 05 Dec 2017 01:27, Junio C Hamano wrote: >> I know all of the above, but I think you misunderstood the point I >> wanted to raise, so let me try again. The thing is, none of what >> you just wrote changes the fact that lack of callers that want to

RE: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Kerry, Richard
"Shorted" is what happens when you put a piece of wire across the terminals of a battery ... (bang, smoke, etc). It's short for "short-circuited". Yes, I think you mean "shortened" in this case. Regards, Richard. Richard Kerry BNCS Engineer, SI SOL Telco & Media Vertical Practice T: +44

Re: [PATCH v2 6/9] rebase -i: update functions to use a flags parameter

2017-12-05 Thread Junio C Hamano
liam Beguin writes: > I'll change it to TODO_LIST_SHORTED_IDs. TODO_LIST_SHORTED_INSNS would > suggest the flag changes both parts of the todo. I am not a native speaker, but SHORTED does not sound like a right phrase. When you make something shorter, that thing is

Re: [PATCH v2 4/9] rebase -i: refactor transform_todo_ids

2017-12-05 Thread Junio C Hamano
liam Beguin writes: > Good suggestion. Would transform_todos() work too? If the function is about munging multiple of them, then todo"s" would work well; I wasn't focusing on singular vs plural, as I thought the choice between them needs much less thought to make

Re: [PATCH 2/2] progress: drop delay-threshold code

2017-12-05 Thread Lars Schneider
> On 05 Dec 2017, at 12:10, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Dec 5, 2017 at 11:37 AM, Lars Schneider > wrote: >> >>> On 04 Dec 2017, at 23:07, Jeff King wrote: >>> >>> From: Lars Schneider >>>

Re: [PATCH v4 9/9] t3512/t3513: remove KNOWN_FAILURE_CHERRY_PICK_SEES_EMPTY_COMMIT=1

2017-12-05 Thread Phillip Wood
On 04/12/17 19:24, Stefan Beller wrote: > On Fri, Nov 24, 2017 at 3:07 AM, Phillip Wood > wrote: >> From: Phillip Wood >> >> Now that the sequencer creates commits without forking 'git commit' it >> does not see an empty commit in these

Re: [PATCH v4 7/9] sequencer: load commit related config

2017-12-05 Thread Phillip Wood
On 05/12/17 11:21, Phillip Wood wrote: > On 04/12/17 18:30, Junio C Hamano wrote: >> Phillip Wood writes: >> >>> --- a/builtin/rebase--helper.c >>> +++ b/builtin/rebase--helper.c >>> @@ -9,6 +9,17 @@ static const char * const builtin_rebase_helper_usage[] = { >>>

Re: [PATCH v4 7/9] sequencer: load commit related config

2017-12-05 Thread Phillip Wood
On 04/12/17 18:30, Junio C Hamano wrote: > Phillip Wood writes: > >> --- a/builtin/rebase--helper.c >> +++ b/builtin/rebase--helper.c >> @@ -9,6 +9,17 @@ static const char * const builtin_rebase_helper_usage[] = { >> NULL >> }; >> >> +static int

Re: [PATCH 2/2] progress: drop delay-threshold code

2017-12-05 Thread Ævar Arnfjörð Bjarmason
On Tue, Dec 5, 2017 at 11:37 AM, Lars Schneider wrote: > >> On 04 Dec 2017, at 23:07, Jeff King wrote: >> >> From: Lars Schneider >> >> Since 180a9f2268 (provide a facility for "delayed" progress >> reporting, 2007-04-20), the

Re: [PATCH 2/2] progress: drop delay-threshold code

2017-12-05 Thread Lars Schneider
> On 04 Dec 2017, at 23:07, Jeff King wrote: > > From: Lars Schneider > > Since 180a9f2268 (provide a facility for "delayed" progress > reporting, 2007-04-20), the progress code has allowed > callers to skip showing progress if they have reached a >

  1   2   >