[PATCH] doc: put literal block delimiter around table

The git-read-tree manpage has a table that is meant to be shown with its spacing exactly as it is in the source. We mark it as a "literal paragraph" by indenting each line by at least one space. This renders OK with asciidoc for both the HTML and manpage versions. But there are two problems when

Posible SPAM: Hello

I am Ms.Ella Golan, I am the Executive Vice President Banking Division with FIRST INTERNATIONAL BANK OF ISRAEL LTD (FIBI). I am getting in touch with you regarding an extremely important and urgent matter. If you would oblige me the opportunity, I shall provide you with details upon your

[PATCH v2] doc: camelCase the config variables to improve readability

A few configuration variable names of Git are composite words. References to such variables in manpages are hard to read because they use all-lowercase names, without indicating where each word ends and begins. Improve its readability by using camelCase instead. Git treats these names

Re: [PATCH v2 6/6] pack-bitmap[-write]: use `object_array_clear()`, don't leak

On Sat, Sep 23, 2017 at 01:34:54AM +0200, Martin Ågren wrote: > Instead of setting the fields of rev->pending to 0/NULL, thereby leaking > memory, call `object_array_clear(>pending)`. I wondered if these cases might sometimes work on an uninitialized struct (so setting the fields unconditionally

Re: [PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes

On Sat, Sep 23, 2017 at 01:34:48AM +0200, Martin Ågren wrote: > Martin Ågren (6): > builtin/commit: fix memory leak in `prepare_index()` > commit: fix memory leak in `reduce_heads()` > leak_pending: use `object_array_clear()`, not `free()` > object_array: use `object_array_clear()`, not

Re: [PATCH v2 5/6] object_array: add and use `object_array_pop()`

On Sat, Sep 23, 2017 at 01:34:53AM +0200, Martin Ågren wrote: > In a couple of places, we pop objects off an object array `foo` by > decreasing `foo.nr`. We access `foo.nr` in many places, but most if not > all other times we do so read-only, e.g., as we iterate over the array. > But when we

Re: [PATCH v2 4/6] object_array: use `object_array_clear()`, not `free()`

On Sat, Sep 23, 2017 at 01:34:52AM +0200, Martin Ågren wrote: > Instead of freeing `foo.objects` for an object array `foo` (sometimes > conditionally), call `object_array_clear()`. This means we don't > poke as much into the implementation, which is already a good thing, but > also that we

Re: [PATCH v2 3/6] leak_pending: use `object_array_clear()`, not `free()`

On Sat, Sep 23, 2017 at 01:34:51AM +0200, Martin Ågren wrote: > Setting `leak_pending = 1` tells `prepare_revision_walk()` not to > release the `pending` array, and makes that the caller's responsibility. > See 4a43d374f (revision: add leak_pending flag, 2011-10-01) and > 353f5657a (bisect: use

Re: [PATCH] git: add --no-optional-locks option

On Fri, Sep 22, 2017 at 02:41:06PM -0700, Stefan Beller wrote: > > Ah, thanks. I _thought_ we could already do that but when I went looking > > for the standard --recursive option I couldn't find it. > > Thanks for checking for submodules there. > > I personally prefer --recurse-submodules

Re: [PATCH 00/13] RFC object filtering for parital clone

On Fri, 22 Sep 2017 20:26:19 + Jeff Hostetler wrote: > This draft contains filters to: > () omit all blobs > () omit blobs larger than some size > () omit blobs using a sparse-checkout specification > > In addition to specifying the filter criteria, the rev-list

Re: [PATCH 1/4] git-merge: Honor pre-merge hook

On 22 September 2017 at 14:04, Michael J Gruber wrote: > From: Michael J Gruber > > git-merge does not honor the pre-commit hook when doing automatic merge > commits, and for compatibility reasons this is going to stay. > > Introduce a pre-merge hook

Re: [PATCH v8 08/12] fsmonitor: add a test tool to dump the index extension

On 22 September 2017 at 18:35, Ben Peart wrote: > Add a test utility (test-dump-fsmonitor) that will dump the fsmonitor > index extension. > > Signed-off-by: Ben Peart > --- > Makefile | 1 + > t/helper/test-dump-fsmonitor.c

Re: [PATCH v8 01/12] bswap: add 64 bit endianness helper get_be64

On 22 September 2017 at 18:35, Ben Peart wrote: > Add a new get_be64 macro to enable 64 bit endian conversions on memory > that may or may not be aligned. I needed this to compile and pass the tests with NO_UNALIGNED_LOADS. Martin diff --git a/compat/bswap.h

[PATCH v2 3/6] leak_pending: use `object_array_clear()`, not `free()`

Setting `leak_pending = 1` tells `prepare_revision_walk()` not to release the `pending` array, and makes that the caller's responsibility. See 4a43d374f (revision: add leak_pending flag, 2011-10-01) and 353f5657a (bisect: use leak_pending flag, 2011-10-01). Commit 1da1e07c8 (clean up name

[PATCH v2 6/6] pack-bitmap[-write]: use `object_array_clear()`, don't leak

Instead of setting the fields of rev->pending to 0/NULL, thereby leaking memory, call `object_array_clear(>pending)`. In pack-bitmap.c, we make copies of those fields as `pending_nr` and `pending_e`. We never update the aliases and the original fields never change, so the aliases are not really

[PATCH v2 5/6] object_array: add and use `object_array_pop()`

In a couple of places, we pop objects off an object array `foo` by decreasing `foo.nr`. We access `foo.nr` in many places, but most if not all other times we do so read-only, e.g., as we iterate over the array. But when we change `foo.nr` behind the array's back, it feels a bit nasty and looks

[PATCH v2 4/6] object_array: use `object_array_clear()`, not `free()`

Instead of freeing `foo.objects` for an object array `foo` (sometimes conditionally), call `object_array_clear()`. This means we don't poke as much into the implementation, which is already a good thing, but also that we release the individual entries as well, thereby fixing at least one

[PATCH v2 1/6] builtin/commit: fix memory leak in `prepare_index()`

Release `pathspec` and the string list `partial`. When we clear the string list, make sure we do not free the `util` pointers. That would result in double-freeing, since we set them up as `item->util = item` in `list_paths()`. Initialize the string list early, so that we can always release it.

[PATCH v2 0/6] reroll ma/plugleaks; more `object_array`-fixes

On 20 September 2017 at 22:02, Jeff King wrote: > On Wed, Sep 20, 2017 at 09:47:24PM +0200, Martin Ågren wrote: > >> Instead of conditionally freeing `rev.pending.objects`, just call >> `object_array_clear()` on `rev.pending`. This means we don't poke as >> much into the

[PATCH v2 2/6] commit: fix memory leak in `reduce_heads()`

We don't free the temporary scratch space we use with `remove_redundant()`. Free it similar to how we do it in `get_merge_bases_many_0()`. Signed-off-by: Martin Ågren Reviewed-by: Jeff King Signed-off-by: Junio C Hamano --- commit.c |

Re: [PATCHv2] Documentation/config: clarify the meaning of submodule..update

Stefan Beller wrote: > Reported-by: Lars Schneider > Signed-off-by: Stefan Beller > --- > Documentation/config.txt | 12 > 1 file changed, 8 insertions(+), 4 deletions(-) > > Jonathan writes: >> You'll want to update

Re: RFC: Design and code of partial clones (now, missing commits and trees OK) (part 3)

On Fri, 22 Sep 2017 17:32:00 -0400 Jeff Hostetler wrote: > I guess I'm afraid that the first call to is_promised() is going > cause a very long pause as it loads up a very large hash of objects. Yes, the first call will cause a long pause. (I think fsck and gc can

[PATCHv2] Documentation/config: clarify the meaning of submodule..update

With more commands (that potentially change a submodule) paying attention to submodules as well as the recent discussion[1] on submodule..update, let's spell out that submodule..update is strictly to be used for configuring the "submodule update" command and not to be obeyed by other commands.

Re: RFC: Design and code of partial clones (now, missing commits and trees OK) (part 2/3)

On Fri, 22 Sep 2017 17:19:50 -0400 Jeff Hostetler wrote: > > In your specific example, how would rev-list know, on the client, to > > include (or exclude) a large blob in its output if it does not have it, > > and thus does not know its size? > > > > The client doesn't

Re: RFC: Design and code of partial clones (now, missing commits and trees OK)

On Fri, 22 Sep 2017 17:02:11 -0400 Jeff Hostetler wrote: > > I was struggling a bit with the terminology, true. > > > > Right now I'm thinking of: > > - promisor remote (as you defined) > > - promisor packfile (as you defined) > > - promisor object is an object

Re: [PATCH v4] connect: in ref advertisement, shallows are last

On Fri, 22 Sep 2017 14:01:04 -0700 Brandon Williams wrote: > > +static void process_capabilities(int len) > > +{ > > + int nul_location = strlen(packet_buffer); > > It may make more sense to not rely on accessing a global buffer here > directly and instead pass in the buff

Re: [PATCH] git: add --no-optional-locks option

On Fri, Sep 22, 2017 at 2:25 PM, Jeff King wrote: > On Fri, Sep 22, 2017 at 01:09:32PM -0700, Stefan Beller wrote: > >> On Thu, Sep 21, 2017 at 9:25 PM, Jeff King wrote: >> >> > >> > But imagine that "git status" learns to recurse into submodules and run >> > "git

Re: [PATCH] Documentation/config: clarify the meaning of submodule..update

Hi, Stefan Beller wrote: > With more commands (that potentially change a submodule) paying attention > to submodules as well as the recent discussion[1] on submodule..update, > let's spell out that submodule..update is strictly to be used > for configuring the "submodule update" command and not

Re: RFC: Design and code of partial clones (now, missing commits and trees OK) (part 3)

On 9/21/2017 7:04 PM, Jonathan Tan wrote: On Thu, 21 Sep 2017 14:00:40 -0400 Jeff Hostetler wrote: (part 3) Additional overall comments on: https://github.com/jonathantanmy/git/commits/partialclone2 {} WRT the code in is_promised() [1] [1]

[PATCH] Documentation/config: clarify the meaning of submodule..update

With more commands (that potentially change a submodule) paying attention to submodules as well as the recent discussion[1] on submodule..update, let's spell out that submodule..update is strictly to be used for configuring the "submodule update" command and not to be obeyed by other commands.

Re: [PATCH] git: add --no-optional-locks option

On Fri, Sep 22, 2017 at 01:09:32PM -0700, Stefan Beller wrote: > On Thu, Sep 21, 2017 at 9:25 PM, Jeff King wrote: > > > > > But imagine that "git status" learns to recurse into submodules and run > > "git status" inside them. Surely we would want the submodule repos to > > also

Re: RFC: Design and code of partial clones (now, missing commits and trees OK) (part 2/3)

On 9/21/2017 6:51 PM, Jonathan Tan wrote: On Thu, 21 Sep 2017 13:59:43 -0400 Jeff Hostetler wrote: (part 2) Additional overall comments on: https://github.com/jonathantanmy/git/commits/partialclone2 {} I think it would help to split the blob-max-bytes filtering and

RE: Message Notice!!

There is a transaction proposal attached to your name with ID: git@vger.kernel.org in this office, you are please advised to respond for more details. Thank You. Fawaz Al Saleh

Re: RFC: Design and code of partial clones (now, missing commits and trees OK)

On 9/21/2017 6:42 PM, Jonathan Tan wrote: On Thu, 21 Sep 2017 13:57:30 -0400 Jeff Hostetler wrote: There's a lot in this patch series. I'm still studying it, but here are some notes and questions. I'll start with direct responses to the RFC here and follow up in a

Re: [PATCH v4] connect: in ref advertisement, shallows are last

On 09/22, Jonathan Tan wrote: > Currently, get_remote_heads() parses the ref advertisement in one loop, > allowing refs and shallow lines to intersperse, despite this not being > allowed by the specification. Refactor get_remote_heads() to use two > loops instead, enforcing that refs come first,

Re: [PATCH 02/13] oidset2: create oidset subclass with object length and pathname

On 09/22, Jeff Hostetler wrote: > From: Jeff Hostetler > > Create subclass of oidset where each entry has a > field to store the length of the object's content > and an optional pathname. > > This will be used in a future commit to build a > manifest of omitted objects

[PATCH 11/13] t6112: rev-list object filtering test

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- t/t6112-rev-list-filters-objects.sh | 237 1 file changed, 237 insertions(+) create mode 100755 t/t6112-rev-list-filters-objects.sh diff --git

[PATCH 13/13] pack-objects: add filtering help text

From: Jeff Hostetler Add help text for new object filtering options to pack-objects documentation. Signed-off-by: Jeff Hostetler --- Documentation/git-pack-objects.txt | 17 + 1 file changed, 17 insertions(+) diff --git

[PATCH 12/13] pack-objects: add object filtering support

From: Jeff Hostetler Teach pack-objects to use the filtering provided by the traverse_commit_list_filtered() interface to omit unwanted objects from the resulting packfile. This feature is intended for partial clone/fetch. Filtering requires the use of the "--stdout"

[PATCH 09/13] rev-list: add object filtering support

From: Jeff Hostetler Teach rev-list to use the filtering provided by the traverse_commit_list_filtered() interface to omit unwanted objects from the result. This feature is only enabled when one of the "--objects*" options are used. When the "--filter-print-manifest"

[PATCH 10/13] rev-list: add filtering help text

From: Jeff Hostetler Signed-off-by: Jeff Hostetler --- Documentation/git-rev-list.txt | 9 - Documentation/rev-list-options.txt | 32 2 files changed, 40 insertions(+), 1 deletion(-) diff --git

[PATCH 08/13] list-objects: add traverse_commit_list_filtered method

From: Jeff Hostetler Add traverse_commit_list_filtered() wrapper around the various filter methods using common data in object_filter_options. Signed-off-by: Jeff Hostetler --- list-objects.c | 34 ++

[PATCH 06/13] list-objects-filter-sparse: add sparse-checkout based filter

From: Jeff Hostetler Create a filter for traverse_commit_list_worker() to only include the blobs the would be referenced by a sparse-checkout using the given specification. A future enhancement should be able to also omit unneeded tree objects, but that is not currently

[PATCH 05/13] list-objects-filter-large: add large blob filter to list-objects

From: Jeff Hostetler Create a filter for traverse_commit_list_worker() to omit blobs larger than a requested size from the result, but always include ".git*" special files. Signed-off-by: Jeff Hostetler @microsoft.com> --- Makefile| 1 +

[PATCH 07/13] object-filter: common declarations for object filtering

From: Jeff Hostetler Create common routines and defines for parsing object-filter-related command line arguments and pack-protocol fields. Signed-off-by: Jeff Hostetler --- Makefile| 1 + object-filter.c | 269

[PATCH 00/13] RFC object filtering for parital clone

From: Jeff Hostetler This patch series contains WIP code demonstrating object (blob) filtering in rev-list and pack-objects using a common filtering API in list-objects and traverse-commit-list that allows both commands to perform the same type of filter operations. And

[PATCH 01/13] dir: refactor add_excludes()

From: Jeff Hostetler Refactor add_excludes() to separate the reading of the exclude file into a buffer and the parsing of the buffer into exclude_list items. Add add_excludes_from_blob_to_list() to allow an exclude file be specified with an OID. Signed-off-by: Jeff

[PATCH 02/13] oidset2: create oidset subclass with object length and pathname

From: Jeff Hostetler Create subclass of oidset where each entry has a field to store the length of the object's content and an optional pathname. This will be used in a future commit to build a manifest of omitted objects in a partial/narrow clone/fetch. Signed-off-by:

[PATCH 03/13] list-objects: filter objects in traverse_commit_list

From: Jeff Hostetler Create traverse_commit_list_filtered() and add filtering interface to allow certain objects to be omitted (not shown) during a traversal. Update traverse_commit_list() to be a wrapper for the above. Filtering will be used in a future commit by

[PATCH 04/13] list-objects-filter-all: add filter to omit all blobs

From: Jeff Hostetler Create a simple filter for traverse_commit_list_worker() to omit all blobs from the result. This filter will be used in a future commit by rev-list and pack-objects to create a "commits and trees" result. This is intended for partial clone and fetch

[PATCH v4] connect: in ref advertisement, shallows are last

Currently, get_remote_heads() parses the ref advertisement in one loop, allowing refs and shallow lines to intersperse, despite this not being allowed by the specification. Refactor get_remote_heads() to use two loops instead, enforcing that refs come first, and then shallows. This also makes it

Re: [PATCH] git: add --no-optional-locks option

On Thu, Sep 21, 2017 at 9:25 PM, Jeff King wrote: > > But imagine that "git status" learns to recurse into submodules and run > "git status" inside them. Surely we would want the submodule repos to > also avoid taking any unnecessary locks? You can teach Git to recurse into

Re: [PATCH 4/4] t7503: add tests for pre-merge-hook

On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber wrote: > --- a/t/t7503-pre-commit-hook.sh > +++ b/t/t7503-pre-commit-hook.sh > -test_description='pre-commit hook' > +test_description='pre-commit and pre-merge hooks' Tangent: do we also want to rename the file? >

Re: [PATCH 2/4] merge: do no-verify like commit

On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber wrote: > f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07) > introduced the no-verify to merge for bypassing the commit-msg hook, > though in a different way from the implementation in commit.c. > > Change

Re: [PATCH 1/4] git-merge: Honor pre-merge hook

On Fri, Sep 22, 2017 at 5:04 AM, Michael J Gruber wrote: > From: Michael J Gruber > > git-merge does not honor the pre-commit hook when doing automatic merge > commits, and for compatibility reasons this is going to stay. > > Introduce a pre-merge hook

Re: [PATCH 4/4] ALLOC_GROW: avoid -Wsign-compare warnings

On 22/09/17 17:25, SZEDER Gábor wrote: > > At first I was somewhat puzzled by the "ALLOC_GROW:" prefix in the > subject line, because this patch doesn't touch ALLOC_GROW() at all. > However, since ALLOC_GROW() is a macro, of course, and since this > patch changes the data type of variables

Re: [PATCH 3/4] cache.h: hex2chr() - avoid -Wsign-compare warnings

Am 22.09.2017 um 07:47 schrieb Jeff King: > On Thu, Sep 21, 2017 at 05:48:38PM +0100, Ramsay Jones wrote: > >> diff --git a/cache.h b/cache.h >> index a916bc79e..a0e3e362c 100644 >> --- a/cache.h >> +++ b/cache.h >> @@ -1243,8 +1243,8 @@ static inline unsigned int hexval(unsigned char c) >>*/

Re: [PATCH v3] connect: in ref advertisement, shallows are last

On 09/22, Junio C Hamano wrote: > Junio C Hamano writes: > > > Jonathan Tan writes: > > > >> Currently, get_remote_heads() parses the ref advertisement in one loop, > >> allowing refs and shallow lines to intersperse, despite this not being > >>

[PATCH v8 07/12] update-index: add fsmonitor support to update-index

Add support in update-index to manually add/remove the fsmonitor extension via --[no-]fsmonitor flags. Add support in update-index to manually set/clear the fsmonitor valid bit via --[no-]fsmonitor-valid flags. Signed-off-by: Ben Peart --- builtin/update-index.c | 33

[PATCH v8 08/12] fsmonitor: add a test tool to dump the index extension

Add a test utility (test-dump-fsmonitor) that will dump the fsmonitor index extension. Signed-off-by: Ben Peart --- Makefile | 1 + t/helper/test-dump-fsmonitor.c | 21 + 2 files changed, 22 insertions(+) create mode 100644

[PATCH v8 04/12] fsmonitor: teach git to optionally utilize a file system monitor to speed up detecting new or changed files.

When the index is read from disk, the fsmonitor index extension is used to flag the last known potentially dirty index entries. The registered core.fsmonitor command is called with the time the index was last updated and returns the list of files changed since that time. This list is used to flag

[PATCH v8 11/12] fsmonitor: add a sample integration script for Watchman

This script integrates the new fsmonitor capabilities of git with the cross platform Watchman file watching service. To use the script: Download and install Watchman from https://facebook.github.io/watchman/. Rename the sample integration hook from fsmonitor-watchman.sample to fsmonitor-watchman.

[PATCH v8 09/12] split-index: disable the fsmonitor extension when running the split index test

The split index test t1700-split-index.sh has hard coded SHA values for the index. Currently it supports index V4 and V3 but assumes there are no index extensions loaded. When manually forcing the fsmonitor extension to be turned on when running the test suite, the SHA values no longer match

[PATCH v8 06/12] ls-files: Add support in ls-files to display the fsmonitor valid bit

Add a new command line option (-f) to ls-files to have it use lowercase letters for 'fsmonitor valid' files Signed-off-by: Ben Peart --- builtin/ls-files.c | 8 ++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/builtin/ls-files.c b/builtin/ls-files.c

[PATCH v8 10/12] fsmonitor: add test cases for fsmonitor extension

Test the ability to add/remove the fsmonitor index extension via update-index. Test that dirty files returned from the integration script are properly represented in the index extension and verify that ls-files correctly reports their state. Test that ensure status results are correct when using

[PATCH v8 05/12] fsmonitor: add documentation for the fsmonitor extension.

This includes the core.fsmonitor setting, the fsmonitor integration hook, and the fsmonitor index extension. Also add documentation for the new fsmonitor options to ls-files and update-index. Signed-off-by: Ben Peart --- Documentation/config.txt | 7

[PATCH v8 12/12] fsmonitor: add a performance test

Add a test utility (test-drop-caches) that flushes all changes to disk then drops file system cache on Windows, Linux, and OSX. Add a perf test (p7519-fsmonitor.sh) for fsmonitor. By default, the performance test will utilize the Watchman file system monitor if it is installed. If Watchman is

[PATCH v8 03/12] update-index: add a new --force-write-index option

At times, it makes sense to avoid the cost of writing out the index when the only changes can easily be recomputed on demand. This causes problems when trying to write test cases to verify that state as they can't guarantee the state has been persisted to disk. Add a new option

[PATCH v8 00/12] Fast git status via a file system watcher

Thanks again to everyone who provided feedback. There are several spelling, documentation, and code comment changes. The only behavioral change from V7 is the removal of unnecessary uses of CE_MATCH_IGNORE_FSMONITOR. With a better understanding of *why* the CE_MATCH_IGNORE_* flags are used, it

[PATCH v8 01/12] bswap: add 64 bit endianness helper get_be64

Add a new get_be64 macro to enable 64 bit endian conversions on memory that may or may not be aligned. Signed-off-by: Ben Peart --- compat/bswap.h | 22 ++ 1 file changed, 22 insertions(+) diff --git a/compat/bswap.h b/compat/bswap.h index

[PATCH v8 02/12] preload-index: add override to enable testing preload-index

By default, the preload index code path doesn't run unless there is a minimum of 1000 files. To enable running the test suite and having it execute the preload-index path, add an environment variable (GIT_FORCE_PRELOAD_TEST) which will override that minimum and set it to 2. This enables you run

Re: [PATCH 4/3] branch: fix "copy" to never touch HEAD

On 09/22, Junio C Hamano wrote: > When creating a new branch B by copying the branch A that happens to > be the current branch, it also updates HEAD to point at the new > branch. It probably was made this way because "git branch -c A B" > piggybacked its implementation on "git branch -m A B", >

Re: [PATCH 4/4] ALLOC_GROW: avoid -Wsign-compare warnings

At first I was somewhat puzzled by the "ALLOC_GROW:" prefix in the subject line, because this patch doesn't touch ALLOC_GROW() at all. However, since ALLOC_GROW() is a macro, of course, and since this patch changes the data type of variables "passed" to ALLOC_GROW(), that's sort of fine... But

Re: [PATCH 3/4] cache.h: hex2chr() - avoid -Wsign-compare warnings

On 22/09/17 17:11, Jeff King wrote: > On Fri, Sep 22, 2017 at 05:05:03PM +0100, Ramsay Jones wrote: > >>> As an aside, I also see some uses of hexval() that don't appear to be >>> quite as rigorous in checking for invalid characters. A few >>> unconditionally shift the first nibble and assume

Re: [PATCH 3/4] cache.h: hex2chr() - avoid -Wsign-compare warnings

On Fri, Sep 22, 2017 at 12:18:17PM -0400, Jeff King wrote: > > I think if this function is fed an empty string that it will also read > > past the end of the buffer for in[1]. It shouldn't matter, since the NUL > > in in[0] would cause us to return an error regardless, but it's still > >

Re: [PATCH 3/4] cache.h: hex2chr() - avoid -Wsign-compare warnings

On Fri, Sep 22, 2017 at 12:11:59PM -0400, Jeff King wrote: > On Fri, Sep 22, 2017 at 05:05:03PM +0100, Ramsay Jones wrote: > > > > As an aside, I also see some uses of hexval() that don't appear to be > > > quite as rigorous in checking for invalid characters. A few > > > unconditionally shift

Re: [PATCH 3/4] cache.h: hex2chr() - avoid -Wsign-compare warnings

On Fri, Sep 22, 2017 at 05:05:03PM +0100, Ramsay Jones wrote: > > As an aside, I also see some uses of hexval() that don't appear to be > > quite as rigorous in checking for invalid characters. A few > > unconditionally shift the first nibble and assume that there will still > > be high bits set.

Re: [PATCH 3/4] cache.h: hex2chr() - avoid -Wsign-compare warnings

On 22/09/17 06:47, Jeff King wrote: > On Thu, Sep 21, 2017 at 05:48:38PM +0100, Ramsay Jones wrote: > >> diff --git a/cache.h b/cache.h >> index a916bc79e..a0e3e362c 100644 >> --- a/cache.h >> +++ b/cache.h >> @@ -1243,8 +1243,8 @@ static inline unsigned int hexval(unsigned char c) >> */ >>

Re: [PATCH] git: add --no-optional-locks option

On Fri, Sep 22, 2017 at 01:42:10AM -0500, Daniel Santos wrote: > > But taking the index lock may conflict with other operations > > in the repository. Especially ones that the user is doing > > themselves, which _aren't_ opportunistic. In other words, > > "git status" knows how to back off when

Re: [PATCH 2/4] commit-slab.h: avoid -Wsign-compare warnings

On Fri, Sep 22, 2017 at 04:46:48PM +0100, Ramsay Jones wrote: > >> - int nth_slab, nth_slot; \ > >> + unsigned int nth_slab, nth_slot;\ > > > > I have a feeling that in the long run these should all be size_t, but > > it's

Re: [PATCH 2/4] commit-slab.h: avoid -Wsign-compare warnings

On 22/09/17 06:29, Jeff King wrote: > On Thu, Sep 21, 2017 at 05:47:36PM +0100, Ramsay Jones wrote: > >> diff --git a/commit-slab.h b/commit-slab.h >> index 333d81e37..dcaab8ca0 100644 >> --- a/commit-slab.h >> +++ b/commit-slab.h >> @@ -78,7 +78,7 @@ static MAYBE_UNUSED void init_

Re: [PATCH 4/4] ALLOC_GROW: avoid -Wsign-compare warnings

On 22/09/17 05:20, Junio C Hamano wrote: >> diff --git a/builtin/pack-objects.c b/builtin/pack-objects.c >> index a57b4f058..a6ee653bf 100644 >> --- a/builtin/pack-objects.c >> +++ b/builtin/pack-objects.c >> @@ -2563,8 +2563,8 @@ struct in_pack_object { >> }; >> >> struct in_pack { >> -

Re: [PATCH] git: add --no-optional-locks option

On Fri, Sep 22, 2017 at 07:22:28AM -0400, Jeff Hostetler wrote: > > > I don't think we should pass this environment variable to remote > > > repositories. It should be listed in local_repo_env[] in environment.c. > > > > I'm not sure I agree. This is really about the context in which the > >

Gruß

"In einer kurzen Einleitung, Ich bin ein Anwalt Meinze Klaus peter, aus Deutschland, ich lebe Zurzeit in London, schickte ich Ihnen eine E-Mail über Ihren Verstorbenen Familienmitglied Spätfamilie, ich habe keine Antwort von Ihnen erhalten verstorben ist ein Bürger in deinem Land mit dem gleichen

[PATCH 4/4] t7503: add tests for pre-merge-hook

From: Michael J Gruber Add tests which make sure that the pre-merge-hook is called when present, allows/disallows merge commits depending on its return value and is suppressed by "--no-verify". Signed-off-by: Michael J Gruber ---

[PATCH 0/4] pre-merge hook

Now that f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07) has landed, merge is getting closer to behaving like commit, which is important because both are used to complete merges (automatic vs. non-automatic). This series revives an old suggestion of mine to make merge

[PATCH 3/4] merge: --no-verify to bypass pre-merge hook

From: Michael J Gruber Analogous to commit, introduce a '--no-verify' option which bypasses the pre-merge hook. The shorthand '-n' is taken by the (non-existing) '--no-stat' already. Signed-off-by: Michael J Gruber --- Documentation/git-merge.txt

[PATCH 1/4] git-merge: Honor pre-merge hook

From: Michael J Gruber git-merge does not honor the pre-commit hook when doing automatic merge commits, and for compatibility reasons this is going to stay. Introduce a pre-merge hook which is called for an automatic merge commit just like pre-commit is called for a

[PATCH 2/4] merge: do no-verify like commit

f8b863598c ("builtin/merge: honor commit-msg hook for merges", 2017-09-07) introduced the no-verify to merge for bypassing the commit-msg hook, though in a different way from the implementation in commit.c. Change the implementation in merge.c to be the same as in merge.c so that both do the same

[no subject]

<>

Re: [PATCH] git: add --no-optional-locks option

On 9/22/2017 12:25 AM, Jeff King wrote: On Thu, Sep 21, 2017 at 08:25:50PM +0200, Johannes Sixt wrote: +`GIT_OPTIONAL_LOCKS`:: + If set to `0`, Git will avoid performing any operations which + require taking a lock and which are not required to complete the + requested

GOOD MORNING

-- Dear sir i hope this is your direct email address for easy communicaton, i will be glad if you could comfirm it in acknowledgement. i have important matter to discuss with you. yours Sincerely Rachael -- Lieber Herr Ich hoffe das ist Ihre direkte

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

Michael J Gruber writes: > I'm still trying to understand what the original intent was: If we > abstract from the implementation (as we should, as you rightly > emphasize) and talk about historical tips then we have to ask ourselves: > - What is "historical"? > - What is tip? > -

Re: [PATCH v3 0/4] filter-branch: support for incremental update + fix for ancient tag format

Ian Campbell writes: > Travis is happy and the dt reconvert looks sensible (only took 60 hours > ;-)). Good. > Don't know if this is useful to your workflow but: > > The following changes since commit 4384e3cde2ce8ecd194202e171ae16333d241326: > >   Git 2.14 (2017-08-04

[no subject]

£1.5 Million Has Been Granted To You As A Donation Visit www.bbc.co.uk/news/uk-england-19254228 Sendname Address Phone for more info

Re: [PATCH v3 0/4] filter-branch: support for incremental update + fix for ancient tag format

On Fri, 2017-09-22 at 13:42 +0900, Junio C Hamano wrote: > Ian Campbell writes: > > > This is the third version of my patches to add incremental support to > > git-filter-branch. Since the last time I have replaced `git mktag -- > > allow-missing-tagger` with `git

Re: [PATCH 2/3] merge-base: return fork-point outside reflog

Junio C Hamano venit, vidit, dixit 22.09.2017 03:49: > Michael J Gruber writes: > >> Also, I'm undecided about about your reflog argument above - if we leave >> "--fork-point" to be the current behaviour including Jeff's fix then the >> documentation would need an even bigger

Re: [PATCH] git: add --no-optional-locks option

On 09/20/2017 11:32 PM, Jeff King wrote: > Johannes, this is an adaptation of your 67e5ce7f63 (status: offer *not* > to lock the index and update it, 2016-08-12). Folks working on GitHub > Desktop complained to me that it's only available on Windows. :) > > I expanded the scope a bit to let us