Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

I wrote: > Hi Jonathan, > > Jonathan Nieder wrote: >> Todd Zullinger wrote: > [...] >>> +++ b/Makefile >>> @@ -296,6 +296,9 @@ all:: >>> # >>> # Define NO_PERL if you do not want Perl scripts or libraries at all. >>> # >>> +# Define NO_PERL_CPAN_FALLBACKS if you do not want to install fallbacks

[PATCH] Makefile: remove *.spec from clean target

Support for generating an rpm was dropped in ab214331cf ("Makefile: stop pretending to support rpmbuild", 2016-04-04). We don't generate any *.spec files so there is no need to clean them up. Signed-off-by: Todd Zullinger --- I noticed this minor cruft today. Since we don't generate a spec fil

Re: Please test Git for Windows' latest snapshot

On Fri, Feb 16, 2018 at 3:30 PM, Johannes Schindelin wrote: > Hi team, > > I am unwilling to release Git for Windows v2.16.2 on a Friday night, but I > have something almost as good. There is a snapshot available here: > > > https://urldefense.proofpoint.com/v2/url?u=https-3A__wingit.blob

Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

Hi Jonathan, Jonathan Nieder wrote: > Todd Zullinger wrote: [...] >> +++ b/Makefile >> @@ -296,6 +296,9 @@ all:: >> # >> # Define NO_PERL if you do not want Perl scripts or libraries at all. >> # >> +# Define NO_PERL_CPAN_FALLBACKS if you do not want to install fallbacks for >> +# perl CPAN mod

Please test Git for Windows' latest snapshot

Hi team, I am unwilling to release Git for Windows v2.16.2 on a Friday night, but I have something almost as good. There is a snapshot available here: https://wingit.blob.core.windows.net/files/index.html That snapshot brings quite a few updated components apart from Git proper (such as

Re: [PATCHv2 00/16] Moving global state into the repository object (part 1)

Hi, Stefan Beller wrote: > v2: > * duplicated the 'ignore_env' bit into the object store as well > * the #define trick no longer works as we do not have a "the_objectstore" > global, > which means there is just one patch per function that is converted. > As this follows the same structure of

Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

Hi, Todd Zullinger wrote: > Subject: [PATCH] Makefile: add NO_PERL_CPAN_FALLBACKS to disable fallback > module install > > As noted in perl/Git/LoadCPAN.pm, operating system packages often don't > want to ship Git::FromCPAN tree at all, preferring to use their own > packaging of CPAN modules ins

Re: [PATCH v3 16/23] ref-filter: make cat_file_info independent

On Thu, Feb 15, 2018 at 01:33:25PM +0300, Оля Тележная wrote: > 2018-02-15 8:53 GMT+03:00 Jeff King : > > On Mon, Feb 12, 2018 at 08:08:54AM +, Olga Telezhnaya wrote: > > > >> Remove connection between expand_data variable > >> in cat-file and in ref-filter. > >> It will help further to get ri

Re: [PATCH 0/2] fix minor git-worktree.txt botches

Eric Sunshine writes: > This patch series fixes a couple git-worktree.txt botches from > 4e85333197 (worktree: make add dwim, 2017-11-26). > > Eric Sunshine (2): > git-worktree.txt: fix missing ")" typo > git-worktree.txt: fix indentation of example and text of 'add' command > > Documentat

[PATCH v2] merge: allow fast-forward when merging a tracked tag

Long time ago at fab47d05 ("merge: force edit and no-ff mode when merging a tag object", 2011-11-07), "git merge" was made to always create a merge commit when merging a tag, even when the side branch being merged is a descendant of the current branch. This default is good for merges made by upstr

[no subject]

-- Dear friend, i am General Brigadier Dawn M Dunlop from U S A, can we talk?? Very important and urgent please.

[PATCH 1/2] git-worktree.txt: fix missing ")" typo

Add the closing ")" to a parenthetical phrase introduced by 4e85333197 (worktree: make add dwim, 2017-11-26). While at it, add a missing ":" at the end of the same sentence since it precedes an example literal command block. Reported-by: Mike Nordell Signed-off-by: Eric Sunshine --- Document

[PATCH 2/2] git-worktree.txt: fix indentation of example and text of 'add' command

When 4e85333197 (worktree: make add dwim, 2017-11-26) added an example command in a literal code block, it neglected to insert a mandatory "+" line before the block. This omission resulted in both the literal code block and the (existing) paragraph following the block to be outdented, even though

[PATCH 0/2] fix minor git-worktree.txt botches

This patch series fixes a couple git-worktree.txt botches from 4e85333197 (worktree: make add dwim, 2017-11-26). Eric Sunshine (2): git-worktree.txt: fix missing ")" typo git-worktree.txt: fix indentation of example and text of 'add' command Documentation/git-worktree.txt | 5 +++-- 1 file

Re: [PATCH 04/16] object-store: move packed_git and packed_git_mru to object store

Stefan Beller writes: > @@ @@ > - packed_git_mru > + the_repository->objects.packed_git_mru Regarding this... > diff --git a/object-store.h b/object-store.h > index a3f0d6ac15..024ccc91e9 100644 > --- a/object-store.h > +++ b/object-store.h > @@ -2,6 +2,7 @@ > #define OBJECT_STORE_H >

Re: [PATCH v7 0/7] convert: add support for different encodings

Jeff King writes: > In which case yeah, I could see choosing an in-repo encoding to possibly > be useful (but it also seems like a feature that could easily be tacked > on later if somebody cares). Yes, I think we are on the same page---in-repo-encoding that is a natural counterpart to w-t-e att

Re: [PATCH v7 1/7] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

Jeff King writes: >> (although the calloc() case is slightly different from mallocz()), >> see: https://public-inbox.org/git/871shum182@evledraar.gmail.com/ > > Hmm. I do think xmallocz is a bit more explicit instruction of "please > NUL-terminate this for me" than xcalloc is. So I don't thin

Re: [PATCH v7 0/7] convert: add support for different encodings

On Fri, Feb 16, 2018 at 02:25:41PM -0500, Jeff King wrote: > On Fri, Feb 16, 2018 at 10:55:58AM -0800, Junio C Hamano wrote: > > > Jeff King writes: > > > > > So a full proposal would support both cases: "check this out in the > > > local platform's preferred encoding" and "always check this ou

Re: [PATCH v7 0/7] convert: add support for different encodings

On Fri, Feb 16, 2018 at 10:55:58AM -0800, Junio C Hamano wrote: > Jeff King writes: > > > So a full proposal would support both cases: "check this out in the > > local platform's preferred encoding" and "always check this out in > > _this_ encoding". And Lars's proposal is just the second half o

Re: [PATCH 1/3] grep: move grep_source_init outside critical section

Jeff King writes: > I think this makes sense. It does blur the memory ownership lines of the > grep_source, though. Can we make that more clear with a comment here: > >> +grep_source_init(&gs, GREP_SOURCE_OID, pathbuf.buf, path, oid); >> + >> #ifndef NO_PTHREADS >> if (num_threads) { >>

Re: [PATCH 0/1] Colorize some errors on stderr

Johannes Schindelin writes: > Now, what would be possible solutions for this? > > - introduce `int fd` in `want_color()` (and callees) so that we can make > a distinction whether we want to detect whether stdout or stderr is > connected > to a tty > > - introduce a separate `want_color_stder

Re: [PATCH v7 0/7] convert: add support for different encodings

Lars Schneider writes: >> One thing I find more problematic is that the above places *too* >> much stress on the UTF-8 centric worldview. It is perfectly valid >> to store your text contents encoded in ShiftJIS and check them out >> as-is, with or without this patch. It is grossly misleading to

Re: [PATCH v7 0/7] convert: add support for different encodings

Jeff King writes: > So a full proposal would support both cases: "check this out in the > local platform's preferred encoding" and "always check this out in > _this_ encoding". And Lars's proposal is just the second half of that. Actually, what you seem to take as a whole is just half of the sto

**Gute Nachrichten**

Herzlichen Glückwunsch, Sie haben am 14. Februar 2018 in den monatlichen Ziehungen für Euro Millions / Google Promo € 650.000 gewonnen. Kontaktieren Sie unseren Schadenregulierungsbeauftragten mit den folgenden Informationen Vollständiger Name Heimatadresse Geschlecht Älter Besetzung Telefon M

Git Stash Creates sh.exe.stackdump (STATUS_STACK_OVERFLOW)

Hi, An issue has arisen sometime between 2.16.1.windows.1 and 2.16.1.windows.4 in Git. When you execute `git stash` commands (stash/pop/apply?), a sh.exe.stackdump file is generated that contains the following: Exception: STATUS_STACK_OVERFLOW at rip=7FFB2C324B97 rax=0010 rbx=0

Re: [PATCH v7 1/7] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

On Fri, Feb 16, 2018 at 01:55:02PM +0100, Ævar Arnfjörð Bjarmason wrote: > On Thu, Feb 15, 2018 at 4:27 PM, wrote: > > Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we > > allocate the buffer for the lower case string with xmallocz(). This > > already ensures a NUL at the

Re: [PATCH] test-lib.sh: unset XDG_CACHE_HOME

On Thu, Feb 15, 2018 at 09:46:04PM -0500, Genki Sky wrote: > git respects XDG_CACHE_HOME for the credential cache. So, we should > unset XDG_CACHE_HOME for the test environment, lest a user's custom one > cause failure in the test. > > For example, t/t0301-credential-cache.sh expects a default di

Re: [PATCH v3] worktree: add: fix 'post-checkout' not knowing new worktree location

On Fri, Feb 16, 2018 at 11:55 AM, Lars Schneider wrote: >> On 16 Feb 2018, at 00:09, Eric Sunshine wrote: >> The hook is run manually, rather than via run_hook_le(), since it needs >> to change the working directory to that of the worktree, and >> run_hook_le() does not provide such functionality

Re: [PATCH] merge: allow fast-forward when merging a tracked tag

Eric Sunshine writes: >> + tag_ref = xstrfmt("refs/tags/%s", >> + ((struct tag >> *)merge_remote_util(commit)->obj)->tag); > > xstrfmt() allocates a new string... > >> + if (!read_ref(tag_ref, &oid) && >> + !oidcmp(&oid, &merge_remote_util(commit)->o

Re: [PATCH v3] worktree: add: fix 'post-checkout' not knowing new worktree location

Eric Sunshine writes: > ... > The hook is run manually, rather than via run_hook_le(), since it needs > to change the working directory to that of the worktree, and > run_hook_le() does not provide such functionality. As this is a one-off > case, adding 'run_hook' overloads which allow the direct

[ANNOUNCE] Git v2.16.2

The latest maintenance release Git v2.16.2 is now available at the usual places, with small fixes that are already in the 'master' front. The tarballs are found at: https://www.kernel.org/pub/software/scm/git/ The following public repositories all have a copy of the 'v2.16.2' tag and the 'm

Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

Ævar Arnfjörð Bjarmason wrote: > On Thu, Feb 15 2018, Todd Zullinger jotted: >> What about moving perl/Git/FromCPAN to perl/FromCPAN and >> then including perl/FromCPAN in LIB_PERL{,_GEN} only if >> NO_PERL_CPAN_FALLBACKS is unset? >> >> LIB_PERL := $(wildcard perl/Git.pm perl/Git/*.pm perl/Git/*/

[PATCH 05/16] object-store: close all packs upon clearing the object store

Signed-off-by: Stefan Beller --- builtin/am.c | 2 +- builtin/clone.c| 2 +- builtin/fetch.c| 2 +- builtin/merge.c| 2 +- builtin/receive-pack.c | 2 +- object.c | 6 ++ packfile.c | 4 ++-- packfile.h | 2 +- 8 files ch

[PATCH 08/16] sha1_file: add raw_object_store argument to alt_odb_usable

Add a raw_object_store to alt_odb_usable to be more specific about which repository to act on. The choice of the repository is delegated to its only caller link_alt_odb_entry. Signed-off-by: Stefan Beller --- sha1_file.c | 8 +--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a

[PATCH 16/16] sha1_file: allow sha1_loose_object_info to handle arbitrary object stores

Signed-off-by: Stefan Beller --- sha1_file.c | 9 + 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 4cbff471a2..31be57249f 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -1154,7 +1154,8 @@ int parse_sha1_header(const char *hdr, unsigned long *

[PATCH 04/16] object-store: move packed_git and packed_git_mru to object store

In a process with multiple repositories open, packfile accessors should be associated to a single repository and not shared globally. Move packed_git and packed_git_mru into the_repository and adjust callers to reflect this. Patch generated by 1. Moving the struct packed_git declaration to objec

[PATCH 11/16] sha1_file: allow sha1_file_name to handle arbitrary object stores

While at it, move the declaration to object-store.h, where it should be easier to find. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- cache.h| 6 -- http-walker.c | 3 ++- http.c | 5 ++--- object-store.h | 6 ++ sha1_file.c| 12 ++-- 5

[PATCH 09/16] sha1_file: allow link_alt_odb_entries to handle arbitrary object stores

Actually this also allows read_info_alternates and link_alt_odb_entry to handle arbitrary object stores, but link_alt_odb_entries is the most interesting function in this set of functions, hence the commit subject. These functions span a strongly connected component in the function graph, i.e. the

[PATCH 07/16] pack: move approximate object count to object store

The approximate_object_count() function maintains a rough count of objects in a repository to estimate how long object name abbreviates should be. Object names are scoped to a repository and the appropriate length may differ by repository, so the object count should not be global. Signed-off-by:

[PATCH 15/16] sha1_file: allow map_sha1_file to handle arbitrary object stores

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- cache.h| 1 - object-store.h | 2 ++ sha1_file.c| 7 --- streaming.c| 5 - 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index 2495c7081d..df29ee72e9 100644 --- a/cache.h +

[PATCH 13/16] sha1_file: allow open_sha1_file to handle arbitrary object stores

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 ++- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index bd8b0331f0..3356f70dd2 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -900,7 +900,8 @@ static int stat_sha1_f

[PATCH 03/16] object-store: free alt_odb_list

Free the memory and reset alt_odb_{list, tail} to NULL. Signed-off-by: Stefan Beller --- object.c | 17 + 1 file changed, 17 insertions(+) diff --git a/object.c b/object.c index 11d904c033..17b1da6d6b 100644 --- a/object.c +++ b/object.c @@ -446,7 +446,24 @@ void clear_commit_ma

[PATCH 06/16] pack: move prepare_packed_git_run_once to object store

Each repository's object store can be initialized independently, so they must not share a run_once variable. Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- object-store.h | 8 +++- packfile.c | 7 +++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/o

[PATCH 02/16] object-store: move alt_odb_list and alt_odb_tail to object store

In a process with multiple repositories open, alternates should be associated to a single repository and not shared globally. Move alt_odb_list and alt_odb_tail into the_repository and adjust callers to reflect this. Now that the alternative object data base is per repository, we're leaking its me

[PATCH 10/16] sha1_file: allow prepare_alt_odb to handle arbitrary object stores

Signed-off-by: Stefan Beller --- builtin/fsck.c | 2 +- cache.h| 1 - object-store.h | 2 ++ packfile.c | 2 +- sha1_file.c| 23 +++ sha1_name.c| 3 ++- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/builtin/fsck.c b/builtin/fsck.c in

[PATCH 12/16] sha1_file: allow stat_sha1_file to handle arbitrary object stores

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 15 --- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index d64cdbb494..bd8b0331f0 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -871,22 +871,23 @@ int git_open_clo

[PATCH 14/16] sha1_file: allow map_sha1_file_1 to handle arbitrary object stores

Signed-off-by: Stefan Beller Signed-off-by: Jonathan Nieder --- sha1_file.c | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/sha1_file.c b/sha1_file.c index 3356f70dd2..aeb925a895 100644 --- a/sha1_file.c +++ b/sha1_file.c @@ -934,9 +934,8 @@ static int open_sha1_f

[PATCH 01/16] repository: introduce raw object store field

The raw object store field will contain any objects needed for access to objects in a given repository. This patch introduces the raw object store and populates it with the `objectdir`, which used to be part of the repository struct as well as 'ignore_env' which is duplicated from the repository.

[PATCHv2 00/16] Moving global state into the repository object (part 1)

v2: * duplicated the 'ignore_env' bit into the object store as well * the #define trick no longer works as we do not have a "the_objectstore" global, which means there is just one patch per function that is converted. As this follows the same structure of the previous series, I am still confi

Re: Line ending normalization doesn't work as expected

On Fri, Feb 16, 2018 at 10:34 AM, Torsten Bögershausen wrote: > On Thu, Feb 15, 2018 at 09:24:40AM -0600, Robert Dailey wrote: >> On Tue, Oct 3, 2017 at 9:00 PM, Junio C Hamano wrote: > > [] >> >> Sorry to bring this old thread back to life, but I did notice that >> this causes file modes to rese

Re: [PATCH v7 0/7] convert: add support for different encodings

On Fri, Feb 16, 2018 at 03:42:35PM +0100, Lars Schneider wrote: [] > > Agreed. However, people using ShiftJIS are not my target audience. > My target audience are: > > (1) People that have to encode their text files in UTF-16 (for > whatever reason - usually because of legacy processes or to

Re: [PATCH v3] worktree: add: fix 'post-checkout' not knowing new worktree location

> On 16 Feb 2018, at 00:09, Eric Sunshine wrote: > > Although "git worktree add" learned to run the 'post-checkout' hook in > ade546be47 (worktree: invoke post-checkout hook, 2017-12-07), it > neglected to change to the directory of the newly-created worktree > before running the hook. Instead,

Re: Line ending normalization doesn't work as expected

On Thu, Feb 15, 2018 at 09:24:40AM -0600, Robert Dailey wrote: > On Tue, Oct 3, 2017 at 9:00 PM, Junio C Hamano wrote: [] > > Sorry to bring this old thread back to life, but I did notice that > this causes file modes to reset back to 644 (from 755) on Windows > version of Git. Is there a way to

Re: [PATCH v3 22/23] cat-file: tests for new atoms added

On 12 February 2018 at 08:08, Olga Telezhnaya wrote: > Add some tests for new formatting atoms from ref-filter. > Some of new atoms are supported automatically, > some of them are expanded into empty string > (because they are useless for some types of objects), > some of them could be supported la

Re: [PATCH v7 0/7] convert: add support for different encodings

> On 15 Feb 2018, at 21:03, Junio C Hamano wrote: > > lars.schnei...@autodesk.com writes: > >> -- Git clients that do not support the `working-tree-encoding` attribute >> - will checkout the respective files UTF-8 encoded and not in the >> - expected encoding. Consequently, these files will a

Re: [PATCH 3/8] perl: generalize the Git::LoadCPAN facility

On Thu, Feb 15 2018, Todd Zullinger jotted: > [I dropped bbour...@slb.com from the Cc: list, as it bounced > on my previous reply.] > > Ævar Arnfjörð Bjarmason wrote: >> That makes sense, I'll incorporate that in a re-roll. I like >> NO_PERL_CPAN_FALLBACKS or just NO_CPAN_FALLBACKS better. > > Ei

[RFC] Rebasing merges: a jorney to the ultimate solution (Road Clear)

Hi, By accepting the challenges raised in recent discussion of advanced support for history rebasing and editing in Git, I hopefully figured out a clean and elegant method of rebasing merges that I think is "The Right Way (TM)" to perform this so far troublesome operation. ["(TM)" here has second

Re: [PATCH v7 1/7] strbuf: remove unnecessary NUL assignment in xstrdup_tolower()

On Thu, Feb 15, 2018 at 4:27 PM, wrote: > Since 3733e69464 (use xmallocz to avoid size arithmetic, 2016-02-22) we > allocate the buffer for the lower case string with xmallocz(). This > already ensures a NUL at the end of the allocated buffer. > > Remove the unnecessary assignment. > [...] >

[PATCH 1/1] Colorize push errors

From: Ryan Dammrose This is an attempt to resolve an issue I experience with people that are new to Git -- especially colleagues in a team setting -- where they miss that their push to a remote location failed because the failure and success both return a block of white text. An example is if I

[PATCH 0/1] Colorize some errors on stderr

This is an RFC because it tries to introduce a fundamental new color feature: Coloring messages *on stderr*. So far, pretty much everything in color.[ch] assumed that you want to color only stuff on stdout. However, in this case, a user (who became a contributor!) wanted some messages that are pr

My Seasons of greetings to you and your family.

Dear Friend, My Seasons of greetings to you and your family. First, I am Mr. Mohammed ZONGO, a banker working with Bank of Africa here in my country Burkina Faso West Africa, I have a business transaction that will benefit both of us, and want to know if you can handle it and claim the fund to you

[PATCH] git-worktree.txt (single char)

Missing ')' after the closing '`'. "If is a branch name (call it `` and"

Re: Is the -w option for git blame bugged?

On Fri, Feb 16, 2018 at 05:47:41PM +0800, hgfds jhgfds wrote: > I recently asked a question on stackoverflow regarding what seemed to > be erroneous output from git blame when the -w option is specified. > However, no one answered my question, so I decided to ask here > instead. > > The question

Is the -w option for git blame bugged?

Hi, I recently asked a question on stackoverflow regarding what seemed to be erroneous output from git blame when the -w option is specified. However, no one answered my question, so I decided to ask here instead. The question is available at https://stackoverflow.com/questions/48808281/git-blame