external diff driver is not used for diff --stat?

2018-01-24 Thread Yaroslav Halchenko
Dear Git Peoples, I am torturing git and git-annex here trying to compare some logs from a run of a software recorded in two different branches. As many other tools, software often logs its version, elapsed times etc, so diff becomes not of interest to me: $> PATH=~/proj/misc/git/INSTAL

RE: [PATCH v2 0/6] Force pipes to flush immediately on NonStop platform

2018-01-24 Thread Randall S. Becker
On January 23, 2018 1:13 PM, Junio C Hamano wrote: > > "Randall S. Becker" writes: > > >> IOW, I do not see it explained clearly why this change is needed on > >> any single platform---so "that issue may be shared by others, too" > >> is a bit premature thing for me to listen to and understand,

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Isaac Hier
Stephan, I totally agree about the advanced options. At first, I left them as visible options seeing as the Makefile does not comment which are advanced and which are basic. In terms of the up-to-dateness, I find it easier to "fast-forward" all the changes at once without tangling myself in a load

[PATCH 6/6] daemon: fix length computation in newline stripping

2018-01-24 Thread Jeff King
When git-daemon gets a pktline request, we strip off any trailing newline, replacing it with a NUL. Clients prior to 5ad312bede (in git v1.4.0) would send: git-upload-pack repo.git\n and we need to strip it off to understand their request. After 5ad312bede, we send the host attribute but no new

[PATCH 5/6] t/lib-git-daemon: add network-protocol helpers

2018-01-24 Thread Jeff King
All of our git-protocol tests rely on invoking the client and having it make a request of a server. That gives a nice real-world test of how the two behave together, but it doesn't leave any room for testing how a server might react to _other_ clients. Let's add a few test helper functions which c

[PATCH 4/6] daemon: handle NULs in extended attribute string

2018-01-24 Thread Jeff King
If we receive a request with extended attributes after the NUL, we try to write those attributes to the log. We do so with a "%s" format specifier, which will only show characters up to the first NUL. That's enough for printing a "host=" specifier. But since dfe422d04d (daemon: recognize hidden re

[PATCH 3/6] daemon: fix off-by-one in logging extended attributes

2018-01-24 Thread Jeff King
If receive a request like: git-upload-pack /foo.git\0host=localhost we mark the offset of the NUL byte as "len", and then log the bytes after the NUL with a "%.*s" placeholder, using "pktlen - len" as the length, and "line + len + 1" as the start of the string. This is off-by-one, since the st

[PATCH 2/6] t/lib-git-daemon: record daemon log

2018-01-24 Thread Jeff King
When we start git-daemon for our tests, we send its stderr log stream to a named pipe. We synchronously read the first line to make sure that the daemon started, and then dump the rest to descriptor 4. This is handy for debugging test output with "--verbose", but the tests themselves can't access t

[PATCH 1/6] t5570: use ls-remote instead of clone for interp tests

2018-01-24 Thread Jeff King
We don't actually care about the clone operation here; we just want to know if we were able to actually contact the remote repository. Using ls-remote does that more efficiently, and without us having to worry about managing the tmp.git directory. Signed-off-by: Jeff King --- t/t5570-git-daemon.

[PATCH 0/6] off-by-one errors in git-daemon

2018-01-24 Thread Jeff King
This series fixes two off-by-one errors in git-daemon noticed by Michael (who then nerd-sniped me into fixing them). It also improves git-daemon's verbose logging of extended attributes, and beefs up the tests a bit. Before anyone gets excited, no, these aren't security-interesting errors. The onl

Re: git 2.16, Jenkins git client plugin, and ""

2018-01-24 Thread Mark Waite
On Wed, Jan 24, 2018 at 5:31 PM, Bryan Turner wrote: > On Wed, Jan 24, 2018 at 3:55 PM, Mark Waite wrote: >> It appears that git 2.16.0 and 2.16.1 have introduced a change which >> surprises the Jenkins git client plugin. >> >> Git 2.16.0 and 2.16.1 on Linux both report "fatal: ssh variant >> 'si

Re: git 2.16, Jenkins git client plugin, and ""

2018-01-24 Thread Bryan Turner
On Wed, Jan 24, 2018 at 3:55 PM, Mark Waite wrote: > It appears that git 2.16.0 and 2.16.1 have introduced a change which > surprises the Jenkins git client plugin. > > Git 2.16.0 and 2.16.1 on Linux both report "fatal: ssh variant > 'simple' does not support setting port" when used in the context

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 07:10:15PM -0500, Jeff King wrote: > On Thu, Jan 25, 2018 at 01:03:25AM +0100, Ævar Arnfjörð Bjarmason wrote: > > > > You may also want to use "--threads=1" to avoid non-determinism in the > > > generated packs. In theory, both repos would then produce identical base > > >

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Jeff King
On Thu, Jan 25, 2018 at 01:03:25AM +0100, Ævar Arnfjörð Bjarmason wrote: > > You may also want to use "--threads=1" to avoid non-determinism in the > > generated packs. In theory, both repos would then produce identical base > > packs, though it does not seem to do so in practice (I didn't dig in

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 24 2018, Jeff King jotted: > On Wed, Jan 24, 2018 at 11:03:47PM +0100, Ævar Arnfjörð Bjarmason wrote: > >> This produces a total of 0 blocks that are the same. If after the repack >> we throw this in there after the repack: >> >> echo 5be1f00a9a | git pack-objects --no-reuse-delta

git 2.16, Jenkins git client plugin, and ""

2018-01-24 Thread Mark Waite
It appears that git 2.16.0 and 2.16.1 have introduced a change which surprises the Jenkins git client plugin. Git 2.16.0 and 2.16.1 on Linux both report "fatal: ssh variant 'simple' does not support setting port" when used in the context of the Jenkins git client plugin. The solution we've accept

Re: [PATCH v4 1/4] Add tar extract install options override in installation processing.

2018-01-24 Thread Ramsay Jones
On 24/01/18 20:33, Junio C Hamano wrote: > randall.s.bec...@rogers.com writes: > >> From: "Randall S. Becker" >> Subject: Re: [PATCH v4 1/4] Add tar extract install options override in >> installation processing. > > We typically start the subject with some short token to help readers > of "g

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Jeff King
On Thu, Jan 25, 2018 at 12:06:59AM +0100, Ævar Arnfjörð Bjarmason wrote: > >> Has anyone here barked up this tree before? Suggestions? Tips on where > >> to start hacking the repack code to accomplish this would be most > >> welcome. > > > > Does this overlap with the desire to have resumable clon

Re: [PATCH v3 00/11] document & test fetch pruning & add fetch.pruneTags

2018-01-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 24 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> Documentation/config.txt | 20 - >> Documentation/fetch-options.txt| 18 +++- >> Documentation/git-fetch.txt| 76 + >> Documentation/git-remote.txt

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 11:03:47PM +0100, Ævar Arnfjörð Bjarmason wrote: > This produces a total of 0 blocks that are the same. If after the repack > we throw this in there after the repack: > > echo 5be1f00a9a | git pack-objects --no-reuse-delta --no-reuse-object > --revs .git/objects/pack/

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 24 2018, Elijah Newren jotted: > On Wed, Jan 24, 2018 at 2:03 PM, Ævar Arnfjörð Bjarmason > wrote: >> If you have a bunch of git repositories cloned of the same project on >> the same filesystem, it would be nice of the packs that are produced >> would be friendly to block-level dedu

Re: [PATCH v3 00/11] document & test fetch pruning & add fetch.pruneTags

2018-01-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > Documentation/config.txt | 20 - > Documentation/fetch-options.txt| 18 +++- > Documentation/git-fetch.txt| 76 + > Documentation/git-remote.txt | 14 +-- > builtin/fetch.c

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 24 2018, Junio C. Hamano jotted: > Mike Hommey writes: > >> FWIW, I sidestep the problem entirely by using alternatives. > > That's a funny way to use the word "side-step", I would say, as the > alternate object store support is there exactly for this use case. Things you can't do w

[no subject]

2018-01-24 Thread Mark Waite
subscribe git

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Elijah Newren
On Wed, Jan 24, 2018 at 2:03 PM, Ævar Arnfjörð Bjarmason wrote: > If you have a bunch of git repositories cloned of the same project on > the same filesystem, it would be nice of the packs that are produced > would be friendly to block-level deduplication. > > This would save space, and the blocks

Re: What's cooking in git.git (Jan 2018, #03; Tue, 23)

2018-01-24 Thread Junio C Hamano
Jeff Hostetler writes: > On 1/23/2018 5:39 PM, Junio C Hamano wrote: >> [Stalled] >> >> * jh/status-no-ahead-behind (2018-01-04) 4 commits >> - status: support --no-ahead-behind in long format >> - status: update short status to respect --no-ahead-behind >> - status: add --[no-]ahead-behind

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Mike Hommey
On Wed, Jan 24, 2018 at 02:23:57PM -0800, Junio C Hamano wrote: > Mike Hommey writes: > > > FWIW, I sidestep the problem entirely by using alternatives. > > That's a funny way to use the word "side-step", I would say, as the > alternate object store support is there exactly for this use case. I

RE: [PATCH v4 1/4] Add tar extract install options override in installation processing.

2018-01-24 Thread Randall S. Becker
> -Original Message- > From: Todd Zullinger [mailto:t...@pobox.com] > Sent: January 24, 2018 5:02 PM > To: Junio C Hamano > Cc: randall.s.bec...@rogers.com; git@vger.kernel.org; Randall S. Becker > > Subject: Re: [PATCH v4 1/4] Add tar extract install options override in > installation pr

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Eric Wong
Ævar Arnfjörð Bjarmason wrote: > If you have a bunch of git repositories cloned of the same project on > the same filesystem, it would be nice of the packs that are produced > would be friendly to block-level deduplication. Fwiw, I currently get around this when mirroring by having all the remote

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Junio C Hamano
Mike Hommey writes: > FWIW, I sidestep the problem entirely by using alternatives. That's a funny way to use the word "side-step", I would say, as the alternate object store support is there exactly for this use case.

Re: Git packs friendly to block-level deduplication

2018-01-24 Thread Mike Hommey
On Wed, Jan 24, 2018 at 11:03:47PM +0100, Ævar Arnfjörð Bjarmason wrote: > If you have a bunch of git repositories cloned of the same project on > the same filesystem, it would be nice of the packs that are produced > would be friendly to block-level deduplication. > > This would save space, and t

Git packs friendly to block-level deduplication

2018-01-24 Thread Ævar Arnfjörð Bjarmason
If you have a bunch of git repositories cloned of the same project on the same filesystem, it would be nice of the packs that are produced would be friendly to block-level deduplication. This would save space, and the blocks would be more likely to be in cache when you access them, likely speeding

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Stephan Beyer
On 01/24/2018 10:19 PM, Isaac Hier wrote: > Thanks for your interest! This patch is based on the cmake-build > branch of https://github.com/isaachier/git, but the full history is on > the cmake branch (squashed it for easier readability). Hope that > helps. Thanks. I use the cmake branch because I

Re: [PATCH v4 1/4] Add tar extract install options override in installation processing.

2018-01-24 Thread Todd Zullinger
Junio C Hamano wrote: > randall.s.bec...@rogers.com writes: >> +# Define TAR_EXTRACT_OPTIONS if you want to change the default behaviour >> +# from xvf to something else during installation. The option only includes ^^^ Shouldn't this be xof? >> +# "o" as xf are required. -- Todd

Re: [PATCH 1/8] sequencer: introduce new commands to reset the revision

2018-01-24 Thread Junio C Hamano
Eric Sunshine writes: >> +static int do_reset(const char *name, int len) >> +{ >> + [...] >> + if (hold_locked_index(&lock, LOCK_REPORT_ON_ERROR) < 0) >> + return -1; >> + >> + for (i = 0; i < len; i++) >> + if (isspace(name[i])) >> +

RE: [PATCH v4 3/4] Bring NonStop platform definitions up to date in git-compat-util.h

2018-01-24 Thread Randall S. Becker
On January 24, 2018 4:18 PM, Junio C Hamano wrote: > > "Randall S. Becker" writes: > > >> > +#ifdef __TANDEM > >> > +#if !defined(_THREAD_SUPPORT_FUNCTIONS) && > >> !defined(_PUT_MODEL_) > >> > +/* #include > >> > + > >> > +*/ > >> > +/* #include */ #endif > >> > >> The above adds a conditional

RE: [PATCH v4 2/4] Define config options required for the HPE NonStop NSX and NSE platforms

2018-01-24 Thread randall.s.becker
On January 24, 2018 4:19 PM, Junio C Hamano wrote: > > randall.s.bec...@rogers.com writes: > > > From: "Randall S. Becker" > > > > Upgrade old options in config.mak.uname to currently supported NonStop > > operating system versions (J06.21 and L17.xx). > > > > Signed-off-by: Randall S. Becker >

Re: [PATCH v4 3/4] Bring NonStop platform definitions up to date in git-compat-util.h

2018-01-24 Thread Junio C Hamano
Junio C Hamano writes: > "Randall S. Becker" writes: > >>> > +#ifdef __TANDEM >>> > +#if !defined(_THREAD_SUPPORT_FUNCTIONS) && >>> !defined(_PUT_MODEL_) >>> > +/* #include >>> > +*/ >>> > +/* #include */ >>> > +#endif >>> >>> The above adds a conditional no-op? That's confusing... >> >> We

Re: [PATCH v3 00/14] Some fixes and bunch of object_id conversions

2018-01-24 Thread Junio C Hamano
Patryk Obara writes: > Patryk Obara (14): > http-push: improve error log > clang-format: adjust penalty for return type line break > sha1_file: convert pretend_sha1_file to object_id > dir: convert struct sha1_stat to use object_id > sha1_file: convert hash_sha1_file to object_id > ca

Re: [PATCH v3 04/14] dir: convert struct sha1_stat to use object_id

2018-01-24 Thread Junio C Hamano
Patryk Obara writes: > Convert the declaration of struct sha1_stat. Adjust all usages of this > struct and replace hash{clr,cmp,cpy} with oid{clr,cmp,cpy} wherever > possible. Rename it to struct oid_stat. OK, but a hunk like this makes readers wonder... > -static int do_read_blob(const struct

Re: [PATCH 3/6] find_reference_location(): make function safe for empty snapshots

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 01:11:00PM -0800, Junio C Hamano wrote: > > This tightens the binary search termination condition. If we ever did > > see "hi > lo", we'd want to terminate the loop. Is that ever possible? > > I think you meant "lo > hi", but I shared the same "Huh?" moment. Er, yeah. Sor

Re: [PATCH v3 00/14] Some fixes and bunch of object_id conversions

2018-01-24 Thread Junio C Hamano
Patryk Obara writes: > Compared to v2: > > * rebased to latest master > > * patch 1 and 2 > I kept them in, but if Junio prefers them separately then I'll send > them as separate patches. It's not just me, but I think they should be separated out (I can just queue them separately, and there is n

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Isaac Hier
Thanks for your interest! This patch is based on the cmake-build branch of https://github.com/isaachier/git, but the full history is on the cmake branch (squashed it for easier readability). Hope that helps. On Wed, Jan 24, 2018 at 4:15 PM, Stephan Beyer wrote: > Hi Isaac, > > On 01/24/2018 02:45

Re: [PATCH v4 2/4] Define config options required for the HPE NonStop NSX and NSE platforms

2018-01-24 Thread Junio C Hamano
randall.s.bec...@rogers.com writes: > From: "Randall S. Becker" > > Upgrade old options in config.mak.uname to currently supported > NonStop operating system versions (J06.21 and L17.xx). > > Signed-off-by: Randall S. Becker > --- > config.mak.uname | 29 + > 1 file

Re: [PATCH v4 3/4] Bring NonStop platform definitions up to date in git-compat-util.h

2018-01-24 Thread Junio C Hamano
"Randall S. Becker" writes: >> > +#ifdef __TANDEM >> > +#if !defined(_THREAD_SUPPORT_FUNCTIONS) && >> !defined(_PUT_MODEL_) >> > +/* #include >> > +*/ >> > +/* #include */ >> > +#endif >> >> The above adds a conditional no-op? That's confusing... > > We are trying to make PUT work with git on

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Isaac Hier
CMake is very portable (see https://open.cdash.org/index.php?project=CMake for details). About the whole autoconf history in Git, I came across this post by Linus while researching if anyone had done something with CMake in the git project before: > NO! At least the Makefile is debuggable and unde

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Stephan Beyer
Hi Isaac, On 01/24/2018 02:45 PM, Isaac Hier wrote: > I realize this is a huge patch, but does anyone have feedback for the > general idea? Thank you very much. I am *personally* interested in this due to several reasons (which are mostly that I am used to CMake and when I do something on the Git

Re: [PATCH v3 11/11] fetch: add a --fetch-prune option and fetch.pruneTags config

2018-01-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Wed, Jan 24 2018, Junio C. Hamano jotted: > >> Ævar Arnfjörð Bjarmason writes: >> >>> git -C {} config --replace-all remote.origin.fetch >>> "+refs/tags/*:refs/tags/*" "^\+*refs/tags/\*:refs/tags/\*$" >> >> Shouldn't the last arg be >> >> '^+\*refs/tags/\

Re: [PATCH 3/6] find_reference_location(): make function safe for empty snapshots

2018-01-24 Thread Junio C Hamano
Jeff King writes: > On Wed, Jan 24, 2018 at 12:14:13PM +0100, Michael Haggerty wrote: > >> diff --git a/refs/packed-backend.c b/refs/packed-backend.c >> index 08698de6ea..361affd7ad 100644 >> --- a/refs/packed-backend.c >> +++ b/refs/packed-backend.c >> [...] >> @@ -551,7 +553,7 @@ static const c

Re: [PATCH v3 11/11] fetch: add a --fetch-prune option and fetch.pruneTags config

2018-01-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 24 2018, Junio C. Hamano jotted: > Ævar Arnfjörð Bjarmason writes: > >> git -C {} config --replace-all remote.origin.fetch >> "+refs/tags/*:refs/tags/*" "^\+*refs/tags/\*:refs/tags/\*$" > > Shouldn't the last arg be > > '^+\*refs/tags/\*:refs/tags/\*$' > > instead? ^+\* isn't a

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Jeff Hostetler
On 1/24/2018 2:59 PM, Isaac Hier wrote: Jeff, no worries, fair enough. I know https://github.com/grpc/grpc uses a shared file to generate code for several build systems instead of maintaining them individually. I plan on doing the work anyway just because I have my own reasons to use CMake in G

Re: [PATCH 0/6] Yet another approach to handling empty snapshots

2018-01-24 Thread Junio C Hamano
Michael Haggerty writes: > This patch series fixes the handling of empty packed-refs snapshots > (i.e., those with `snapshot->buf` and friends equal to `NULL`), partly > by changing `snapshot` to store a pointer to the start of the > post-header `packed-refs` content instead of `header_len`. It m

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Ævar Arnfjörð Bjarmason
On Wed, Jan 24 2018, Junio C. Hamano jotted: > Isaac Hier writes: > >> I realize this is a huge patch, but does anyone have feedback for the >> general idea? > > I personally am not interested, especially with the justification > given in the cover letter. > > Perhaps the one in this patch may b

Re: [PATCH v3 02/11] fetch: stop accessing "remote" variable indirectly

2018-01-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > remote->prune-tags field, but without hte use of the gtransport s/-tags/_tags/; s/hte/the/; No need to resend for fixing the above, as I've done so locally before queuing. Thanks.

Re: [PATCH v3 11/11] fetch: add a --fetch-prune option and fetch.pruneTags config

2018-01-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > git -C {} config --replace-all remote.origin.fetch > "+refs/tags/*:refs/tags/*" "^\+*refs/tags/\*:refs/tags/\*$" Shouldn't the last arg be '^+\*refs/tags/\*:refs/tags/\*$' instead?

RE: [PATCH v4 3/4] Bring NonStop platform definitions up to date in git-compat-util.h

2018-01-24 Thread Randall S. Becker
On January 24, 2018 3:36 PM, Junio C Hamano wrote: > randall.s.bec...@rogers.com writes: > > > From: "Randall S. Becker" > > > > Add correct FLOSS (NonStop platform emulation) definitions into > > git-compat-util.h to allow correct emulation of non-platform > > behaviour. Also added NSIG definiti

Re: [PATCH 0/7] nd/worktree-move reboot

2018-01-24 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > This series adds two more commands "git worktree move" and "git > worktree remove" to do those things. I think I have addressed all > comments from the mail threads referenced in "What's cooking" mails. I > also added the ability to remove a worktree if its worktre

Re: [PATCH 0/5] nd/fix-untracked-cache-invalidation updates

2018-01-24 Thread Junio C Hamano
Ævar Arnfjörð Bjarmason writes: > On Wed, Jan 24 2018, Nguyễn Thái Ngọc Duy jotted: > >> This is a small update where the last two patches on 'pu' are merged >> in one. The final content is exactly the same as on 'pu'. >> >> Nguyễn Thái Ngọc Duy (3): >> dir.c: avoid stat() in valid_cached_dir()

Re: [PATCH 0/6] Yet another approach to handling empty snapshots

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 12:14:10PM +0100, Michael Haggerty wrote: > This patch series fixes the handling of empty packed-refs snapshots > (i.e., those with `snapshot->buf` and friends equal to `NULL`), partly > by changing `snapshot` to store a pointer to the start of the > post-header `packed-ref

Re: [PATCH 1/6] struct snapshot: store `start` rather than `header_len`

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 12:14:11PM +0100, Michael Haggerty wrote: > Store a pointer to the start of the actual references within the > `packed-refs` contents rather than storing the length of the header. > This is more convenient for most users of this field. This makes sense. It means that the "

Re: [PATCH v4 3/4] Bring NonStop platform definitions up to date in git-compat-util.h

2018-01-24 Thread Junio C Hamano
randall.s.bec...@rogers.com writes: > From: "Randall S. Becker" > > Add correct FLOSS (NonStop platform emulation) definitions into > git-compat-util.h to allow correct emulation of non-platform > behaviour. Also added NSIG definition that is not explicitly > supplied in signal.h on platform. > >

Re: [PATCH v4 1/4] Add tar extract install options override in installation processing.

2018-01-24 Thread Junio C Hamano
randall.s.bec...@rogers.com writes: > From: "Randall S. Becker" > Subject: Re: [PATCH v4 1/4] Add tar extract install options override in > installation processing. We typically start the subject with some short token to help readers of "git shortlog --no-merges" identify what area is being tou

Re: [PATCH 4/6] packed_ref_iterator_begin(): make optimization more general

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 12:14:14PM +0100, Michael Haggerty wrote: > We can return an empty iterator not only if the `packed-refs` file is > missing, but also if it is empty or if there are no references whose > names succeed `prefix`. Optimize away those cases as well by moving > the call to `find

Re: [PATCH 3/6] find_reference_location(): make function safe for empty snapshots

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 12:14:13PM +0100, Michael Haggerty wrote: > diff --git a/refs/packed-backend.c b/refs/packed-backend.c > index 08698de6ea..361affd7ad 100644 > --- a/refs/packed-backend.c > +++ b/refs/packed-backend.c > [...] > @@ -551,7 +553,7 @@ static const char *find_reference_location(

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Isaac Hier
Jeff, no worries, fair enough. I know https://github.com/grpc/grpc uses a shared file to generate code for several build systems instead of maintaining them individually. I plan on doing the work anyway just because I have my own reasons to use CMake in Git (for packaging in https://github.com/rusl

Re: [GSoC][QUERY] Regarding Git CI Improvement 3 microtask

2018-01-24 Thread Raghuram Karra
Hello Everyone!! I have a query regarding Gsoc 2018 microtask. In the link :- https://git.github.io/SoC-2018-Microprojects/ Git CI Improvement 3 task says to investigate if we can use pylint to analyze git-p4.py. The term Investigate is not clear for me! Even though, i have tried to run some test

Re: [PATCH 4/5] travis-ci: don't run the test suite as root in the 32 bit Linux build

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 01:01:42PM -0500, Jeff King wrote: > Just for fun, I tried running: > > cd t > best-of-five make GIT_PROVE_OPTS='-j3' > best-of-five make GIT_PROVE_OPTS='-j3 --state=slow,save' > best-of-five make GIT_PROVE_OPTS='-j3 --shuffle' > [...] > I wonder what is different

Re: [PATCH] daemon: add --no-syslog to undo implicit --syslog

2018-01-24 Thread Lucas Werkmeister
On 24.01.2018 19:33, Junio C Hamano wrote: > Lucas Werkmeister writes: > >>> Moreover, --detach completely dissociates the process from the >>> original set of standard file descriptors by first closing them and >>> then connecting it to "/dev/null", so it will be nonsense to use this >>> new opt

Re: git merge-tree: bug report and some feature requests

2018-01-24 Thread Elijah Newren
On Tue, Jan 23, 2018 at 3:52 AM, Edward Thomson wrote: > Indeed, when I added merge to libgit2, we put the higher-level conflict > analysis into application code because there was not much interest in it > at the time. I've been meaning to add this to `git_status` in libgit2, > but it's not been

Re: [PATCH 5/5] travis-ci: don't fail if user already exists on 32 bit Linux build job

2018-01-24 Thread SZEDER Gábor
On Tue, Jan 23, 2018 at 5:46 PM, Jeff King wrote: > On Mon, Jan 22, 2018 at 02:32:20PM +0100, SZEDER Gábor wrote: >> diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh >> index e37e1d2d5f..13047adde3 100755 >> --- a/ci/run-linux32-build.sh >> +++ b/ci/run-linux32-build.sh >> @@ -33,7

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Jeff Hostetler
On 1/22/2018 7:16 PM, Isaac Hier wrote: This patch adds a mostly complete (aside from building tests, documentation, installation, etc.) CMake build to the git project. I am not sure how much interest there is in a CMake build, so please send me feedback one way or another. Personally, I believ

Re: [PATCH v3 3/3] sequencer: run 'prepare-commit-msg' hook

2018-01-24 Thread Junio C Hamano
Ramsay Jones writes: > On 24/01/18 12:34, Phillip Wood wrote: >> From: Phillip Wood >> >> Commit 356ee4659b ("sequencer: try to commit without forking 'git >> commit'", 2017-11-24) forgot to run the 'prepare-commit-msg' hook when >> creating the commit. Fix this by writing the commit message to

Re: [BUG] git pull with pull.rebase and rebase.autoStash is not working anymore in 2.16

2018-01-24 Thread Igor Djordjevic
Hi Dimitriy, On 24/01/2018 13:19, Dimitriy wrote: > > Looks like regression in 2.16. > Worked fine before update. > Seems like git stash is not always working. > Any ideas? Could this be the same one as reported as Git for Windows issue #1437[1] ("`git status` reports (non-existent) modificatio

Re: [PATCH 3/8] sequencer: fast-forward merge commits, if possible

2018-01-24 Thread Junio C Hamano
Phillip Wood writes: > I agree that the merge should be recreated, but I was thinking of > something slightly different. Currently the sequencer uses > opts->allow_ff to control whether a new commit with the same contents > should be created even if the existing one could be reused. Ahh, OK. I

Re: [PATCH v3 3/3] sequencer: run 'prepare-commit-msg' hook

2018-01-24 Thread Ramsay Jones
On 24/01/18 12:34, Phillip Wood wrote: > From: Phillip Wood > > Commit 356ee4659b ("sequencer: try to commit without forking 'git > commit'", 2017-11-24) forgot to run the 'prepare-commit-msg' hook when > creating the commit. Fix this by writing the commit message to a > different file and runn

Re: git merge-tree: bug report and some feature requests

2018-01-24 Thread Josh Bleecher Snyder
Thanks, Ed. I think I'll pursue the libgit2 route; sounds promising. >> But the alternative appears to be punting entirely, as libgit2 does, >> and merely providing something akin to three index entries. > > Indeed, when I added merge to libgit2, we put the higher-level conflict > analysis into a

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Junio C Hamano
Isaac Hier writes: > I realize this is a huge patch, but does anyone have feedback for the > general idea? I personally am not interested, especially with the justification given in the cover letter. Perhaps the one in this patch may be "mostly complete", and I am sure you can make it "complete

Re: [PATCH v3 2/3] t7505: Add tests for cherry-pick and rebase -i/-p

2018-01-24 Thread Eric Sunshine
On Wed, Jan 24, 2018 at 7:34 AM, Phillip Wood wrote: > Check that cherry-pick and rebase call the 'prepare-commit-msg' hook > correctly. The expected values for the hook arguments are taken to > match the current master branch. I think there is scope for improving > the arguments passed so they ma

Re: [PATCH] daemon: add --no-syslog to undo implicit --syslog

2018-01-24 Thread Junio C Hamano
Lucas Werkmeister writes: >> Moreover, --detach completely dissociates the process from the >> original set of standard file descriptors by first closing them and >> then connecting it to "/dev/null", so it will be nonsense to use this >> new option with it. > > Ah, I wasn’t aware of that – so wi

Ut:

2018-01-24 Thread Amy Riddering
-- Mrs. Amy Riddering contacting you for missionary work and i pray you will be kind enough to deliver my $7 million donation to the less privileged ones in your country and God will bless your generation for doing this humanitarian work. I am a widow suffering of lung cancer which has damaged my

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Jacob Keller
On Wed, Jan 24, 2018 at 5:45 AM, Isaac Hier wrote: > I realize this is a huge patch, but does anyone have feedback for the > general idea? > I don't know anything about CMake so I can't comment on the patch itself. Having additional build systems does not bother me, but it does mean that someone

Re: [PATCH 0/3] nd/shared-index-fix updates

2018-01-24 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy writes: > This makes the new test need both prerequisites SANITY and POSIXPERM > instead of just SANITY (on 'pu'). This is how most other tests do it > so we do the same to be safe. > > Nguyễn Thái Ngọc Duy (3): > read-cache.c: change type of "temp" in write_shared_index(

Re: Feature request: Improve diff algorithm

2018-01-24 Thread Jacob Keller
On Wed, Jan 24, 2018 at 8:43 AM, KES wrote: > Here is another place where diff can be improved: > @@ -141,8 +140,9 @@ My_runops(pTHX) > // Do not trace variables in DB:: module > if( SvOK( inDB ) ) continue; > > - sv_inc_nomg( inDB ); > > +

Re: [PATCH] mailinfo: avoid segfault when can't open files

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 01:51:31PM -0300, Juan F. Codagnone wrote: > > As for the patch itself, it looks correct but I saw two style nits: > > Thanks for the detailed review! I'm sorry about the style nits. I > focused on the tabs and braces. Next time I will take additional > attention. No prob

Re: [PATCH v3] packed_ref_cache: don't use mmap() for small files

2018-01-24 Thread Junio C Hamano
Michael Haggerty writes: > The change to using `read()` rather than `mmap()` for small > `packed-refs` feels like it should be an improvement, but it occurred to > me that the performance numbers quoted in ea68b0ce9f8 (hash-object: > don't use mmap() for small files, 2010-02-21) are not directly

Re: [PATCH v6] mru: Replace mru.[ch] with list.h implementation

2018-01-24 Thread Junio C Hamano
Jeff King writes: > On Tue, Jan 23, 2018 at 06:46:51PM -0500, Gargi Sharma wrote: > >> Replace the custom calls to mru.[ch] with calls to list.h. This patch is >> the final step in removing the mru API completely and inlining the logic. >> This patch leads to significant code reduction and the mr

Re: [PATCH 4/5] travis-ci: don't run the test suite as root in the 32 bit Linux build

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 10:56:22AM -0500, Jeff King wrote: > > > (As an aside, I'm not sure the prove cache is doing much. Running in > > > slow-to-fast order helps if you are trying to run massively in parallel, > > > but we only use -j3 for our Travis builds). > > > > It saves about a minute /

[PATCH v1] mailinfo: avoid segfault when can't open files

2018-01-24 Thread Juan F. Codagnone
If or files can't be opened, then mailinfo() returns an error before it even initializes mi->p_hdr_data or mi->s_hdr_data. When cmd_mailinfo() then calls clear_mailinfo(), we dereference the NULL pointers trying to free their contents. Signed-off-by: Juan F. Codagnone Reviewed-by: Jeff King --

Re: [PATCH] mailinfo: avoid segfault when can't open files

2018-01-24 Thread Juan F. Codagnone
On Wed, Jan 24, 2018 at 1:02 AM, Jeff King wrote: > > On Tue, Jan 23, 2018 at 11:54:17PM -0300, Juan F. Codagnone wrote: ... > > > But given the lack of callers, it may not be worth the effort. So I'm OK > with this solution. It may be worth giving an abbreviated version of the > above explanation

Re: Feature request: Improve diff algorithm

2018-01-24 Thread KES
Here is another place where diff can be improved: @@ -141,8 +140,9 @@ My_runops(pTHX) // Do not trace variables in DB:: module if( SvOK( inDB ) ) continue; - sv_inc_nomg( inDB ); + // save_item( inDB ); + sv_inc_nomg( inD

Creating sparse checkout in a new linked git worktree

2018-01-24 Thread Jessie Hernandez
Hi All, I am trying to get a sparse checkout in a linked worktree but cannot get it working. I have tried the following * git worktree add /some/new/path/new-branch --no-checkout * git config core.sparseCheckout true * * cd /some/new/path/new-branch * git read-tree -mu sparse-checkout But I st

Re: Speed of git branch --contains

2018-01-24 Thread Ævar Arnfjörð Bjarmason
On Tue, Jan 23 2018, Andreas Krey jotted: > I'm just looking at some scripts that do a 'git branch --contains $id > --remote' > for each new commit in a repo, and unfortunately each invokation already > takes four minutes. > > It feels like git branch does the reachability detection separately >

Re: [PATCH 4/5] travis-ci: don't run the test suite as root in the 32 bit Linux build

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 02:45:18PM +0100, SZEDER Gábor wrote: > I think the key is the handling of verbose logs of failed test(s). The > original motivation for matching the user IDs was, I suppose, that we > wanted to dump the verbose log of the failed test(s) to the trace log on > the host, bec

Re: [PATCH 2/5] travis-ci: use 'set -e' in the 32 bit Linux build job

2018-01-24 Thread Jeff King
On Wed, Jan 24, 2018 at 01:12:48PM +0100, SZEDER Gábor wrote: > >> -test -z $HOST_UID || (CI_USER="ci" && useradd -u $HOST_UID $CI_USER) && > [...] > Indeed, the && chain is broken, I didn't noticed that. > > Luckily it was broken in a way that it didn't lead to false successes: > if installing d

Re: What's cooking in git.git (Jan 2018, #03; Tue, 23)

2018-01-24 Thread Jeff Hostetler
On 1/23/2018 5:39 PM, Junio C Hamano wrote: [Stalled] * jh/status-no-ahead-behind (2018-01-04) 4 commits - status: support --no-ahead-behind in long format - status: update short status to respect --no-ahead-behind - status: add --[no-]ahead-behind to status and commit for V2 format. -

Re: [RFC PATCH 0/1] Implement CMake build

2018-01-24 Thread Isaac Hier
I realize this is a huge patch, but does anyone have feedback for the general idea? On Mon, Jan 22, 2018 at 7:16 PM, Isaac Hier wrote: > This patch adds a mostly complete (aside from building tests, documentation, > installation, etc.) CMake build to the git project. I am not sure how much > inte

Re: [PATCH 4/5] travis-ci: don't run the test suite as root in the 32 bit Linux build

2018-01-24 Thread SZEDER Gábor
On Tue, Jan 23, 2018 at 5:43 PM, Jeff King wrote: > On Mon, Jan 22, 2018 at 02:32:19PM +0100, SZEDER Gábor wrote: > >> Travis CI runs the 32 bit Linux build job in a Docker container, where >> all commands are executed as root by default. Therefore, ever since >> we added this build job in 88dedd

Re: [PATCH] setup: recognise extensions.objectFormat

2018-01-24 Thread Patryk Obara
Argh! Forgot to sign-off the commit… -- | ← Ceci n'est pas une pipe Patryk Obara

Re: [PATCH 3/5] travis-ci: don't repeat the path of the cache directory

2018-01-24 Thread SZEDER Gábor
On Tue, Jan 23, 2018 at 5:30 PM, Jeff King wrote: > On Mon, Jan 22, 2018 at 02:32:18PM +0100, SZEDER Gábor wrote: >> diff --git a/ci/run-linux32-build.sh b/ci/run-linux32-build.sh >> index 248183982b..c9476d6598 100755 >> --- a/ci/run-linux32-build.sh >> +++ b/ci/run-linux32-build.sh >> @@ -25,10

[PATCH] setup: recognise extensions.objectFormat

2018-01-24 Thread Patryk Obara
This extension selects which hashing algorithm from vtable should be used for reading and writing objects in the object store. At the moment supports only single value (sha-1). In case value of objectFormat is an unknown hashing algorithm, Git command will fail with following message: fatal: u

  1   2   >