Re: [RFC/PATCH v4 00/49] Add initial experimental external ODB support

On Sat, Jul 1, 2017 at 10:33 PM, Junio C Hamano wrote: > Christian Couder writes: > >>> I think it would be good to ensure the >>> interface is robust and performant enough to actually replace the current >>> object store interface (even if we don't

Re: Request for git merge --signoff

On Sat, Jul 01 2017, Dan Kohn jotted: > https://github.com/coreinfrastructure/best-practices-badge is a user > of the https://github.com/probot/dco bot which checks that commits > have a signoff. The issue is that there is no `--signoff` option in > git for merge commits. I think it's fine to

[PATCH v3 0/3] Update sha1dc from upstream

The upstream discussion about solving Big Endian detection concluded with something that hopefully works on all our platforms, see https://github.com/cr-marcstevens/sha1collisiondetection/pull/34 This updates us to the latest upstream commit. Junio C Hamano (1): sha1collisiondetection:

[PATCH v3 2/3] sha1dc: optionally use sha1collisiondetection as a submodule

Add an option to use the sha1collisiondetection library from the submodule in sha1collisiondetection/ instead of in the copy in the sha1dc/ directory. This allows us to try out the submodule in sha1collisiondetection without breaking the build for anyone who's not expecting them as we work out

[PATCH v3 1/3] sha1dc: update from upstream

Update sha1dc from the latest version by the upstream maintainer[1]. See commit 6b851e536b ("sha1dc: update from upstream", 2017-06-06) for the last update. This solves the Big Endian detection on Solaris reported against v2.13.2[2], hopefully without any regressions. A version of this has been

[PATCH v3 3/3] sha1collisiondetection: automatically enable when submodule is populated

From: Junio C Hamano If a user wants to experiment with the version of collision detecting sha1 from the submodule, the user needed to not just populate the submodule but also needed to turn the knob. A Makefile trick is easy enough to do so, so let's do this. When somebody

Re: [PATCH] hooks: add signature to the top of the commit message

From: "Junio C Hamano" "Philip Oakley" writes: From: "Junio C Hamano" Kaartic Sivaraam writes: By the way, the one that is still actually enabled is no longer needed. The commit template

Re: [RFC/PATCH v4 00/49] Add initial experimental external ODB support

Christian Couder writes: >> I think it would be good to ensure the >> interface is robust and performant enough to actually replace the current >> object store interface (even if we don't actually do that just yet). > > I agree that it should be robust and performant,

Re: [PATCH] hooks: add signature to the top of the commit message

Kaartic Sivaraam writes: > On Sat, 2017-07-01 at 10:36 -0700, Junio C Hamano wrote: >> Actually I was wondering if it is a good idea to remove it, as it >> seems to have outlived its usefulness. > It does seem to be a good idea but it would leave the

Re: [PATCH] hooks: add signature to the top of the commit message

"Philip Oakley" writes: > From: "Junio C Hamano" >> Kaartic Sivaraam writes: >> By the way, the one that is still actually enabled is no longer needed. The commit template generated internally was corrected

Re: Request for git merge --signoff

Dan Kohn writes: > On Sat, Jul 1, 2017 at 1:45 PM, Junio C Hamano wrote: >> Dan Kohn writes: > >>> Could you please add a `--signoff` option to `git merge`? > >> The reason why we changed the default for "git merge" to

Re: [RFC/PATCH v4 00/49] Add initial experimental external ODB support

On Sat, Jul 1, 2017 at 9:41 PM, Christian Couder wrote: > On Fri, Jun 23, 2017 at 8:24 PM, Ben Peart wrote: >> The fact that "git clone is taught a --initial-refspec" option" indicates >> this isn't just an ODB implementation detail. Is there a

Re: [RFC/PATCH v4 00/49] Add initial experimental external ODB support

On Fri, Jun 23, 2017 at 8:24 PM, Ben Peart wrote: > > > On 6/20/2017 3:54 AM, Christian Couder wrote: >> To be able to better handle some kind of objects, for example big >> blobs, it would be nice if Git could store its objects in other object >> databases (ODB). >> >> To do

Re: [PATCH] hooks: add signature to the top of the commit message

On Sat, 2017-07-01 at 10:36 -0700, Junio C Hamano wrote: > Actually I was wondering if it is a good idea to remove it, as it > seems to have outlived its usefulness. It does seem to be a good idea but it would leave the 'prepare-commit- msg' hook with no scripts that could be used by just

Re: [PATCH] hooks: add signature to the top of the commit message

From: "Junio C Hamano" Kaartic Sivaraam writes: By the way, the one that is still actually enabled is no longer needed. The commit template generated internally was corrected some time ago not to add the "Conflicts:" section without

[PATCH v3 28/30] repack_without_refs(): don't lock or unlock the packed refs

Change `repack_without_refs()` to expect the packed-refs lock to be held already, and not to release the lock before returning. Change the callers to deal with lock management. This change makes it possible for callers to hold the packed-refs lock for a longer span of time, a possibility that

[PATCH v3 22/30] commit_packed_refs(): use a staging file separate from the lockfile

We will want to be able to hold the lockfile for `packed-refs` even after we have activated the new values. So use a separate tempfile, `packed-refs.new`, as a place to stage the new contents of the `packed-refs` file. For now this is all done within `commit_packed_refs()`, but that will change

[PATCH v3 23/30] packed_refs_lock(): function renamed from lock_packed_refs()

Rename `lock_packed_refs()` to `packed_refs_lock()` for consistency with how other methods are named. Also, it's about to get some companions. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 4 ++-- refs/packed-backend.c | 10 +- refs/packed-backend.h

[PATCH v3 24/30] packed_refs_lock(): report errors via a `struct strbuf *err`

That way the callers don't have to come up with error messages themselves. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 6 ++ refs/packed-backend.c | 17 +++-- refs/packed-backend.h | 6 +++--- 3 files changed, 16 insertions(+), 13

[PATCH v3 27/30] commit_packed_refs(): remove call to `packed_refs_unlock()`

Instead, change the callers of `commit_packed_refs()` to call `packed_refs_unlock()`. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 2 ++ refs/packed-backend.c | 18 -- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git

[PATCH v3 25/30] packed_refs_unlock(), packed_refs_is_locked(): new functions

Add two new public functions, `packed_refs_unlock()` and `packed_refs_is_locked()`, with which callers can manage and query the `packed-refs` lock externally. Call `packed_refs_unlock()` from `commit_packed_refs()` and `rollback_packed_refs()`. Signed-off-by: Michael Haggerty

[PATCH v3 30/30] read_packed_refs(): die if `packed-refs` contains bogus data

The old code ignored any lines that it didn't understand, including unterminated lines. This is dangerous. Instead, `die()` if the `packed-refs` file contains any unterminated lines or lines that we don't know how to handle. This fixes the tests added in the last commit. Signed-off-by: Michael

[PATCH v3 21/30] commit_packed_refs(): report errors rather than dying

Report errors via a `struct strbuf *err` rather than by calling `die()`. To enable this goal, change `write_packed_entry()` to report errors via a return value and `errno` rather than dying. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 10 +++---

[PATCH v3 29/30] t3210: add some tests of bogus packed-refs file contents

If `packed-refs` contains indecipherable lines, we should emit an error and quit rather than just skipping the lines. Unfortunately, we currently do the latter. Add some failing tests demonstrating the problem. This will be fixed in the next commit. Signed-off-by: Michael Haggerty

[PATCH v3 26/30] clear_packed_ref_cache(): don't protest if the lock is held

The existing callers already check that the lock isn't held just before calling `clear_packed_ref_cache()`, and in the near future we want to be able to call this function when the lock is held. Signed-off-by: Michael Haggerty --- refs/packed-backend.c | 2 -- 1 file

[PATCH v3 18/30] packed_read_raw_ref(): new function, replacing `resolve_packed_ref()`

Add a new function, `packed_read_raw_ref()`, which is nearly a `read_raw_ref_fn`. Use it in place of `resolve_packed_ref()`. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 36 +--- 1 file changed, 17 insertions(+), 19

[PATCH v3 20/30] packed_ref_store: make class into a subclass of `ref_store`

Add the infrastructure to make `packed_ref_store` implement `ref_store`, at least formally (few of the methods are actually implemented yet). Change the functions in its interface to take `ref_store *` arguments. Change `files_ref_store` to store a pointer to `ref_store *` and to call functions

[PATCH v3 13/30] rollback_packed_refs(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 15 +++ 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 19/30] packed-backend: new module for handling packed references

Now that the interface between `files_ref_store` and `packed_ref_store` is relatively narrow, move the latter into a new module, "refs/packed-backend.h" and "refs/packed-backend.c". It still doesn't quite implement the `ref_store` interface, but it will soon. This commit moves code around and

[PATCH v3 17/30] packed_ref_store: support iteration

Add the infrastructure to iterate over a `packed_ref_store`. It's a lot of boilerplate, but it's all part of a campaign to make `packed_ref_store` implement `ref_store`. In the future, this iterator will work much differently. Signed-off-by: Michael Haggerty ---

[PATCH v3 11/30] lock_packed_refs(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 31 ++- 1 file changed, 22 insertions(+), 9 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 07/30] validate_packed_ref_cache(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 13 ++--- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 15/30] repack_without_refs(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 20 ++-- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 02/30] add_packed_ref(): teach function to overwrite existing refs

Teach `add_packed_ref()` to overwrite an existing entry if one already exists for the specified `refname`. This means that we can call it from `files_pack_refs()`, thereby reducing the amount that the latter function needs to know about the internals of packed-reference handling. Signed-off-by:

[PATCH v3 14/30] get_packed_ref(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 06/30] clear_packed_ref_cache(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 16 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 16/30] packed_peel_ref(): new function, extracted from `files_peel_ref()`

This will later become a method of `packed_ref_store`. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 26 +++--- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 05/30] packed_ref_store: move `packed_refs_lock` member here

Move the `packed_refs_lock` member from `files_ref_store` to `packed_ref_store`, and rename it to `lock` since it's now more obvious what it is locking. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 31 --- 1 file changed, 16

[PATCH v3 12/30] commit_packed_refs(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 03/30] packed_ref_store: new struct

Start extracting the packed-refs-related data structures into a new class, `packed_ref_store`. It doesn't yet implement `ref_store`, but it will. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 42 +- 1 file changed, 33

[PATCH v3 08/30] get_packed_ref_cache(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 26 -- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index

[PATCH v3 04/30] packed_ref_store: move `packed_refs_path` here

Move `packed_refs_path` from `files_ref_store` to `packed_ref_store`, and rename it to `path` since its meaning is clear from its new context. Inline `files_packed_refs_path()`. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 25 - 1

[PATCH v3 09/30] get_packed_refs(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index b2ef7b3bb9..bc5c0de84e

[PATCH v3 10/30] add_packed_ref(): take a `packed_ref_store *` parameter

It only cares about the packed-refs part of the reference store. Signed-off-by: Michael Haggerty --- refs/files-backend.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/refs/files-backend.c b/refs/files-backend.c index bc5c0de84e..4943207098

[PATCH v3 01/30] t1408: add a test of stale packed refs covered by loose refs

From: Junio C Hamano It is OK for the packed-refs file to contain old reference definitions that might even refer to objects that have since been garbage-collected, as long as there is a corresponding loose reference definition that overrides it. Add a test that such

[PATCH v3 00/30] Create a reference backend for packed refs

This is v3 of a patch series creating a `packed_ref_store` reference backend. Thanks to Peff and Junio for their comments about v2 [1]. Changes since v2: * Delete some debugging `cat` commands in t1408. * Add some tests of reading packed-refs files with bogus contents. * When reporting

Re: Request for git merge --signoff

On Sat, Jul 1, 2017 at 1:45 PM, Junio C Hamano wrote: > Dan Kohn writes: >> Could you please add a `--signoff` option to `git merge`? > The reason why we changed the default for "git merge" to start an > editor at around v1.7.10 was because we

Re: [PATCH v2 29/29] read_packed_refs(): die if `packed-refs` contains bogus data

On 06/23/2017 09:58 PM, Jeff King wrote: > On Fri, Jun 23, 2017 at 09:01:47AM +0200, Michael Haggerty wrote: > >> The old code ignored any lines that it didn't understand. This is >> dangerous. Instead, `die()` if the `packed-refs` file contains any >> lines that we don't know how to handle. > >

Re: Request for git merge --signoff

Dan Kohn writes: > This alternative workflow works, but is obviously tedious: > > ```sh > # First 3 steps are the same > (feature-branch)$ git merge origin/master > # Save default commit message > (feature-branch)$ git commit --amend -s > # Commit message now has

Re: [PATCH] hooks: add signature to the top of the commit message

Kaartic Sivaraam writes: >> By the way, the one that is still actually enabled is no longer >> needed. The commit template generated internally was corrected some >> time ago not to add the "Conflicts:" section without commenting it >> out. >> > I'll send in

Re: [PATCH] status: suppress additional warning output in plumbing modes

Stefan Beller writes: > When status is called with '--porcelain' (as implied by '-z'), we promise > to output only messages as described in the man page. > > Suppress CRLF warnings. > > Signed-off-by: Stefan Beller > --- > > Maybe something like this?

[PATCH/RFC] hooks: add signature using "interpret-trailers"

The sample hook to prepare the commit message before a commit allows users to opt-in to add the signature to the commit message. The signature is added at a place that isn't consistent with the "-s" option of "git commit". Further, it could go out of view in certain cases. Add the signature in a

Re: [PATCH v2 1/2] Check DB_ENVIRONMENT using is_directory()

tbo...@web.de writes: > From: Torsten Bögershausen > > In setup.c is_git_directory() checks a Git directory using access(X_OK). > This does not check, if path is a file or a directory. > Check path with is_directory() instead. > --- > After all the discussions (and lots of tests)

"git intepret-trailers" vs. "sed script" to add the signature

On Sat, 2017-07-01 at 19:45 +0530, Kaartic Sivaraam wrote: > On Fri, 2017-06-30 at 09:44 -0700, Junio C Hamano wrote: > > It does look like a hack.  I was wondering if "interpret-trailers" > > is mature enough and can be used for this by now. > > It does look promising except for a few

Re: [PATCH 2/2] commit-template: distinguish status information unconditionally

Ævar Arnfjörð Bjarmason writes: > Just as someone reading this from the sidelines, very nice to have > someone working this part of the UI, but it would be much easier to > review if you included before/after examples of changes, e.g. (for this > hypothetical change): > >

Re: [PATCH v2 28/29] repack_without_refs(): don't lock or unlock the packed refs

On 06/23/2017 09:56 PM, Jeff King wrote: > On Fri, Jun 23, 2017 at 09:01:46AM +0200, Michael Haggerty wrote: > >> Change `repack_without_refs()` to expect the packed-refs lock to be >> held already, and not to release the lock before returning. Change the >> callers to deal with lock management.

Re: Assalam Alaikum

Assalam Alaikum, I am Madam Aleena Aasim ABDULAZIZ, a Muslim woman.I have picked you for an inheritance.I am aware that this is certainly not a conventional way of approach to establish a relationship of trust and confidence, but you will realize the need for my action.Please contact

Your email account has exceeded its storage limit

Dear E-mail subscriber We would like to inform you that we are currently carrying out scheduled maintenance and upgrade of our account service and as a result of this your accounts have to be upgraded. so click on the link below to update your account

Request for git merge --signoff

https://github.com/coreinfrastructure/best-practices-badge is a user of the https://github.com/probot/dco bot which checks that commits have a signoff. The issue is that there is no `--signoff` option in git for merge commits, which is a standard part of our workflow with feature branches. Here is

Re: [PATCH] hooks: add signature to the top of the commit message

On Fri, 2017-06-30 at 09:44 -0700, Junio C Hamano wrote: > It does look like a hack.  I was wondering if "interpret-trailers" > is mature enough and can be used for this by now. It does look promising except for a few differences from the hook which I'll explain in the following mail. >  Also the

Re: [PATCH] status: suppress additional warning output in plumbing modes

On Fri, Jun 30 2017, Stefan Beller jotted: > When status is called with '--porcelain' (as implied by '-z'), we promise > to output only messages as described in the man page. > > Suppress CRLF warnings. > > Signed-off-by: Stefan Beller > --- > > Maybe something like this?

[PATCH v7 1/2] strbuf.h comment: discuss strbuf_addftime() arguments in order

Change the comment documenting the strbuf_addftime() function to discuss the parameters in the order in which they appear, which makes this easier to read than discussing them out of order. Signed-off-by: Ævar Arnfjörð Bjarmason --- strbuf.h | 2 +- 1 file changed, 1

[PATCH v7 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

strbuf_addftime() allows callers to pass a time zone name for expanding %Z. The only current caller either passes the empty string or NULL, in which case %Z is handed over verbatim to strftime(3). Replace that string parameter with a flag controlling whether to remove %Z from the format

Re: [PATCH v6 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

Am 01.07.2017 um 14:55 schrieb Ævar Arnfjörð Bjarmason: strbuf_addstr() allows callers to pass a time zone name for expanding ^^^ That should be "strbuf_addftime()" instead (my typo), as Junio noted. %Z. The only current caller either passes the empty string or NULL, in which

Re: What's cooking in git.git (Jun 2017, #09; Fri, 30)

On 01/07/17 09:39, Ævar Arnfjörð Bjarmason wrote: On Fri, Jun 30 2017, Junio C. Hamano jotted: * xz/send-email-batch-size (2017-05-23) 1 commit - send-email: --batch-size to work around some SMTP server limit "git send-email" learned to overcome some SMTP server limitation that does

[PATCH v6 2/2] strbuf: change an always NULL/"" strbuf_addftime() param to bool

strbuf_addstr() allows callers to pass a time zone name for expanding %Z. The only current caller either passes the empty string or NULL, in which case %Z is handed over verbatim to strftime(3). Replace that string parameter with a flag controlling whether to remove %Z from the format

[PATCH v6 1/2] strbuf.h comment: discuss strbuf_addftime() arguments in order

Change the comment documenting the strbuf_addftime() function to discuss the parameters in the order in which they appear, which makes this easier to read than discussing them out of order. Signed-off-by: Ævar Arnfjörð Bjarmason --- strbuf.h | 2 +- 1 file changed, 1

[PATCH v2 2/2] cygwin: Allow pushing to UNC paths

From: Torsten Bögershausen cygwin can use an UNC path like //server/share/repo $ cd //server/share/dir $ mkdir test $ cd test $ git init --bare However, when we try to push from a local Git repository to this repo, there is a problem: Git converts the leading "//" into a

[PATCH v2 1/2] Check DB_ENVIRONMENT using is_directory()

From: Torsten Bögershausen In setup.c is_git_directory() checks a Git directory using access(X_OK). This does not check, if path is a file or a directory. Check path with is_directory() instead. --- After all the discussions (and lots of tests) I found that this patch works for my

Re: [PATCH] status: suppress additional warning output in plumbing modes

>On 30/06/17 18:28, Stefan Beller wrote: The patch makes a lot of sense - thanks for the fast reply. A question: does the header correspond to the patch ? < [PATCH] status: suppress additional warning output in plumbing modes > [PATCH] status: suppress CRLF warnings in porcelain modes (And

Re: [PATCH 2/2] commit-template: distinguish status information unconditionally

On Sat, 2017-07-01 at 13:44 +0200, Ævar Arnfjörð Bjarmason wrote: > Just as someone reading this from the sidelines, very nice to have > someone working this part of the UI, but it would be much easier to > review if you included before/after examples of changes That's a good comment. Will try to

Re: [PATCH 2/2] commit-template: distinguish status information unconditionally

On Sat, Jul 01 2017, Kaartic Sivaraam jotted: > On Fri, 2017-06-30 at 07:52 -0700, Junio C Hamano wrote: >> Thanks, both looks good.Will queue. > You're welcome :) Just as someone reading this from the sidelines, very nice to have someone working this part of the UI, but it would be much easier

[PATCH] apply: use starts_with() in gitdiff_verify_name()

Avoid running over the end of line -- a C string whose length is not known to this function -- by using starts_with() instead of memcmp(3) for checking if it starts with "/dev/null". Also simply include the newline in the string constant to compare against. Drop a comment that just states the

Re: What's cooking in git.git (Jun 2017, #09; Fri, 30)

On Fri, Jun 30 2017, Junio C. Hamano jotted: > * xz/send-email-batch-size (2017-05-23) 1 commit > - send-email: --batch-size to work around some SMTP server limit > > "git send-email" learned to overcome some SMTP server limitation > that does not allow many pieces of e-mails to be sent over