Re: hunting for lost highly interactive browser based git tutorial

2018-10-02 Thread Jeff King
On Wed, Oct 03, 2018 at 01:28:20AM -0400, _g e r r y _ _l o w r y _ wrote: > The tutorial "may" have be called something like "Try Git"; > however, I can not find it at try.github.io and other places where i have > looked. Unfortunately, Try Git seems to have been shut down. I don't know of any

hunting for lost highly interactive browser based git tutorial

2018-10-02 Thread _g e r r y _ _l o w r y _
Help, please and thank you. i have spent > one hour searching via Google and by visiting git-scm, BitBucket, github, et cetera, for an excellent tutorial for beginners and refresher for one who has not touched git for quite a while. if you've done the same tutorial, you will recognize its

Re: [BUG] A part of an edge from an octopus merge gets colored, even with --color=never

2018-10-02 Thread Jeff King
On Mon, Sep 24, 2018 at 08:27:47PM -0400, Noam Postavsky wrote: > > So I think this is doing the right thing. I'm not sure if there's a > > better way to explain "dashless" or not. > > I've updated the comments and renamed a few variables, see if that helps. Yeah, I really like your

gitk doesn't quit

2018-10-02 Thread Alan Aversa
To quit gitk, I have to invoke ctrl-c from the command line. I get this error when trying to quit gitk with ctrl-q or from the GUI menu: -- ☧ error writing "stdout": I/O error error writing "stdout": I/O error while executing "puts "Error saving config: $err"" (procedure "savestuff"

Re: wrong output on fail

2018-10-02 Thread Jeff King
On Sat, Sep 29, 2018 at 03:30:21PM +1200, Paul Wratt wrote: > -- > ... > Total 21 (delta 8), reused 0 (delta 0) > error: RPC failed; result=56, HTTP code = 0 > fatal: The remote end hung up unexpectedly > fatal: The remote end hung up unexpectedly > Everything up-to-date >

Re: [PATCH v2 3/3] git-help.txt: document "git help cmd" vs "git cmd --help" for aliases

2018-10-02 Thread Jeff King
On Mon, Oct 01, 2018 at 01:21:07PM +0200, Rasmus Villemoes wrote: > This documents the existing behaviour of "git help cmd" when cmd is an > alias, as well as providing a hint to use the "git cmd --help" form to > be taken directly to the man page for the aliased command. Good idea. > diff

Re: [PATCH v2 2/3] git.c: handle_alias: prepend alias info when first argument is -h

2018-10-02 Thread Jeff King
On Mon, Oct 01, 2018 at 01:21:06PM +0200, Rasmus Villemoes wrote: > Most git commands respond to -h anywhere in the command line, or at > least as a first and lone argument, by printing the usage > information. For aliases, we can provide a little more information that > might be useful in

Re: [PATCH v2 1/3] help: redirect to aliased commands for "git cmd --help"

2018-10-02 Thread Jeff King
On Mon, Oct 01, 2018 at 01:21:05PM +0200, Rasmus Villemoes wrote: > As discussed in the thread for v1 of this patch [1] [2], this changes the > rules for "git foo --help" when foo is an alias. > > (0) When invoked as "git help foo", we continue to print the "foo is > aliased to bar" message and

Die Kontaktdaten des Pfarrer sind wie folgt

2018-10-02 Thread Monika Stefen
Lieber, mitteile ich Ihnen dass, ich das Geschaeft mit Erfolg zu Ende geschaft. Und ich bin im Momentan in Venezuela. Aber ich moechte Sie mit der Summe USD350,000.00 beloehnen fuer Ihre Unterstuetzung und Beistand waehrend unserer Zussammenarbeit. Auf diesen Grund habe ich einen Pfarrer

Re: [BUG] A part of an edge from an octopus merge gets colored, even with --color=never

2018-10-02 Thread Noam Postavsky
On Mon, 24 Sep 2018 at 20:27, Noam Postavsky wrote: > > On Sat, 8 Sep 2018 at 12:13, Jeff King wrote: > > > Great (and sorry for the delayed response). > > No problem, I know it's not the most urgent bug ever :) Ping. :) > I managed to recast my script into the framework of the > other tests

Re: [PATCH] more oideq/hasheq conversions

2018-10-02 Thread Jacob Keller
On Tue, Oct 2, 2018 at 2:19 PM Jeff King wrote: > > We added faster equality-comparison functions for hashes in > 14438c4497 (introduce hasheq() and oideq(), 2018-08-28). A > few topics were in-flight at the time, and can now be > converted. This covers all spots found by "make coccicheck" > in

Re: [PATCH v4 3/4] transport.c: introduce core.alternateRefsCommand

2018-10-02 Thread Jeff King
On Mon, Oct 01, 2018 at 07:23:58PM -0700, Taylor Blau wrote: > +core.alternateRefsCommand:: > + When advertising tips of available history from an alternate, use the > shell to > + execute the specified command instead of linkgit:git-for-each-ref[1]. > The > + first argument is the

[PATCH v4 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-02 Thread Taylor Blau
On Tue, Oct 02, 2018 at 04:13:13PM +0100, Ramsay Jones wrote: > > On 02/10/18 03:24, Taylor Blau wrote: > [snip] > > diff --git a/t/t5410-receive-pack-alternates.sh > > b/t/t5410-receive-pack-alternates.sh > > index 49d0fe44fb..94794c35da 100755 > > --- a/t/t5410-receive-pack-alternates.sh > >

Re: Git Evolve

2018-10-02 Thread Taylor Blau
On Tue, Oct 02, 2018 at 11:11:11AM +0200, Ævar Arnfjörð Bjarmason wrote: You timed this email quite well ;-). > On Tue, Oct 02 2018, Taylor Blau wrote: > > > Hi Stefan, > > > > On Sat, Sep 29, 2018 at 04:00:04PM -0700, Stefan Xenos wrote: > >> Hello, List! > >> > >> I'm interested in porting

Re: git clone works in ide but not git bash CLI

2018-10-02 Thread Johannes Schindelin
Hi David, On Mon, 24 Sep 2018, David Brown wrote: > Howdy, I have a conundrum: > > App: Spring Cloud Config Server > envvars: GIT_URL and SSH_KEY > IDE: Intellij 2018.2.4 Ultimate > > When I use the IDE to assign the SSH_KEY value all is copacetic. > > If I assign the envvar at the Git Bash

Re: cannot dowload from your amazon server a windows git distro

2018-10-02 Thread Taylor Blau
Hi, On Tue, Oct 02, 2018 at 01:59:51PM +0700, WEB0 - Helmut wrote: > hi, > you amazon download is not working. > do you have some free location to download please? I was able to download both 32- and 64-bit copies of the non-portable Windows installer for version 2.19.0. I used the link at [1]

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Stefan Beller
> > My preference is to avoid them in the name of simplicity. If you're > using "make SANITIZE=leak test" to check for leaks, it will skip these > cases. If you're using valgrind, I think these may be reported as > "reachable". But that number already isn't useful for finding real > leaks, because

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 10:59:28AM -0700, Stefan Beller wrote: > > Generally speaking, it > > seems impossible to UNLEAK when dying, since we don't know what we have > > allocated higher up in the call-stack. > > I do not understand; I thought UNLEAK was specifically for the purpose of > die()

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 12:44:09PM -0700, Stefan Beller wrote: > > My worry is that one of these would seem to be true: > > > > * UNLEAK is unsuitable for the job. Whenever we have a `die()` as we do > > here, we can UNLEAK the variables we know of, but we can't do anything > > about the

Re: Git Evolve

2018-10-02 Thread Kyle Meyer
Ævar Arnfjörð Bjarmason writes: > On Tue, Oct 02 2018, Taylor Blau wrote: [...] >> Specifically, I've wanted the 'hg absorb' command. My understanding of >> the commands functionality is that it builds a sort of flamegraph-esque >> view of the blame, and then cascades downwards parts of a

Re: [PATCH 1/1] protocol: limit max protocol version per service

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 3:00 PM Josh Steadmon wrote: > > For services other than git-receive-pack, clients currently advertise > that they support the version set in the protocol.version config, > regardless of whether or not there is actually an implementation of that > service for the given

[PATCH 1/1] protocol: limit max protocol version per service

2018-10-02 Thread Josh Steadmon
For services other than git-receive-pack, clients currently advertise that they support the version set in the protocol.version config, regardless of whether or not there is actually an implementation of that service for the given protocol version. This causes backwards- compatibility problems

[PATCH 0/1] Limit client version advertisements

2018-10-02 Thread Josh Steadmon
As discussed in [1], clients will incorrectly advertise support for protocol version 2 even when the service in question does not have a v2 implementation. This patch sets maximum protocol versions for git-receive-pack, git-upload-archive, and git-upload-pack. [1]:

Re: Git 2.19.01 on Windows crasesh during GC

2018-10-02 Thread Johannes Schindelin
Hi, On Fri, 14 Sep 2018, Michal Fita wrote: > Problem signature: > Problem Event Name: APPCRASH > Application Name: git.exe > Application Version:2.19.0.1 > Application Timestamp: 5b980bc7 > Fault Module Name: ntdll.dll > Fault Module Version: 6.1.7601.24117 >

Re: [PATCH] more oideq/hasheq conversions

2018-10-02 Thread Derrick Stolee
On 10/2/2018 5:19 PM, Jeff King wrote: We added faster equality-comparison functions for hashes in 14438c4497 (introduce hasheq() and oideq(), 2018-08-28). A few topics were in-flight at the time, and can now be converted. This covers all spots found by "make coccicheck" in master (the

[PATCH] more oideq/hasheq conversions

2018-10-02 Thread Jeff King
We added faster equality-comparison functions for hashes in 14438c4497 (introduce hasheq() and oideq(), 2018-08-28). A few topics were in-flight at the time, and can now be converted. This covers all spots found by "make coccicheck" in master (the coccicheck results were tweaked by hand for

Re: [PATCH] coccicheck: process every source file at once

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 01:58:10PM -0700, Jacob Keller wrote: > On Tue, Oct 2, 2018 at 1:31 PM Jeff King wrote: > > Actually, I guess we do not need to save $? at all, since we have only a > > single process to care about. So even simpler: > > > > spatch ... 2>$@+ 2>$@.log || > > { > >

Re: [PATCH v9 19/21] stash: convert `stash--helper.c` into `stash.c`

2018-10-02 Thread Thomas Gummerer
On 09/26, Paul-Sebastian Ungureanu wrote: > The old shell script `git-stash.sh` was removed and replaced > entirely by `builtin/stash.c`. In order to do that, `create` and > `push` were adapted to work without `stash.sh`. For example, before > this commit, `git stash create` called `git

Re: git projects with submodules in different sites - in txt format (:+(

2018-10-02 Thread Philip Oakley
On 02/10/2018 06:47, Michele Hallak wrote: Hi, I am getting out of idea about how to change the methodology we are using in order to ease our integration process... Close to despair, I am throwing the question to you... We have 6 infrastructure repositories [A, B, C, D, E, F ?]. Each

Re: [PATCH] coccicheck: process every source file at once

2018-10-02 Thread Jacob Keller
On Tue, Oct 2, 2018 at 1:31 PM Jeff King wrote: > Actually, I guess we do not need to save $? at all, since we have only a > single process to care about. So even simpler: > > spatch ... 2>$@+ 2>$@.log || > { > cat $@.log > exit 1 > } > # if we get here, we were successful

Re: [PATCH] branch: colorize branches checked out in a linked working tree the same way as the current branch is colorized

2018-10-02 Thread Johannes Schindelin
Hi Ævar, On Thu, 27 Sep 2018, Ævar Arnfjörð Bjarmason wrote: > On Thu, Sep 27 2018, Nickolai Belakovski wrote: > > > Will do re: screenshot when I get home, although it's pretty easy to > > imagine, the git branch output will have one other branch colored in green, > > bit without the asterisk

Re: [PATCH v9 16/21] stash: convert push to builtin

2018-10-02 Thread Thomas Gummerer
On 09/26, Paul-Sebastian Ungureanu wrote: > Add stash push to the helper. > > Signed-off-by: Paul-Sebastian Ungureanu > --- > builtin/stash--helper.c | 244 +++- > git-stash.sh| 6 +- > 2 files changed, 244 insertions(+), 6 deletions(-) > >

Re: [PATCH] coccicheck: process every source file at once

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 01:00:21PM -0700, Jacob Keller wrote: > > > This is nearly a 4x decrease in the time required to run make > > > coccicheck. This is due to the overhead of restarting spatch for every > > > file. By processing all files at once, we can amortize this startup cost > > >

Re: v2.19.0 Git install doesn't allow VS Code as an editor

2018-10-02 Thread Johannes Schindelin
Hi, On Fri, 14 Sep 2018, Taylor Blau wrote: > Hi Zachary, > > On Fri, Sep 14, 2018 at 09:43:43AM -0500, Zachary Bryant wrote: > > When the installer asks for a default editor, it defaults to vim and > > when I select either VS Code option, it won't allow me to proceed. > > It sounds like this

Re: [PATCH v9 15/21] stash: convert create to builtin

2018-10-02 Thread Thomas Gummerer
On 09/26, Paul-Sebastian Ungureanu wrote: > Add stash create to the helper. > > Signed-off-by: Paul-Sebastian Ungureanu > --- > builtin/stash--helper.c | 450 > git-stash.sh| 2 +- > 2 files changed, 451 insertions(+), 1 deletion(-) > >

Re: [PATCH v3] coccicheck: process every source file at once

2018-10-02 Thread Jacob Keller
On Tue, Oct 2, 2018 at 1:07 PM Jacob Keller wrote: > > From: Jacob Keller > > make coccicheck is used in order to apply coccinelle semantic patches, > and see if any of the transformations found within contrib/coccinelle/ > can be applied to the current code base. > > Pass every file to a single

[PATCH v3] coccicheck: process every source file at once

2018-10-02 Thread Jacob Keller
From: Jacob Keller make coccicheck is used in order to apply coccinelle semantic patches, and see if any of the transformations found within contrib/coccinelle/ can be applied to the current code base. Pass every file to a single invocation of spatch, instead of running spatch once per source

Re: [PATCH v2] coccicheck: process every source file at once

2018-10-02 Thread Jacob Keller
On Tue, Oct 2, 2018 at 1:03 PM Jacob Keller wrote: > > From: Jacob Keller > > make coccicheck is used in order to apply coccinelle semantic patches, > and see if any of the transformations found within contrib/coccinelle/ > can be applied to the current code base. > > Pass every file to a single

[PATCH v2] coccicheck: process every source file at once

2018-10-02 Thread Jacob Keller
From: Jacob Keller make coccicheck is used in order to apply coccinelle semantic patches, and see if any of the transformations found within contrib/coccinelle/ can be applied to the current code base. Pass every file to a single invocation of spatch, instead of running spatch once per source

Re: [PATCH] coccicheck: process every source file at once

2018-10-02 Thread Jacob Keller
On Tue, Oct 2, 2018 at 12:55 PM Jeff King wrote: > > On Tue, Oct 02, 2018 at 12:16:42PM -0700, Jacob Keller wrote: > > > make coccicheck is used in order to apply coccinelle semantic patches, > > and see if any of the transformations found within contrib/coccinelle/ > > can be applied to the

Re: [PATCH] coccicheck: process every source file at once

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 12:16:42PM -0700, Jacob Keller wrote: > make coccicheck is used in order to apply coccinelle semantic patches, > and see if any of the transformations found within contrib/coccinelle/ > can be applied to the current code base. > > Pass every file to a single invocation of

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 12:09 PM Martin Ågren wrote: > > On Tue, 2 Oct 2018 at 19:59, Stefan Beller wrote: > > > > + > > > > + string_list_clear(, 0); > > > > } > > > > > > Nit: The blank line adds some asymmetry, IMVHO. > > > > I think these blank lines are super common, as in: > > > >

Re: [PATCH v9 13/21] stash: mention options in `show` synopsis.

2018-10-02 Thread Thomas Gummerer
> Subject: stash: mention options in `show` synopsis. Really minor point, but the '.' in the end should be dropped. Also as this is fixing a pre-existing problem I would have put this patch near the beginning of the series, rather than in between conversions of functions, and just incorporated

Re: Git Evolve

2018-10-02 Thread Stefan Xenos
If you're curious how the Mercurial absorb command works, here's the code: https://www.mercurial-scm.org/repo/hg/file/tip/hgext/absorb.py It's GPL 2: https://www.mercurial-scm.org/repo/hg/file/tip/COPYING On Tue, Oct 2, 2018 at 2:11 AM, Ævar Arnfjörð Bjarmason wrote: > > On Tue, Oct 02

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 09:05:32PM +0200, René Scharfe wrote: > > The reason hashmap.c was added was to avoid open addressing. ;) > Because efficient removal of elements is easier to implement with > chaining, according to 6a364ced49 (add a hashtable implementation that > supports O(1) removal).

[PATCH] coccicheck: process every source file at once

2018-10-02 Thread Jacob Keller
From: Jacob Keller make coccicheck is used in order to apply coccinelle semantic patches, and see if any of the transformations found within contrib/coccinelle/ can be applied to the current code base. Pass every file to a single invocation of spatch, instead of running spatch once per source

Re: [PATCH 5/5] diff --color-moved: fix a memory leak

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 10:55 AM Phillip Wood wrote: > > From: Phillip Wood > > Free the hashmap items as well as the hashmap itself. This was found > with asan. > > Signed-off-by: Phillip Wood > --- > diff.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/diff.c

Re: [PATCH v7 7/7] read-cache: load cache entries on worker threads

2018-10-02 Thread Ben Peart
On 10/1/2018 1:09 PM, Duy Nguyen wrote: On Mon, Oct 1, 2018 at 3:46 PM Ben Peart wrote: +/* + * A helper function that will load the specified range of cache entries + * from the memory mapped file and add them to the given index. + */ +static unsigned long load_cache_entry_block(struct

Re: [PATCH 4/5] diff --color-moved-ws: fix another memory leak

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 10:55 AM Phillip Wood wrote: > > From: Phillip Wood > > This is obvious in retrospect, it was found with asan. Indeed. :/ Thanks, Stefan

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Martin Ågren
On Tue, 2 Oct 2018 at 19:59, Stefan Beller wrote: > > > + > > > + string_list_clear(, 0); > > > } > > > > Nit: The blank line adds some asymmetry, IMVHO. > > I think these blank lines are super common, as in: > > { > declarations; > > multiple; > lines(of); >

Re: [PATCH 3/5] diff --color-moved-ws: fix a memory leak

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 10:55 AM Phillip Wood wrote: > > From: Phillip Wood > > Don't duplicate the indentation string if we're not going to use it. > This was found with asan. Makes sense, Thanks, Stefan With compute_ws_delta growing bigger here (and having only one caller), I wonder if we

Re: [PATCH 2/2] fsck: use oidset for skiplist

2018-10-02 Thread René Scharfe
Am 01.10.2018 um 22:26 schrieb Jeff King: > On Mon, Oct 01, 2018 at 09:15:53PM +0200, René Scharfe wrote: > The reason hashmap.c was added was to avoid open addressing. ;) Because efficient removal of elements is easier to implement with chaining, according to 6a364ced49 (add a hashtable

Re: [PATCH 2/5] diff --color-moved-ws: fix out of bounds string access

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 10:55 AM Phillip Wood wrote: > > From: Phillip Wood > > When adjusting the start of the string to take account of the change > in indentation the code was not checking that the string being > adjusted was in fact longer than the indentation change. This was > detected by

Re: [PATCH 1/5] diff --color-moved-ws: fix double free crash

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 10:55 AM Phillip Wood wrote: > The solution is to store the ws_delta in the array of potential moved > blocks rather than with the lines. This means that it no longer needs > to be copied around and one block cannot overwrite the ws_delta of > another. Additionally it

Re: git fetch behaves weirdely when run in a worktree

2018-10-02 Thread Kaartic Sivaraam
Hi, Sorry for the delay. Got a little busy over the weekend. I seem to have found the reason behind the issue in the mean time :-) On Wed, 2018-09-26 at 10:05 -0700, Junio C Hamano wrote: > Duy Nguyen writes: > > > On Wed, Sep 26, 2018 at 05:24:14PM +0200, Duy Nguyen wrote: > > > On Wed, Sep

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Stefan Beller
On Tue, Oct 2, 2018 at 8:40 AM Martin Ågren wrote: > > On Tue, 2 Oct 2018 at 17:01, Derrick Stolee via GitGitGadget > wrote: > > diff --git a/commit-graph.c b/commit-graph.c > > index 2a24eb8b5a..7226bd6b58 100644 > > --- a/commit-graph.c > > +++ b/commit-graph.c > > @@ -698,6 +698,8 @@ void

[PATCH 5/5] diff --color-moved: fix a memory leak

2018-10-02 Thread Phillip Wood
From: Phillip Wood Free the hashmap items as well as the hashmap itself. This was found with asan. Signed-off-by: Phillip Wood --- diff.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/diff.c b/diff.c index 4464feacf8..94cc1b5592 100644 --- a/diff.c +++ b/diff.c @@

[PATCH 1/5] diff --color-moved-ws: fix double free crash

2018-10-02 Thread Phillip Wood
From: Phillip Wood Running git diff --color-moved-ws=allow-indentation-change v2.18.0 v2.19.0 results in a crash due to a double free. This happens when two potential moved blocks start with consecutive lines. As pmb_advance_or_null_multi_match() advances it copies the ws_delta from the last

[PATCH 4/5] diff --color-moved-ws: fix another memory leak

2018-10-02 Thread Phillip Wood
From: Phillip Wood This is obvious in retrospect, it was found with asan. Signed-off-by: Phillip Wood --- diff.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/diff.c b/diff.c index efadd05c90..4464feacf8 100644 --- a/diff.c +++ b/diff.c @@ -971,6 +971,8 @@ static void

[PATCH 3/5] diff --color-moved-ws: fix a memory leak

2018-10-02 Thread Phillip Wood
From: Phillip Wood Don't duplicate the indentation string if we're not going to use it. This was found with asan. Signed-off-by: Phillip Wood --- diff.c | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/diff.c b/diff.c index 0096bdc339..efadd05c90 100644 --- a/diff.c

[PATCH 2/5] diff --color-moved-ws: fix out of bounds string access

2018-10-02 Thread Phillip Wood
From: Phillip Wood When adjusting the start of the string to take account of the change in indentation the code was not checking that the string being adjusted was in fact longer than the indentation change. This was detected by asan. Signed-off-by: Phillip Wood --- diff.c | 2 +- 1 file

Re: [PATCH v7 6/7] ieot: add Index Entry Offset Table (IEOT) extension

2018-10-02 Thread Duy Nguyen
On Tue, Oct 2, 2018 at 6:34 PM Ben Peart wrote: > >> + offset = lseek(newfd, 0, SEEK_CUR) + > >> write_buffer_len; > > > > This only works correctly if the ce_write_entry() from the last > > iteration has flushed everything to out to newfd. Maybe it does, but > > it's error

Re: [PATCH v7 6/7] ieot: add Index Entry Offset Table (IEOT) extension

2018-10-02 Thread Ben Peart
On 10/1/2018 12:27 PM, Duy Nguyen wrote: On Mon, Oct 1, 2018 at 3:46 PM Ben Peart wrote: @@ -1888,6 +1890,23 @@ static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries) return ondisk_size + entries * per_entry; } +struct index_entry_offset +{ + /*

Re: [PATCH v2 8/8] reflog expire: cover reflog from all worktrees

2018-10-02 Thread Duy Nguyen
On Sun, Sep 30, 2018 at 7:36 AM Eric Sunshine wrote: > > On Sat, Sep 29, 2018 at 3:11 PM Nguyễn Thái Ngọc Duy > wrote: > > Signed-off-by: Nguyễn Thái Ngọc Duy > > --- > > diff --git a/Documentation/git-reflog.txt b/Documentation/git-reflog.txt > > @@ -72,6 +72,11 @@ Options for `expire` > >

[PATCH v3 1/2] t1300: extract and use test_cmp_config()

2018-10-02 Thread Nguyễn Thái Ngọc Duy
In many config-related tests it's common to check if a config variable has expected value and we want to print the differences when the test fails. Doing it the normal way is three lines of shell code. Let's add a function do to all this (and a little more). This function has uses outside t1300

[PATCH v3 2/2] worktree: add per-worktree config files

2018-10-02 Thread Nguyễn Thái Ngọc Duy
A new repo extension is added, worktreeConfig. When it is present: - Repository config reading by default includes $GIT_DIR/config _and_ $GIT_DIR/config.worktree. "config" file remains shared in multiple worktree setup. - The special treatment for core.bare and core.worktree, to stay

[PATCH v3 0/2] Per-worktree config files

2018-10-02 Thread Nguyễn Thái Ngọc Duy
v3 changes are minor (besides test_cmp_config), mostly document cleanup. Diff diff --git a/Documentation/config.txt b/Documentation/config.txt index 44407e69db..e036ff7b86 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -4,7 +4,7 @@ CONFIGURATION FILE The Git

Re: [PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Martin Ågren
On Tue, 2 Oct 2018 at 17:01, Derrick Stolee via GitGitGadget wrote: > diff --git a/commit-graph.c b/commit-graph.c > index 2a24eb8b5a..7226bd6b58 100644 > --- a/commit-graph.c > +++ b/commit-graph.c > @@ -698,6 +698,8 @@ void write_commit_graph_reachable(const char *obj_dir, > int append, >

Re: [PATCH v4 4/4] transport.c: introduce core.alternateRefsPrefixes

2018-10-02 Thread Ramsay Jones
On 02/10/18 03:24, Taylor Blau wrote: [snip] > diff --git a/t/t5410-receive-pack-alternates.sh > b/t/t5410-receive-pack-alternates.sh > index 49d0fe44fb..94794c35da 100755 > --- a/t/t5410-receive-pack-alternates.sh > +++ b/t/t5410-receive-pack-alternates.sh > @@ -30,4 +30,12 @@

Re: [PATCH v7 3/7] eoie: add End of Index Entry (EOIE) extension

2018-10-02 Thread Ben Peart
On 10/1/2018 11:30 AM, Duy Nguyen wrote: On Mon, Oct 1, 2018 at 3:46 PM Ben Peart wrote: @@ -2479,6 +2491,7 @@ static int do_write_index(struct index_state *istate, struct tempfile *tempfile, if (ce_write(, newfd, , sizeof(hdr)) < 0) return -1; + offset =

Re: [PATCH v6 17/21] range-diff: populate the man page

2018-10-02 Thread Johannes Schindelin
Hi Peff, On Mon, 10 Sep 2018, Jeff King wrote: > On Sun, Sep 09, 2018 at 07:19:51PM +0200, Ævar Arnfjörð Bjarmason wrote: > > > >> And then I turn that into: > > >> > > >> # @{u} because I happen to be on 'master' and it's shorter to type > > >> # than origin/master... > > >> git

Re: [PATCH v7 5/7] read-cache: load cache extensions on a worker thread

2018-10-02 Thread Ben Peart
On 10/1/2018 11:50 AM, Duy Nguyen wrote: On Mon, Oct 1, 2018 at 3:46 PM Ben Peart wrote: @@ -1890,6 +1891,46 @@ static size_t estimate_cache_size(size_t ondisk_size, unsigned int entries) static size_t read_eoie_extension(const char *mmap, size_t mmap_size); static void

[PATCH 2/2] commit-graph: reduce initial oid allocation

2018-10-02 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee While writing a commit-graph file, we store the full list of commits in a flat list. We use this list for sorting and ensuring we are closed under reachability. The initial allocation assumed that (at most) one in four objects is a commit. This is a dramatic over-count for

[PATCH 1/2] commit-graph: clean up leaked memory during write

2018-10-02 Thread Derrick Stolee via GitGitGadget
From: Derrick Stolee The write_commit_graph() method in commit-graph.c leaks some lits and strings during execution. In addition, a list of strings is leaked in write_commit_graph_reachable(). Clean these up so our memory checking is cleaner. Running 'valgrind --leak-check=full git commit-graph

[PATCH 0/2] Clean up leaks in commit-graph.c

2018-10-02 Thread Derrick Stolee via GitGitGadget
While looking at the commit-graph code, I noticed some memory leaks. These can be found by running valgrind --leak-check=full ./git commit-graph write --reachable The impact of these leaks are small, as we never call write_commit_graph _reachable in a loop, but it is best to be diligent here.

Re: Display a commit in red if it is not signed.

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 11:26:19AM +0200, Jayesh Badwaik wrote: > Is there a way to create git pretty format that sets the color to one > color (say red) only when the commit is unsigned or the signature > cannot be verified? Not currently. There are placeholders to show the signing information

Re: WG: [git-for-windows/git] log -L//,+1 not accepted (#1856)

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 06:56:29AM +, peter.doll...@mt.com wrote: > Please see my original observation below. > Is it possible, to extend the git-log syntax in the way, that it > accepts the short -L option (without :file) of blame in unique cases > (only one file is logged or respectively

Re: [PATCH 2/2] t3430: update to test with custom commentChar

2018-10-02 Thread Johannes Schindelin
Hi Daniel, [I forgot to address this mail earlier, my apologies] On Tue, 10 Jul 2018, Daniel Harding wrote: > On Tue, 10 Jul 2018 at 16:08:57 +0300, Johannes Schindelin wrote:> > > On Tue, 10 Jul 2018, Daniel Harding wrote: > > > > > On Mon, 09 Jul 2018 at 22:14:58 +0300, Johannes Schindelin

Re: git-remote-helper list command question

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 11:43:50AM +0200, Stanisław Drozd wrote: > I'm trying to write a fast-import-based git remote helper, but I'm not > sure what the output of the `list` command should look like. How can I > find an example of the format in action? There's some documentation in "git help

Re: [PATCH v7 3/7] eoie: add End of Index Entry (EOIE) extension

2018-10-02 Thread Ben Peart
On 10/1/2018 11:17 AM, SZEDER Gábor wrote: On Mon, Oct 01, 2018 at 09:45:52AM -0400, Ben Peart wrote: From: Ben Peart The End of Index Entry (EOIE) is used to locate the end of the variable length index entries and the beginning of the extensions. Code can take advantage of this to quickly

Re: RUNTIME_PREFIX references in gitconfig variable paths

2018-10-02 Thread Johannes Schindelin
Hi Paul, [late reply, I know, sorry about that!] On Wed, 4 Jul 2018, Paul Smith wrote: > On Wed, 2018-07-04 at 13:26 +0200, Johannes Schindelin wrote: > > On Wed, 4 Jul 2018, Paul Smith wrote: > > > > > One thing I wanted to do was provide a default ca-bundle.crt file > > > along with my local

Re: Using git svn rebase at quarantine environment or a feasible alternative to synchronize git and svn repositories

2018-10-02 Thread Jeff King
On Tue, Oct 02, 2018 at 10:28:38AM +, Jose Gisbert wrote: > Moreover, assuming that solution #1 will generally work and the facts that: > > - I think it would be possible to us to recover from a corrupted repository > somehow easily. Couldn't we, for instance, reset from a failed push and

Re: [PATCH v4 4/4] rebase --skip: clean up commit message after a failed fixup/squash

2018-10-02 Thread Johannes Schindelin
Hi Phillip, [sorry, I just got to this mail now] On Sun, 6 May 2018, Phillip Wood wrote: > On 27/04/18 21:48, Johannes Schindelin wrote: > > > > During a series of fixup/squash commands, the interactive rebase builds > > up a commit message with comments. This will be presented to the user in

ATENÇÃO

2018-10-02 Thread Administrador
ATENÇÃO; Sua caixa de correio excedeu o limite de armazenamento, que é de 5 GB como definido pelo administrador, que está atualmente em execução no 10.9GB, você pode não ser capaz de enviar ou receber novas mensagens até que você re-validar a sua caixa de correio. Para revalidar sua caixa de

Re: [PATCH] gpg-interface: reflect stderr to stderr

2018-10-02 Thread Johannes Schindelin
Hi Michael, [blast from the past] On Mon, 12 Sep 2016, Michael J Gruber wrote: > As a side note, I'm wondering why MSYS-gpg version 1 is bundled with > non-MSYS-git. Those are two questions: - an MSYS version of GPG is bundled because it was the stable one available at the time when I had

RE: Using git svn rebase at quarantine environment or a feasible alternative to synchronize git and svn repositories

2018-10-02 Thread Jose Gisbert
> Makes sense. It's certainly not impossible to have some magic "push to > git". I only wanted to point out that it's extra complexity, so if you > could do away with that aspect of it you'd save yourself some > complexity. I was going to elaborate a bit on how that can go wrong, > but I see Jeff

RE: Using git svn rebase at quarantine environment or a feasible alternative to synchronize git and svn repositories

2018-10-02 Thread Jose Gisbert
> As you noticed, this used to be allowed. But it's dangerous, because if > the movement of the objects out of quarantine fails, then you're left > with a corrupted ref (ditto, anybody looking at the ref after update but > before quarantine ends will see what appears to be a corrupted >

LOANS

2018-10-02 Thread steven
DO YOU REALLY NEED A LEGIT BUSINESS OR PERSONAL LOAN AT LOW INEREST OF 3%?CONTACT MR STEVEN MARTINS FOR MORE INFO

git-remote-helper list command question

2018-10-02 Thread Stanisław Drozd
I'm trying to write a fast-import-based git remote helper, but I'm not sure what the output of the `list` command should look like. How can I find an example of the format in action? Thanks, Stan

Display a commit in red if it is not signed.

2018-10-02 Thread Jayesh Badwaik
Is there a way to create git pretty format that sets the color to one color (say red) only when the commit is unsigned or the signature cannot be verified? Thank you -- Cheers Jayesh Badwaik https://jayeshbadwaik.gitlab.io

Re: Git Evolve

2018-10-02 Thread Ævar Arnfjörð Bjarmason
On Tue, Oct 02 2018, Taylor Blau wrote: > Hi Stefan, > > On Sat, Sep 29, 2018 at 04:00:04PM -0700, Stefan Xenos wrote: >> Hello, List! >> >> I'm interested in porting something like Mercurial's evolve command to >> Git. > > Welcome to Git :-). I think that the discussion in this thread is good,

WG: [git-for-windows/git] log -L//,+1 not accepted (#1856)

2018-10-02 Thread Peter.Dolland
Please see my original observation below. Is it possible, to extend the git-log syntax in the way, that it accepts the short -L option (without :file) of blame in unique cases (only one file is logged or respectively the -L expression may be valid for all logged files)? It would be nice for

cannot dowload from your amazon server a windows git distro

2018-10-02 Thread WEB0 - Helmut
hi, you amazon download is not working. do you have some free location to download please?

git projects with submodules in different sites - in txt format (:+(

2018-10-02 Thread Michele Hallak
Hi, I am getting out of idea about how to change the methodology we are using in order to ease our integration process... Close to despair, I am throwing the question to you... We have 6 infrastructure repositories. Each project is composed of 4 repositories, each one using one or two