Re: [PATCH] describe: fix matching to actually match all patterns

On Fri, Sep 15, 2017 at 10:53 PM, Max Kirillov wrote: > `git describe --match` with multiple patterns matches only first pattern. > If it fails, next patterns are not tried. > > Fix it, add test cases and update existing test which has wrong > expectation. > > Signed-off-by: Max

Dear Talented

Dear Talented, I am Talent Scout For BLUE SKY FILM STUDIO, Present Blue Sky Studio a Film Corporation Located in the United State, is Soliciting for the Right to use Your Photo/Face and Personality as One of the Semi -Major Role/ Character in our Upcoming ANIMATED Stereoscope 3D Movie-The Story

Re: [RFC PATCH 0/2] Add named reference to latest push cert

On Thu, Sep 07, 2017 at 05:43:19PM +, Stefan Beller wrote: > On Thu, Sep 7, 2017 at 2:11 AM, Shikher Verma wrote: > > On Wed, Sep 06, 2017 at 02:31:49PM -0700, Stefan Beller wrote: > >> On Wed, Sep 6, 2017 at 2:39 AM, Shikher Verma > >> wrote: >

[PATCH v6 22/40] pack-objects: don't pack objects in external odbs

Objects managed by an external ODB should not be put into pack files. They should be transfered using other mechanism that can be specific to the external odb. Signed-off-by: Christian Couder --- builtin/pack-objects.c | 4 1 file changed, 4 insertions(+) diff

[PATCH v6 39/40] Add t0430 to test cloning using bundles

Signed-off-by: Christian Couder --- t/t0430-clone-bundle-e-odb.sh | 85 +++ 1 file changed, 85 insertions(+) create mode 100755 t/t0430-clone-bundle-e-odb.sh diff --git a/t/t0430-clone-bundle-e-odb.sh

[PATCH v6 29/40] odb-helper: add put_object_process()

This adds the infrastructure to send objects to a sub-process handling the communication with an external odb. For now we only handle sending raw blobs using the 'put_raw_obj' instruction. Signed-off-by: Christian Couder --- odb-helper.c | 75

[PATCH v6 40/40] Doc/external-odb: explain transfering objects and metadata

Signed-off-by: Christian Couder --- Documentation/technical/external-odb.txt | 105 +++ 1 file changed, 105 insertions(+) diff --git a/Documentation/technical/external-odb.txt b/Documentation/technical/external-odb.txt index

[PATCH v6 26/40] odb-helper: add init_object_process()

From: Ben Peart This adds the infrastructure to launch and use long running sub-processes as external odb helpers. For now only the 'init' and 'get_direct' capabilities are supported with sub-processes. Signed-off-by: Christian Couder ---

[PATCH v6 20/40] lib-httpd: add apache-e-odb.conf

This is an apache config file to test external object databases. It uses the upload.sh and list.sh cgi that have been added previously to make apache store external objects. Signed-off-by: Christian Couder --- t/lib-httpd/apache-e-odb.conf | 214

[PATCH v6 09/40] Add initial external odb support

The external-odb.{c,h} files contains the functions that are called by the rest of Git from "sha1_file.c". The odb-helper.{c,h} files contains the functions to actually implement communication with the external scripts or processes that will manage external git objects. For now only script mode

[PATCH v6 23/40] Add t0420 to test transfer to HTTP external odb

This tests that an apache web server can be used as an external object database and store files in their native format instead of converting them to a Git object. Signed-off-by: Christian Couder --- t/t0420-transfer-http-e-odb.sh | 142

[PATCH v6 21/40] odb-helper: add odb_helper_get_raw_object()

The existing odb_helper_get_object() is renamed odb_helper_get_git_object() and a new odb_helper_get_raw_object() is introduced to deal with external objects that are not in Git format. Signed-off-by: Christian Couder --- odb-helper.c | 113

[PATCH v6 08/40] sha1_file: prepare for external odbs

In the following commits we will need some functions that were internal to sha1_file.c, so let's first make them non static and declare them in "cache.h". While at it, let's rename 'create_tmpfile()' to 'create_object_tmpfile()' to make its name less generic. Let's also split out

[PATCH v6 13/40] external-odb: accept only blobs for now

The mechanism to decide which blobs should be sent to which external object database will be very simple for now. If the external odb helper support any "put_*" instruction all the new blobs will be sent to it. Signed-off-by: Christian Couder --- external-odb.c | 4

[PATCH v6 00/40] Add initial experimental external ODB support

Note: a lot of information about the goals, the design and how things work is now in the followin patches: - [PATCH v6 34/40] Add Documentation/technical/external-odb.txt - [PATCH v6 40/40] Doc/external-odb: explain transfering objects and metadata Goal Git can store its objects only

[PATCH v6 17/40] lib-httpd: pass config file to start_httpd()

This makes it possible to start an apache web server with different config files. This will be used in a later patch to pass a config file that makes apache store external objects. Signed-off-by: Christian Couder --- t/lib-httpd.sh | 6 -- 1 file changed, 4

[PATCH v6 36/40] clone: add --initial-refspec option

This option makes it possible to separate fetching refs when cloning in two parts, an initial part and a later normal part. This way after the initial part, mechanisms like the external odb mechanism can be used to prefetch some objects using information that has been made available during the

[PATCH v6 34/40] Add Documentation/technical/external-odb.txt

This describes the external odb mechanism's purpose and how it works. Helped-by: Ben Peart Signed-off-by: Christian Couder --- Documentation/technical/external-odb.txt | 342 +++ 1 file changed, 342 insertions(+)

[PATCH v6 18/40] lib-httpd: add upload.sh

This cgi will be used to upload objects to, or to delete objects from, an apache web server. This way the apache server can work as an external object database. Signed-off-by: Christian Couder --- t/lib-httpd.sh| 1 + t/lib-httpd/upload.sh | 45

[PATCH v6 35/40] clone: add 'initial' param to write_remote_refs()

We want to make it possible to separate fetching remote refs into an initial part and a later part. To prepare for that, let's add an 'initial' boolean parameter to write_remote_refs() to tell this function if we are performing the initial part or not. Signed-off-by: Christian Couder

[PATCH v6 25/40] odb-helper: add 'script_mode' to 'struct odb_helper'

to prepare for having a long running odb helper sub-process handling the communication between Git and an external odb. We introduce "odb..subprocesscommand" to make it possible to define such a sub-process, and we mark such odb helpers with the new 'script_mode' field set to 0. Helpers defined

[PATCH v6 28/40] Add t0460 to test passing git objects

Signed-off-by: Christian Couder --- t/t0460-read-object-git.sh | 28 + t/t0460/read-object-git| 78 ++ 2 files changed, 106 insertions(+) create mode 100755 t/t0460-read-object-git.sh create mode 100755

[PATCH v6 27/40] Add t0450 to test 'get_direct' mechanism

From: Ben Peart Signed-off-by: Ben Peart Signed-off-by: Christian Couder --- t/t0450-read-object.sh | 28 + t/t0450/read-object| 68 ++ 2 files

[PATCH v6 15/40] Add GIT_NO_EXTERNAL_ODB env variable

This new environment variable will be used to perform git commands without involving any external odb mechanism. This makes it possible for example to create new blobs that will not be sent to an external odb even if the external odb supports "put_*" instructions. Signed-off-by: Christian Couder

[PATCH v6 06/40] t0021/rot13-filter: add capability functions

Add functions to help read and write capabilities. These functions will be reused in following patches. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 40 1 file changed, 32 insertions(+), 8 deletions(-) diff

[PATCH v6 24/40] external-odb: add 'get_direct' support

This implements the 'get_direct' capability/instruction that makes it possible for external odb helper scripts to pass blobs to Git by directly writing them as loose objects files. It is better to call this a "direct" mode rather than a "fault-in" mode as we could have the same kind of mechanism

[PATCH v6 30/40] Add t0470 to test passing raw objects

Signed-off-by: Christian Couder --- t/t0470-read-object-http-e-odb.sh | 109 ++ t/t0470/read-object-plain | 83 + 2 files changed, 192 insertions(+) create mode 100755

[PATCH v6 31/40] odb-helper: add have_object_process()

This adds the infrastructure to handle 'have' instructions in process mode. The answer from the helper sub-process should be like the output in script mode, that is lines like this: sha1 SPACE size SPACE type NEWLINE Signed-off-by: Christian Couder --- odb-helper.c |

Re: Are the 'How to' documents present as man pages?

On Sat, Sep 16, 2017 at 10:30:43AM +0530, Kaartic Sivaraam wrote: > I was reading the 'git revert' documentation and found the following > line in it, > > -m parent-number > --mainline parent-number > > ... > > See the revert-a-faulty-merge How-To[1] for more details.

Re: Commit dropped when swapping commits with rebase -i -p

Am 15.09.2017 um 22:52 schrieb Junio C Hamano: > Sebastian Schuberth writes: >> >> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt >> index 6805a74aec..ccd0a04d54 100644 >> --- a/Documentation/git-rebase.txt >> +++ b/Documentation/git-rebase.txt >>

Re: [PATCH] for_each_string_list_item(): behave correctly for empty list

> >> It would be a pain to have to change the signature of this macro, and > >> we'd prefer not to add overhead to each iteration of the loop. So > >> instead, whenever `list->items` is NULL, initialize `item` to point at > >> a dummy `string_list_item` created for the purpose. > > > > What

Re: [PATCHv3] builtin/merge: honor commit-msg hook for merges

Seems 'Documentation/githooks.txt' needs an update related to this change. Previously it said(note the **s) that 'commit-msg' is invoked only by 'git commit', commit-msg This hook is invoked by git commit**, and can be bypassed with the --no-verify option. It takes a

[PATCH v6 02/40] t0021/rot13-filter: refactor packet reading functions

To make it possible in a following commit to move packet reading and writing functions into a Packet.pm module, let's refactor these functions, so they don't handle printing debug output and exiting. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 12

[PATCH v6 03/40] t0021/rot13-filter: improve 'if .. elsif .. else' style

Before further refactoring the "t0021/rot13-filter.pl" script, let's modernize the style of its 'if .. elsif .. else' clauses to improve its readability by making it more similar to our other perl scripts. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 39

[PATCH v6 12/40] external odb: add 'put_raw_obj' support

Add support for a 'put_raw_obj' capability/instruction to send new objects to an external odb. Objects will be sent as they are (in their 'raw' format). They will not be converted to Git objects. For now any new Git object (blob, tree, commit, ...) would be sent if 'put_raw_obj' is supported by

Re: Are the 'How to' documents present as man pages?

On Sat, Sep 16, 2017 at 05:17:35PM +0530, Kaartic Sivaraam wrote: >> References to other man pages generally use round brackets, for >> example git-merge(1). > > I didn't know they had different meanings for different brackets in man > pages. [snip] Man pages in general use only round brackets to

Re: Are the 'How to' documents present as man pages?

On Sat, 2017-09-16 at 10:54 +0200, Simon Ruderich wrote: > On Sat, Sep 16, 2017 at 10:30:43AM +0530, Kaartic Sivaraam wrote: > > I was reading the 'git revert' documentation and found the following > > line in it, > > > > -m parent-number > > --mainline parent-number > > > > ...

[PATCH] describe: fix matching to actually match all patterns

`git describe --match` with multiple patterns matches only first pattern. If it fails, next patterns are not tried. Fix it, add test cases and update existing test which has wrong expectation. Signed-off-by: Max Kirillov --- builtin/describe.c | 9 ++---

[PATCH v6 37/40] clone: disable external odb before initial clone

To make it possible to have the external odb mechanism only kick in after the initial part of a clone, we should disable it during the initial part of the clone. Let's do that by saving and then restoring the value of the 'use_external_odb' global variable. Signed-off-by: Christian Couder

[PATCH v6 32/40] Add t0480 to test "have" capability and raw objects

Signed-off-by: Christian Couder --- t/t0480-read-object-have-http-e-odb.sh | 109 + t/t0480/read-object-plain-have | 103 +++ 2 files changed, 212 insertions(+) create mode 100755

[PATCH v6 33/40] external-odb: use 'odb=magic' attribute to mark odb blobs

To tell which blobs should be sent to the "magic" external odb, let's require that the blobs be marked using the 'odb=magic' attribute. Signed-off-by: Christian Couder --- external-odb.c | 22 -- external-odb.h

[PATCH v6 38/40] Add tests for 'clone --initial-refspec'

Signed-off-by: Christian Couder --- t/t0420-transfer-http-e-odb.sh | 7 + t/t0470-read-object-http-e-odb.sh | 7 + t/t0480-read-object-have-http-e-odb.sh | 7 + t/t5616-clone-initial-refspec.sh | 48 ++ 4

[PATCH v6 11/40] t0400: add 'put_raw_obj' instruction to odb-helper script

To properly test passing objects from Git to an external odb we need an odb-helper script that supports a 'put' capability/instruction. For now we will support only sending raw blobs, so the supported capability/instruction will be 'put_raw_obj'. While at it let's add a test to check that our

[PATCH v6 16/40] Add t0410 to test external ODB transfer

Signed-off-by: Christian Couder --- t/t0410-transfer-e-odb.sh | 144 ++ 1 file changed, 144 insertions(+) create mode 100755 t/t0410-transfer-e-odb.sh diff --git a/t/t0410-transfer-e-odb.sh b/t/t0410-transfer-e-odb.sh new

[PATCH v6 10/40] odb-helper: add odb_helper_init() to send 'init' instruction

Let's add an odb_helper_init() function to send an 'init' instruction to the helpers. This 'init' instruction is especially useful to get the capabilities that are supported by the helpers. So while at it, let's also add a parse_capabilities() function to parse them and a supported_capabilities

[PATCH v6 01/40] builtin/clone: get rid of 'value' strbuf

This makes the code simpler by removing a few lines, and getting rid of one variable. Signed-off-by: Christian Couder --- builtin/clone.c | 9 +++-- 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/builtin/clone.c b/builtin/clone.c index

[PATCH v6 05/40] t0021/rot13-filter: add packet_initialize()

Let's refactor the code to initialize communication into its own packet_initialize() function, so that we can reuse this functionality in following patches. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 20 +--- 1 file changed, 13

[PATCH v6 14/40] t0400: add test for external odb write support

Signed-off-by: Christian Couder --- t/t0400-external-odb.sh | 8 1 file changed, 8 insertions(+) diff --git a/t/t0400-external-odb.sh b/t/t0400-external-odb.sh index f9e6ea1015..03df030461 100755 --- a/t/t0400-external-odb.sh +++ b/t/t0400-external-odb.sh @@

[PATCH v6 07/40] Add Git/Packet.pm from parts of t0021/rot13-filter.pl

And while at it let's simplify t0021/rot13-filter.pl by using Git/Packet.pm. This will make it possible to reuse packet related functions in other test scripts. Signed-off-by: Christian Couder --- perl/Git/Packet.pm | 118

[PATCH v6 19/40] lib-httpd: add list.sh

This cgi script can list Git objects that have been uploaded as files to an apache web server. This script can also retrieve the content of each of these files. This will help make apache work as an external object database. Signed-off-by: Christian Couder ---

[PATCH v6 04/40] t0021/rot13-filter: improve error message

If there is no new line at the end of something it receives, the packet_txt_read() function die()s, but it's difficult to debug without much context. Let's give a bit more information when that happens. Signed-off-by: Christian Couder --- t/t0021/rot13-filter.pl | 3

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

On 2017-09-15 21:20, Ben Peart wrote: > +if [ "$1" != 1 ] > +then > + echo -e "Unsupported core.fsmonitor hook version.\n" >&2 > + exit 1 > +fi The echo -e not portable (It was detected by a tighter version of the lint script, which I have here, but not yet send to the list :-( This

Re: Commit dropped when swapping commits with rebase -i -p

On Sat, Sep 16, 2017 at 12:41 PM, Andreas Heiduk wrote: > Therefore I would avoid "definitive wording" like "will drop" and use > vague wording along "there are various dragons out there" like this: > > The todo list presented by `--preserve-merges --interactive` does >

GREETINGS FROM DUBAI

Hello, Am Mr.Austin Lizin Managing Director of Global Trust Bank Dubai U.A.E. I write you this proposal in good faith hoping that I will rely on you in a business transaction that require absolute confidentiality and of great interest and benefit to our both families. In 2007,one Mr.Husson whose

Re: [musl] Re: Git 2.14.1: t6500: error during test on musl libc

On Fri, Sep 15, 2017 at 11:58:41PM -0500, A. Wilcox wrote: > On 15/09/17 06:30, Jeff King wrote: > > On Fri, Sep 15, 2017 at 08:37:40AM +0200, Kevin Daudt wrote: > > > >> On Thu, Sep 14, 2017 at 09:43:12PM -0500, A. Wilcox wrote: > >>> -BEGIN PGP SIGNED MESSAGE- > >>> Hash: SHA256 > >>> >

Re: [PATCH v2] add test for bug in git-mv for recursive submodules

Heiko Voigt writes: > When using git-mv with a submodule it will detect that and update the > paths for its configurations (.gitmodules, worktree and gitfile). This > does not work for recursive submodules where a user renames the root > submodule. > > We discovered this fact

Re: [RFC PATCH 0/2] Add named reference to latest push cert

Shikher Verma writes: > This might be a good starting point for a sample hook if we choose to go > that way. As Junio suggested. >> This would not deal with concurrency as it re-uses the >> same worktree, but illustrates what I had in mind >> for the git history of that

[PATCH] doc: update information about windows build

029aeeed5 (travis-ci: build and test Git on Windows, 2017-03-24) added support for testing the git build for Windows. So, update the documentation and the example used in it. Signed-off-by: Kaartic Sivaraam --- Documentation/SubmittingPatches | 5 +++-- 1 file

Behaviour of 'git stash show' when a stash has untracked files

Some time ago, I stashed a few changes along with untracked files. I almost forgot it until recently. Then I wanted to see what I change I had in the stash. So I did a 'git stash show '. It worked fine but didn't say anything about the untracked files in that stash. That made me wonder where the

Behaviour of 'git stash show' when a stash has untracked files

Some time ago, I stashed a few changes along with untracked files. I almost forgot it until recently. Then I wanted to see what I change I had in the stash. So I did a 'git stash show '. It worked fine but didn't say anything about the untracked files in that stash. That made me wonder where the

Re: [PATCH] for_each_string_list_item(): behave correctly for empty list

Michael Haggerty writes: > If you pass a newly-initialized or newly-cleared `string_list` to > `for_each_string_list_item()`, then the latter does > > for ( > item = (list)->items; /* note, this is NULL */ > item < (list)->items + (list)->nr; /*

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

Ben Peart writes: > +write_integration_script() { > + write_script .git/hooks/fsmonitor-test<<-\EOF > + if [ "$#" -ne 2 ]; then > + echo "$0: exactly 2 arguments expected" > + exit 2 > + fi > + if [ "$1" != 1 ]; then > +

Re: [musl] Re: Git 2.14.1: t6500: error during test on musl libc

* Junio C Hamano [2017-09-17 09:36:26 +0900]: > versions was in v1.8.5, it seems. IOW, nobody tried to run Git with > musl C in the past 4 years and you are the first one to notice? git works fine on musl in practice, i use it for more than 4years now.

Re: Git 2.14.1: t6500: error during test on musl libc

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 16/09/17 19:36, Junio C Hamano wrote: > "A. Wilcox" writes: > >> While musl's reading is correct from an English grammar point of >> view, it does not seem to be how any other implementation has >> read the standard. >>

Re: Git 2.14.1: t6500: error during test on musl libc

"A. Wilcox" writes: >> I did a quick scan for substring "scanf" and read through the >> output, and it seems that this is the only one that wants to do >> the this many characters, e.g. "%42c", conversion. >> So it seems to me that a real fix has to read the file

Re: Git 2.14.1: t6500: error during test on musl libc

"A. Wilcox" writes: > While musl's reading is correct from an English grammar point of view, > it does not seem to be how any other implementation has read the standard. > > However! It gets better. > > The ISO C standard, committee draft version April 12, 2011,

Re: Git 2.14.1: t6500: error during test on musl libc

-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 On 16/09/17 22:16, Junio C Hamano wrote: > Subject: gc: call fscanf() with %s, not %c, when reading > hostname > > Earlier in this codepath, we (ab)used "%c" to read the > hostname recorded in the lockfile into locking_host[HOST_NAME_MAX + > 1]

[PATCH v1 1/1] test-lint: echo -e (or -E) is not portable

From: Torsten Bögershausen Some implementations of `echo` support the '-e' option to enable backslash interpretation of the following string. As an addition, they support '-E' to turn it off. However, none of these are portable, POSIX doesn't even mention them, and many