Re: requesting permission to use some Git for Windows code

Hi Philippe, Please feel free to use my portions of the mentioned works under the GPLv3. -Brandon On Tue, Jul 25, 2017 at 6:53 AM, Johannes Schindelin wrote: > Hi Philippe, > > I am not quite certain whether I have replied to this earlier or not. > Under the

Re: [PATCH] doc: remove unsupported parameter from patch-id

On Fri, Jul 28, 2017 at 12:46:16AM +0200, Andreas Heiduk wrote: > The patch is read from standard input and not from a parameter. > > Signed-off-by: Andreas Heiduk > --- > Documentation/git-patch-id.txt | 3 --- > 1 file changed, 3 deletions(-) > > diff --git

Re: [RFC PATCH 2/4] fsck: support refs pointing to lazy objects

On Thu, 27 Jul 2017 11:59:47 -0700 Junio C Hamano wrote: > > @@ -438,6 +438,14 @@ static int fsck_handle_ref(const char *refname, const > > struct object_id *oid, > > > > obj = parse_object(oid); > > if (!obj) { > > + if (repository_format_lazy_object) { >

Re: [RFC PATCH 3/4] fsck: support referenced lazy objects

On Thu, 27 Jul 2017 12:17:37 -0700 Junio C Hamano wrote: > The same comment as 2/4 applies here. Noted - whatever the resolution is, I'll apply it to all the patches. > > > @@ -212,6 +221,8 @@ static void check_reachable_object(struct object *obj) > > * do a full fsck >

[PATCH] doc: remove unsupported parameter from patch-id

The patch is read from standard input and not from a parameter. Signed-off-by: Andreas Heiduk --- Documentation/git-patch-id.txt | 3 --- 1 file changed, 3 deletions(-) diff --git a/Documentation/git-patch-id.txt b/Documentation/git-patch-id.txt index cf71fba1c..442caff8a

What's cooking in git.git (Jul 2017, #08; Thu, 27)

Here are the topics that have been cooking. Commits prefixed with '-' are only in 'pu' (proposed updates) while commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. You can find the changes

Re: [RFC] Git rerere and non-conflicting changes during conflict resolution

Junio C Hamano writes: > Jeff King writes: > >> From the user's perspective, calling X "rerere" would probably be OK[1]. >> But from an implementation perspective (and to keep the existing >> plumbing available and unchanged), it probably makes sense to call it

Re: [PATCH] packed_ref_store: handle a packed-refs file that is a symlink

Jeff King writes: > On Thu, Jul 27, 2017 at 10:19:48AM -0700, Junio C Hamano wrote: > >> Makes sense. Makes me wonder why we need a separate .new file >> (instead of writing into the .lock instead), but that is a different >> issue. > > It comes from 42dfa7ece

Re: [RFC PATCH 3/4] fsck: support referenced lazy objects

Jonathan Tan writes: > Teach fsck to not treat missing objects indirectly pointed to by refs as > an error when extensions.lazyobject is set. > > Signed-off-by: Jonathan Tan > --- > builtin/fsck.c | 11 +++ >

Re: [PATCH v2] l10n: de.po: various fixes in German translation

Acked-by: Matthias Rüster Thanks! Am 27.07.2017 um 20:23 schrieb Ralf Thielow: > From: Hartmut Henkel > > Signed-off-by: Hartmut Henkel > Helped-by: Stefan Beller > Signed-off-by: Ralf Thielow

Re: [RFC PATCH 2/4] fsck: support refs pointing to lazy objects

Jonathan Tan writes: > Teach fsck to not treat refs with missing targets as an error when > extensions.lazyobject is set. > > For the purposes of warning about no default refs, such refs are still > treated as legitimate refs. > > Signed-off-by: Jonathan Tan

Re: [PATCHv2] builtin/blame: highlight interesting things

On Thu, Jul 27, 2017 at 11:27 AM, Junio C Hamano wrote: > Stefan Beller writes: > >> Well, we could also try a "zebra" as in sb/diff-color-move to show blocks >> with the same fancy border detection. > > Luckily, blame output has places for metainfo on

Re: [RFC PATCH 1/4] environment, fsck: introduce lazyobject extension

Jonathan Tan writes: > 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,

Re: [PATCH] packed_ref_store: handle a packed-refs file that is a symlink

On Thu, Jul 27, 2017 at 10:19:48AM -0700, Junio C Hamano wrote: > Michael Haggerty writes: > > > Change `commit_packed_refs()` to use `get_locked_file_path()` to find > > the path of the file that it should overwrite. Since that path was > > properly resolved when the

Re: [PATCHv2] builtin/blame: highlight interesting things

Stefan Beller writes: > Well, we could also try a "zebra" as in sb/diff-color-move to show blocks > with the same fancy border detection. Luckily, blame output has places for metainfo on each line, unlike diff output, so there won't be a need for painting border

[PATCH v2] l10n: de.po: various fixes in German translation

From: Hartmut Henkel Signed-off-by: Hartmut Henkel Helped-by: Stefan Beller Signed-off-by: Ralf Thielow --- po/de.po | 52 +--- 1 file changed, 25 insertions(+), 27

Re: [PATCH] l10n: de.po: various fixes in German translation

2017-07-27 20:00 GMT+02:00 Stefan Beller : > This patch looks good to me, but some unrelated comments > that I feel would improve the translation even more. > > Thanks, > Stefan > >> @@ -1465,7 +1465,7 @@ msgstr "Konnte '%s' nicht aufheben." >> >> #: connect.c:50 >> msgid

Re: [PATCH] l10n: de.po: various fixes in German translation

This patch looks good to me, but some unrelated comments that I feel would improve the translation even more. Thanks, Stefan > @@ -1465,7 +1465,7 @@ msgstr "Konnte '%s' nicht aufheben." > > #: connect.c:50 > msgid "The remote end hung up upon initial contact" > -msgstr "Die Gegenseite hat sich

[PATCH] l10n: de.po: various fixes in German translation

From: Hartmut Henkel Signed-off-by: Hartmut Henkel Signed-off-by: Ralf Thielow --- po/de.po | 50 +- 1 file changed, 25 insertions(+), 25 deletions(-) diff --git a/po/de.po b/po/de.po

Re: [RFC PATCH 0/4] Some patches for fsck for missing objects

On Wed, 26 Jul 2017 23:42:38 + "brian m. carlson" wrote: > I looked at this and I like the direction it's going. It's pretty > simple and straightforward, which I also like. Thanks. > What I'd recommend is that instead of making lazyObject a string, we > make

Re: [PATCH] packed_ref_store: handle a packed-refs file that is a symlink

Michael Haggerty writes: > Change `commit_packed_refs()` to use `get_locked_file_path()` to find > the path of the file that it should overwrite. Since that path was > properly resolved when the lockfile was created, this restores the > pre-42dfa7ecef behavior. Because

Re: Expected behavior of "git check-ignore"...

John Szakmeister writes: > On Mon, Jul 24, 2017 at 3:23 PM, Junio C Hamano wrote: > [snip] >> I am reasonably sure that the command started its life as a pure >> debugging aid. >> >> The treatment of the negation _might_ impose conflicting goals to >>

Re: [PATCH] git-contacts: Add recognition of Reported-by

Jeff King writes: > Yeah, I don't think interpret-trailers is currently a useful tool for > looking at an extra config key like that. I'd expect it would need to be > extended, or a new tool added, or perhaps existing tools would need to > learn more about how trailers work (e.g.,

Re: [PATCH] credential-cache: interpret an ECONNRESET as on EOF

Hi Junio, I just noticed a typo in the subject line for this patch. It should read '... ECONNRESET as _an_ EOF' not '... ECONNRESET as _on_ EOF'. [complete patch snipped!] Thanks! ATB, Ramsay Jones

Re: Fwd: Should "head" also work for "HEAD" on case-insensitive FS?

Jeff King writes: > On Wed, Jul 26, 2017 at 05:49:47PM -0700, Junio C Hamano wrote: > >> What I saw was that a test have ended up with .git/%46%4F%4F when it >> was told to create a ref "FOO" (which indicates that "FOO" was >> passed to the files backend), which later failed to

Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase

Phillip Wood writes: >> On 26/07/17 23:12, Junio C Hamano wrote: >>> I think >>> you are already 80% there without adding a yet another option,... >> ... >> I'm interested in the 20% as it's about 100% of my rebase conflicts. OK, then at least a fixed

Re: [PATCH] credential-cache: interpret an ECONNRESET as on EOF

On Thu, Jul 27, 2017 at 03:42:36PM +0100, Ramsay Jones wrote: > yep, I did think about adding a FLAG_EXIT (or somesuch) and passing > it down through the call stack to send_request() so that I could do > the check only for the 'exit' command. I decided against it in the > end, obviously! ;-) I

Re: [PATCH] credential-cache: interpret an ECONNRESET as on EOF

On 27/07/17 15:17, Jeff King wrote: > On Thu, Jul 27, 2017 at 02:08:40AM +0100, Ramsay Jones wrote: > >> In order to suppress the fatal exit in this case, check the read error >> for an ECONNRESET and return as if no data was read from the daemon. >> This effectively converts an ECONNRESET into

Re: Fwd: Should "head" also work for "HEAD" on case-insensitive FS?

On Wed, Jul 26, 2017 at 05:49:47PM -0700, Junio C Hamano wrote: > Michael Haggerty writes: > > > I think the most natural thing would be to use different encoding > > rules for pseudo-refs (references like "HEAD" and "FETCH_HEAD") and > > for other references (those

Re: reftable [v3]: new ref storage format

Thanks for your continued work on this. I have some comments about v3 (inline below). On Sat, Jul 22, 2017 at 11:29 AM, Shawn Pearce wrote: > 3rd iteration of the reftable storage format. > > [...] > ### Objectives > > - Near constant time lookup for any single reference,

Re: [PATCH] credential-cache: interpret an ECONNRESET as on EOF

On Thu, Jul 27, 2017 at 02:08:40AM +0100, Ramsay Jones wrote: > In order to suppress the fatal exit in this case, check the read error > for an ECONNRESET and return as if no data was read from the daemon. > This effectively converts an ECONNRESET into an EOF. Yeah, I think this is a perfectly

Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase

On 27/07/17 11:36, Phillip Wood wrote: On 26/07/17 23:12, Junio C Hamano wrote: Junio C Hamano writes: Hmph, this is interesting. "git rebase" does take "--rerere-autoupdate" option from the command line, and propagates it to a later invocation of "rebase --continue" by

HELLO DEAR HOW ARE YOU DOING TODAY.

Dear Friend, With due respect to your person and much sincerity of purpose. I have a business proposal which I will like to handle with you. $35 million USD is involves. But be rest assured that everything is legal and risk free as I have concluded all the arrangements and the legal papers

Re: Expected behavior of "git check-ignore"...

On Mon, Jul 24, 2017 at 3:23 PM, Junio C Hamano wrote: [snip] > I am reasonably sure that the command started its life as a pure > debugging aid. > > The treatment of the negation _might_ impose conflicting goals to > its purpose as a debugging aid---a user who debugs his

Re: [PATCH] packed_ref_store: handle a packed-refs file that is a symlink

Stefan, Jonathan: you're both right, the new test needs the SYMLINKS prerequisite. Junio, would you mind adding that flag? Thanks, Michael

Nice To know you,

Good day dear, i hope this mail meets you well? my name is Jack, from the U.S. I know this may seem inappropriate so i ask for your forgiveness but i wish to get to know you better, if I may be so bold. I consider myself an easy-going man, adventurous, honest and fun loving person but I am

Re: [RFC PATCH 0/5] Add option to autostage changes when continuing a rebase

On 26/07/17 23:12, Junio C Hamano wrote: > Junio C Hamano writes: > >> Hmph, this is interesting. >> >> "git rebase" does take "--rerere-autoupdate" option from the command >> line, and propagates it to a later invocation of "rebase --continue" >> by storing the value to

URGENT REPLY FOR MORE DETAILS.

Compliment of the day, I am Mr.Kere Casmire I Have a Business Proposal of $5.3 million For You. I am aware of the unsafe nature of the internet, and was compelled to use this medium due to the nature of this project. I have access to very vital information that can be used to transfer this huge

Re: reftable [v3]: new ref storage format

On Mon, Jul 24, 2017 at 4:00 PM, Shawn Pearce wrote: > On Mon, Jul 24, 2017 at 3:22 PM, Stefan Beller wrote: >>> index record >>> >>> An index record describes the last entry in another block. >>> Index records are written as: >>> >>> varint(

URGENT REPLY FOR MORE DETAILS.

-- Compliment of the day, I am Mr.Kere Casmire I Have a Business Proposal of $5.3 million For You. I am aware of the unsafe nature of the internet, and was compelled to use this medium due to the nature of this project. I have access to very vital information that can be used to transfer this

Re: requesting permission to use some Git for Windows code

Le 25/07/2017 à 15:53, Johannes Schindelin a écrit : > > It is great that you can make use of the code! > > As to the licensing problem, I agree it is a hassle. The biggest obstacle > is that you have to have the consent of all the authors. > > You hereby have mine. > Many thanks Johannes for