[ANNOUNCE] git-cinnabar 0.4.0

Hi, Git-cinnabar is a git remote helper to interact with mercurial repositories. It allows to clone, pull and push from/to mercurial remote repositories, using git. Code on https://github.com/glandium/git-cinnabar This release on https://github.com/glandium/git-cinnabar/releases/tag/0.4.0

Geschäftsvorschlag

Lieber Freund. Erlauben Sie mir, auf diese Weise auf Sie zuzugehen. Ich bin Dr. Arnold Kristofferson, ein US-Auftragnehmer, der mit Nichtkämpfer US Marine in Ba'qubah, Irak arbeitet. Ich habe die Summe von 10,6 Millionen Dollar, die ich aus einem Rohöl-Deal gemacht habe, und ich möchte, dass

Re: [PATCH] gitk: remove translated message from comments

On Tue, Jan 17, 2017 at 07:52:45PM -0800, David Aguilar wrote: > "make update-po" fails because a previously untranslated string > has now been translated: > > Updating po/sv.po > po/sv.po:1388: duplicate message definition... > po/sv.po:380: ...this is the location of the first

[PATCH] mingw: follow-up to "replace isatty() hack"

The version of the "replace isatty() hack" that got applied to the `maint` branch did not actually reflect the latest iteration of the patch series: v3 was sent out with these changes, as requested by the reviewer Johannes Sixt: - reworded the comment about "recycling handles" - moved the

Re: [PATCH v3 3/3] mingw: replace isatty() hack

Hi, On Fri, 23 Dec 2016, Johannes Schindelin wrote: > + /* > + * Use stock dup2() to re-bind fd to the new handle. Note that > + * this will implicitly close(1) and close both fd=1 and the > + * originally associated handle. It will open a new fd=1 and > + * call

Re: [BUG/RFC] Git Gui: GIT_DIR leaks to spawned Git Bash

Hi Max, On Tue, 17 Jan 2017, Max Kirillov wrote: > On Tue, Jan 17, 2017 at 11:52:29AM +0100, Johannes Schindelin wrote: > > > And having said *that*, I have to admit that I was unable to reproduce > > I have found exact way to reproduce it and actually the reason. Turns > out to be obvious

Dear Friend.

Dear Friend. I Hoped that you will not expose or betray this trust and confident that I am about to repose on you for the mutual benefit of our families.I need your urgent assistance in transferring the sum of $5 million U.S dollars into your account. The money has been dormant for years in

Re: [PATCH 2/2] Be more careful when determining whether a remote was configured

On Wed, Jan 18, 2017 at 01:34:28PM +0100, Johannes Schindelin wrote: > > > Let's fix this by telling Git that a remote is not configured unless any > > > fetch/push URL or refspect is configured explicitly. > > > > Hmm. Old versions of GitHub for Windows used to set fetch refspecs in > > the

Git: new feature suggestion

Hello, My name is Joao Pinto, I work at Synopsys and I am a frequent Linux Kernel contributor. Let me start by congratulate you for the fantastic work you have been doing with Git which is an excellent tool. The Linux Kernel as all systems needs to be improved and re-organized to be better

Re: "git diff --ignore-space-change --stat" lists files with only whitespace differences as "changed"

On Tue, Jan 17, 2017 at 09:01:55PM -0500, Matt McCutchen wrote: > A bug report: I noticed that "git diff --ignore-space-change --stat" > lists files with only whitespace differences as having changed with 0 > differing lines. This is inconsistent with the behavior without -- > stat, which

Re: [PATCH 2/2] Be more careful when determining whether a remote was configured

Hi Peff, On Tue, 17 Jan 2017, Jeff King wrote: > On Tue, Jan 17, 2017 at 10:19:24PM +0100, Johannes Schindelin wrote: > > > One of the really nice features of the ~/.gitconfig file is that users > > can override defaults by their own preferred settings for all of their > > repositories. > > >

Re: [PATCH v5 3/3] Retire the scripted difftool

Hi Junio, On Tue, 17 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > It served its purpose, but now we have a builtin difftool. Time for the > > Perl script to enjoy Florida. > > > > Signed-off-by: Johannes Schindelin

Re: [PATCH 2/2] Be more careful when determining whether a remote was configured

Hi Junio, On Tue, 17 Jan 2017, Junio C Hamano wrote: > Perhaps instead of adding "is it configured?" flag that is too > broadly named and has too narrow meaning, would it make more sense > to introduce "int can_prune(struct remote *remote)" that looks at > the remote refspecs? That ("can we

Re: [PATCH 5/5] describe: teach describe negative pattern matches

Hi Jake, On Tue, 17 Jan 2017, Jacob Keller wrote: > On Fri, Jan 13, 2017 at 1:31 PM, Johannes Sixt wrote: > > Am 13.01.2017 um 07:57 schrieb Jacob Keller: > >> > >> On Thu, Jan 12, 2017 at 10:43 PM, Johannes Sixt wrote: > >>> > >>> When you write > >>> > >>>

Re: "git diff --ignore-space-change --stat" lists files with only whitespace differences as "changed"

Jeff King writes: > On Wed, Jan 18, 2017 at 12:57:12PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > So I dunno. A sensible rule to me is "iff -p would show a diff header, >> > then --stat should mention it". >> >> True but tricky (you need a better

[PATCHv2 1/4] cache.h: document index_name_pos

Signed-off-by: Stefan Beller --- cache.h | 19 +++ 1 file changed, 19 insertions(+) diff --git a/cache.h b/cache.h index 1b67f078dd..3dbba69aec 100644 --- a/cache.h +++ b/cache.h @@ -575,7 +575,26 @@ extern int verify_path(const char *path); extern int

[PATCHv2 4/4] documentation: retire unfinished documentation

When looking for documentation for a specific function, you may be tempted to run git -C Documentation grep index_name_pos only to find the file technical/api-in-core-index.txt, which doesn't help for understanding the given function. It would be better to not find these functions in the

Re: [PATCHv2 3/4] cache.h: document add_[file_]to_index

On 01/18, Stefan Beller wrote: > Signed-off-by: Stefan Beller > --- > cache.h | 21 - > 1 file changed, 16 insertions(+), 5 deletions(-) > > diff --git a/cache.h b/cache.h > index 87eccdb211..03c46b9b99 100644 > --- a/cache.h > +++ b/cache.h > @@ -609,13

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

Eric Wong wrote: > Junio C Hamano wrote: > > > > > > http://public-inbox.org/git/20170118182831.pkhqu2np3bh2puei@LykOS.localdomain/ > > Eeep! This looks like a regression I introduced when working > around Richard Hansen's S/MIME mails the other week on

Re: [PATCH 2/4] remove_index_entry_at: move documentation to cache.h

On Wed, Jan 18, 2017 at 1:16 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> cache.h | 3 +++ >> read-cache.c | 1 - >> 2 files changed, 3 insertions(+), 1 deletion(-) >> >> diff --git

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

On Wed, Jan 18, 2017 at 1:56 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> Yes this makes sense. I'm still looking at whether the alternative >> implementation suggested based on the git-log style would make more >> sense or not, but if we keep

Re: [PATCH v3 2/5] name-rev: extend --refs to accept multiple patterns

Jacob Keller writes: > On Wed, Jan 18, 2017 at 12:04 PM, Junio C Hamano wrote: > >> I agree that we cannot short-cut on the first match to make sure >> that the outcome is stable, but I wondered what should be shown when >> we do have multiple matches.

[PATCHv2 2/4] cache.h: document remove_index_entry_at

Do this by moving the existing documentation from read-cache.c to cache.h. Signed-off-by: Stefan Beller --- cache.h | 3 +++ read-cache.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 3dbba69aec..87eccdb211 100644 ---

[PATCHv2 3/4] cache.h: document add_[file_]to_index

Signed-off-by: Stefan Beller --- cache.h | 21 - 1 file changed, 16 insertions(+), 5 deletions(-) diff --git a/cache.h b/cache.h index 87eccdb211..03c46b9b99 100644 --- a/cache.h +++ b/cache.h @@ -609,13 +609,24 @@ extern int remove_index_entry_at(struct

[PATCHv2 0/4] start documenting core functions

v2: included all suggestions from Junio v1: The two single patches[1] are turned into a series here. [1] https://public-inbox.org/git/20170117200147.25425-1-sbel...@google.com/ Thanks, Stefan Stefan Beller (4): cache.h: document index_name_pos cache.h: document remove_index_entry_at

Re: [PATCH v3 1/2] difftool: add a skeleton for the upcoming builtin

On 12/06, Jeff King wrote: > On Tue, Dec 06, 2016 at 10:22:21AM -0800, Stefan Beller wrote: > > > >> Maybe even go a step further and say that the config code needs a context > > >> "object". > > > > > > If I were writing git from scratch, I'd consider making a "struct > > > repository" object.

[PATCH v4 4/5] describe: teach --match to accept multiple patterns

From: Jacob Keller Teach `--match` to be accepted multiple times, accumulating a list of patterns to match into a string list. Each pattern is inclusive, such that a tag need only match one of the provided patterns to be considered for matching. This extension is useful

[PATCH v4 3/5] name-rev: add support to exclude refs by pattern match

From: Jacob Keller Extend git-name-rev to support excluding refs which match shell patterns using --exclude. These patterns can be used to limit the scope of refs by excluding any ref that matches one of the --exclude patterns. A ref will only be used for naming when it

[PATCH v4 0/5] extend git-describe pattern matching

From: Jacob Keller Teach git describe and git name-rev the ability to match multiple patterns inclusively. Additionally, teach these commands to also accept negative patterns to exclude any refs which match. The pattern lists for positive and negative patterns are

[PATCH v4 2/5] name-rev: extend --refs to accept multiple patterns

From: Jacob Keller Teach git name-rev to take multiple --refs stored as a string list of patterns. The list of patterns will be matched inclusively, and each ref only needs to match one pattern to be included. A ref will only be excluded if it does not match any of the

[PATCH v4 1/5] doc: add documentation for OPT_STRING_LIST

From: Jacob Keller Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated list of strings. However, this was not documented in the api-parse-options documentation. Add documentation now so

[PATCH v4 5/5] describe: teach describe negative pattern matches

From: Jacob Keller Teach git-describe the `--exclude` option which will allow specifying a glob pattern of tags to ignore. This can be combined with the `--match` patterns to enable more flexibility in determining which tags to consider. For example, suppose you wish to

Re: [PATCH] attr: mark a file-local symbol as static

On 01/18, Ramsay Jones wrote: > > Signed-off-by: Ramsay Jones > --- > > Hi Brandon, > > If you need to re-roll your 'bw/attr' branch, could you please > squash this into the relevant patch (commit 8908457159, > "attr: use hashmap for attribute dictionary",

Re: [PATCH] attr: mark a file-local symbol as static

On 18/01/17 23:05, Brandon Williams wrote: > On 01/18, Ramsay Jones wrote: >> >> Signed-off-by: Ramsay Jones >> --- >> >> Hi Brandon, >> >> If you need to re-roll your 'bw/attr' branch, could you please >> squash this into the relevant patch (commit 8908457159, >>

Re: [PATCH 3/4] document add_[file_]to_index

On Wed, Jan 18, 2017 at 1:22 PM, Junio C Hamano wrote: > Stefan Beller writes: > >> Signed-off-by: Stefan Beller >> --- >> cache.h | 17 - >> 1 file changed, 12 insertions(+), 5 deletions(-) >> >> diff --git a/cache.h

[PATCH] attr: mark a file-local symbol as static

Signed-off-by: Ramsay Jones --- Hi Brandon, If you need to re-roll your 'bw/attr' branch, could you please squash this into the relevant patch (commit 8908457159, "attr: use hashmap for attribute dictionary", 12-01-2017). Also, I note that, although they are

Re: [PATCHv2 3/4] cache.h: document add_[file_]to_index

On Wed, Jan 18, 2017 at 4:00 PM, Brandon Williams wrote: > On 01/18, Stefan Beller wrote: >> Signed-off-by: Stefan Beller >> --- >> cache.h | 21 - >> 1 file changed, 16 insertions(+), 5 deletions(-) >> >> diff --git a/cache.h b/cache.h

Re: Git: new feature suggestion

On Wed, 18 Jan 2017 10:40:52 + Joao Pinto wrote: [...] > I have seen a lot of Linux developers avoid this re-organization > operations because they would lose the renamed file history, because > a new log is created for the new file, even if it is a renamed > version

[PATCHv3 3/4] cache.h: document add_[file_]to_index

Helped-by: Junio C Hamano Signed-off-by: Stefan Beller --- cache.h | 10 ++ 1 file changed, 10 insertions(+) diff --git a/cache.h b/cache.h index 929474d7a9..12394eb541 100644 --- a/cache.h +++ b/cache.h @@ -614,8 +614,18 @@ extern int

[PATCHv3 4/4] documentation: retire unfinished documentation

When looking for documentation for a specific function, you may be tempted to run git -C Documentation grep index_name_pos only to find the file technical/api-in-core-index.txt, which doesn't help for understanding the given function. It would be better to not find these functions in the

[PATCHv3 0/4] start documenting core functions

v3: * dropped commets on constants as they were not helpful * fixed one result in the example for index_name_pos(, "f", 1) (which is -3 now) v2: included all suggestions from Junio v1: The two single patches[1] are turned into a series here. [1]

[PATCHv3 1/4] cache.h: document index_name_pos

Signed-off-by: Stefan Beller --- cache.h | 19 +++ 1 file changed, 19 insertions(+) diff --git a/cache.h b/cache.h index 1b67f078dd..1469ddeafe 100644 --- a/cache.h +++ b/cache.h @@ -575,7 +575,26 @@ extern int verify_path(const char *path); extern int

[PATCHv3 2/4] cache.h: document remove_index_entry_at

Do this by moving the existing documentation from read-cache.c to cache.h. Signed-off-by: Stefan Beller --- cache.h | 3 +++ read-cache.c | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/cache.h b/cache.h index 1469ddeafe..929474d7a9 100644 ---

Re: What's cooking in git.git (Jan 2017, #02; Sun, 15)

Hi Junio, On Tue, 17 Jan 2017, Junio C Hamano wrote: > Johannes Schindelin writes: > > > On Sun, 15 Jan 2017, Junio C Hamano wrote: > > > >> * js/prepare-sequencer-more (2017-01-09) 38 commits > > > The only outstanding review comments I know about are your

Re: git fast-import crashing on big imports

Yo Jeff, your commit 8261e1f139db3f8aa6f9fd7d98c876cbeb0f927c from Aug 22nd, that changes delta_base_cache to use hashmap.h is the culprit for git fast-import crashing on large imports. Please read below, you can find a 55G SVN dump that should show the problem after a couple of minutes to less

Re: [PATCH 2/2] Be more careful when determining whether a remote was configured

Hi Peff, On Wed, 18 Jan 2017, Jeff King wrote: > On Wed, Jan 18, 2017 at 01:34:28PM +0100, Johannes Schindelin wrote: > > > > > Let's fix this by telling Git that a remote is not configured > > > > unless any fetch/push URL or refspect is configured explicitly. > > > > > > Hmm. Old versions of

Re: [RFC] stash --continue

Hi Marc, On Wed, 18 Jan 2017, Marc Branchaud wrote: > On 2017-01-16 05:54 AM, Johannes Schindelin wrote: > > > On Mon, 16 Jan 2017, Stephan Beyer wrote: > > > > > a git-newbie-ish co-worker uses git-stash sometimes. Last time he > > > used "git stash pop", he got into a merge conflict. After he

Re: problem with insider build for windows and git

Hi, On Sat, 14 Jan 2017, Johannes Schindelin wrote: > Footnote *2*: http://tinyurl.com/gitCal suggests that Git v2.12.0 will > be released early February soon after Git Merge (and Git for Windows > v2.12.0 will follow soon thereafter), and with no patches applied to the > `maint` branch since

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

Santiago Torres writes: <>??? Eric, I've noticed that this message http://public-inbox.org/git/20170118182831.pkhqu2np3bh2puei@LykOS.localdomain/ and all messages from Santiago appear empty when they come via public-inbox.org; the reason I suspect we haven't heard much

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

Santiago Torres writes: >> Squashing the following into this commit solves this issue with the >> former approach. The lines it touches are all from 4/6 and I view >> all of it as general improvement, including type correctness and >> code formatting. > > Thanks! > > Should I

RE: [RFC] Add support for downloading blobs on demand

We actually pursued trying to make submodules work for some time and even built tooling around trying to work around some of the issues we ran into (not repo.py but along a similar line) before determining that we would be better served by having a single repo and solving the scale issues. I

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

Junio C Hamano writes: > santi...@nyu.edu writes: > >> @@ -428,9 +443,12 @@ int cmd_tag(int argc, const char **argv, const char >> *prefix) >> if (filter.merge_commit) >> die(_("--merged and --no-merged option are only allowed with >> -l")); >> if

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

On Wed, Jan 18, 2017 at 10:25:59AM -0800, Junio C Hamano wrote: > > This triggers: > > > > builtin/tag.c: In function 'cmd_tag': > > builtin/tag.c:451:3: error: passing argument 3 of > > 'for_each_tag_name' discards 'const' qualifier from pointer target type > > [-Werror] > >

Re: [PATCH] gitk: remove translated message from comments

Paul Mackerras writes: > On Tue, Jan 17, 2017 at 07:52:45PM -0800, David Aguilar wrote: >> "make update-po" fails because a previously untranslated string >> has now been translated: >> >> Updating po/sv.po >> po/sv.po:1388: duplicate message definition... >>

Re: [RFC] stash --continue

On 2017-01-18 11:34 AM, Johannes Schindelin wrote: Hi Marc, On Wed, 18 Jan 2017, Marc Branchaud wrote: On 2017-01-16 05:54 AM, Johannes Schindelin wrote: On Mon, 16 Jan 2017, Stephan Beyer wrote: a git-newbie-ish co-worker uses git-stash sometimes. Last time he used "git stash pop", he

Re: Git: new feature suggestion

On Wed, Jan 18, 2017 at 2:40 AM, Joao Pinto wrote: > Hello, > > My name is Joao Pinto, I work at Synopsys and I am a frequent Linux Kernel > contributor. > > Let me start by congratulate you for the fantastic work you have been doing > with > Git which is an excellent

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

Jeff King writes: >> diff --git a/builtin/tag.c b/builtin/tag.c >> index f81273a85a..fbb85ba3dc 100644 >> --- a/builtin/tag.c >> +++ b/builtin/tag.c >> @@ -66,10 +66,10 @@ static int list_tags(struct ref_filter *filter, struct >> ref_sorting *sorting, con >> } >> >> typedef

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

On Wed, Jan 18, 2017 at 10:44:03AM -0800, Junio C Hamano wrote: > Santiago Torres writes: > Was: Thanks! Would you want me to re-roll really quick? or would you rather apply this on your side? Thanks, -Santiago. > > Eric, I've noticed that this message > > >

Re: problem with insider build for windows and git

Johannes Schindelin writes: > And just to prove me wrong, today I got the first update to `maint` in six > weeks, with a message "Almost ready for 2.11.1" at its tip, featuring a > whopping 141 commits (95 of which are not merge commits). > > So it seems that v2.11.1

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

On Wed, Jan 18, 2017 at 10:25:59AM -0800, Junio C Hamano wrote: > Junio C Hamano writes: > > > santi...@nyu.edu writes: > > > >> @@ -428,9 +443,12 @@ int cmd_tag(int argc, const char **argv, const char > >> *prefix) > >>if (filter.merge_commit) > >>

Re: [PATCH v3 0/5] extend git-describe pattern matching

On Wed, Jan 18, 2017 at 12:18 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> From: Jacob Keller >> >> ** v3 fixes a minor typo in one of the test cases, so please ignore v2 >>I left the interdiff as between v1 and

Re: "git diff --ignore-space-change --stat" lists files with only whitespace differences as "changed"

On Wed, Jan 18, 2017 at 12:57:12PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > So I dunno. A sensible rule to me is "iff -p would show a diff header, > > then --stat should mention it". > > True but tricky (you need a better definition of "a diff header"). > > In

Re: [PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

On Wed, Jan 18, 2017 at 11:45 AM, Junio C Hamano wrote: > > I do not know if it is clear enough that 'option' in the last > sentence is a placeholder. I then wondered if spelling it as > `--no-` would make it a bit clearer, but that is ugly. > To be fair, this is exactly how

Re: [PATCH 5/5] describe: teach describe negative pattern matches

On Wed, Jan 18, 2017 at 4:44 AM, Johannes Schindelin wrote: > Hi Jake, > > On Tue, 17 Jan 2017, Jacob Keller wrote: > >> On Fri, Jan 13, 2017 at 1:31 PM, Johannes Sixt wrote: >> > Am 13.01.2017 um 07:57 schrieb Jacob Keller: >> >> >> >> On Thu, Jan 12,

Re: [PATCH 1/4] document index_name_pos

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > cache.h | 15 +++ > 1 file changed, 15 insertions(+) > > diff --git a/cache.h b/cache.h > index 1b67f078dd..270a0d0ea7 100644 > --- a/cache.h > +++ b/cache.h > @@ -575,7 +575,22 @@

Re: [PATCH 2/4] remove_index_entry_at: move documentation to cache.h

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > cache.h | 3 +++ > read-cache.c | 1 - > 2 files changed, 3 insertions(+), 1 deletion(-) > > diff --git a/cache.h b/cache.h > index 270a0d0ea7..26632065a5 100644 > --- a/cache.h > +++

Re: [PATCH] mingw: follow-up to "replace isatty() hack"

Am 18.01.2017 um 20:19 schrieb Junio C Hamano: Johannes Schindelin writes: compat/winansi.c | 11 --- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/compat/winansi.c b/compat/winansi.c index 3c9ed3cfe0..82b89ab137 100644 ---

Re: [PATCH 25/27] attr: store attribute stacks in hashmap

On Wed, Jan 18, 2017 at 12:39 PM, Stefan Beller wrote: > On Thu, Jan 12, 2017 at 3:53 PM, Brandon Williams wrote: >> -static void prepare_attr_stack(const char *path, int dirlen) >> +/* >> + * This funciton should only be called from 'get_attr_stack()',

Re: [PATCH v3 2/5] name-rev: extend --refs to accept multiple patterns

On Wed, Jan 18, 2017 at 12:04 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> From: Jacob Keller >> >> Teach git name-rev to take a string list of patterns from --refs instead >> of only a single pattern. The list of

Re: [PATCH 4/4] documentation: retire unfinished documentation

Stefan Beller writes: > When looking for documentation for a specific function, you may be tempted > to run > > git -C Documentation grep index_name_pos > > only to find the file technical/api-in-core-index.txt, which doesn't > help for understanding the given function. It

Re: [PATCH 3/4] document add_[file_]to_index

Stefan Beller writes: > Signed-off-by: Stefan Beller > --- > cache.h | 17 - > 1 file changed, 12 insertions(+), 5 deletions(-) > > diff --git a/cache.h b/cache.h > index 26632065a5..acc639d6e0 100644 > --- a/cache.h > +++ b/cache.h > @@

Re: git fast-import crashing on big imports

On Wed, Jan 18, 2017 at 03:01:17PM +0100, Ulrich Spoerlein wrote: > Yo Jeff, your commit 8261e1f139db3f8aa6f9fd7d98c876cbeb0f927c from Aug > 22nd, that changes delta_base_cache to use hashmap.h is the culprit for > git fast-import crashing on large imports. I actually saw your bug report the

Re: [RFC] stash --continue

On 2017-01-16 05:54 AM, Johannes Schindelin wrote: Hi Stephan, On Mon, 16 Jan 2017, Stephan Beyer wrote: a git-newbie-ish co-worker uses git-stash sometimes. Last time he used "git stash pop", he got into a merge conflict. After he resolved the conflict, he did not know what to do to get the

Re: [RFC] stash --continue

Johannes Schindelin writes: >> > More like "git stash pop --continue". Without the "pop" command, it >> > does not make too much sense. >> >> Why not? git should be able to remember what stash command created the >> conflict. Why should I have to? Maybe the fire

Re: What's cooking in git.git (Jan 2017, #02; Sun, 15)

Johannes Sixt writes: > Am 17.01.2017 um 20:17 schrieb Junio C Hamano: >> So... can we move this forward? > > I have no objects anymore. > > -- Hannes Alright, thanks. Dscho what's your assessment? My "I do not think" before the quoted "can we move" above was more about

Re: [PATCH v5 3/3] Retire the scripted difftool

Johannes Schindelin writes: > Hi Junio, > > On Tue, 17 Jan 2017, Junio C Hamano wrote: > >> Johannes Schindelin writes: >> >> > It served its purpose, but now we have a builtin difftool. Time for the >> > Perl script to enjoy Florida. >>

Re: [RFC] stash --continue

Hi, On 01/18/2017 04:41 PM, Marc Branchaud wrote: > On 2017-01-16 05:54 AM, Johannes Schindelin wrote: >> On Mon, 16 Jan 2017, Stephan Beyer wrote: >>> a git-newbie-ish co-worker uses git-stash sometimes. Last time he used >>> "git stash pop", he got into a merge conflict. After he resolved the

Re: [RFC] stash --continue

>> At least `git stash pop --continue` would be consistent with all other >> `--continue` options in Git that I can think of... > Alas, I disagree! I'm with Johannes here. "git stash" sans subcommand is pretty explicitly defined as "git stash save", so by similar logic, "git stash --continue",

Re: [PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

Jacob Keller writes: > From: Jacob Keller > > Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", > 2011-06-09) added the OPT_STRING_LIST as a way to accumulate a repeated > list of strings. However, this was not documented in the

Re: [PATCH v3 2/5] name-rev: extend --refs to accept multiple patterns

Jacob Keller writes: > From: Jacob Keller > > Teach git name-rev to take a string list of patterns from --refs instead > of only a single pattern. The list of patterns will be matched > inclusively, such that a ref only needs to match one

Re: Git: new feature suggestion

Hi Stefan, Às 6:50 PM de 1/18/2017, Stefan Beller escreveu: > On Wed, Jan 18, 2017 at 2:40 AM, Joao Pinto wrote: >> Hello, >> >> My name is Joao Pinto, I work at Synopsys and I am a frequent Linux Kernel >> contributor. >> >> Let me start by congratulate you for the

Re: [PATCH] mingw: follow-up to "replace isatty() hack"

Johannes Schindelin writes: > The version of the "replace isatty() hack" that got applied to the > `maint` branch did not actually reflect the latest iteration of the > patch series: v3 was sent out with these changes, as requested by > the reviewer Johannes Sixt:

Re: [PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

From: "Junio C Hamano" v3 1/5] doc: add documentation for OPT_STRING_LIST Jacob Keller writes: From: Jacob Keller Commit c8ba16391655 ("parse-options: add OPT_STRING_LIST helper", 2011-06-09) added the OPT_STRING_LIST

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

Jacob Keller writes: > From: Jacob Keller > > Extend name-rev further to support matching refs by adding `--exclude` > patterns. These patterns will limit the scope of refs by excluding any > ref that matches at least one exclude pattern.

Re: [PATCH v6 4/6] builtin/tag: add --format argument for tag -v

Junio C Hamano wrote: > Santiago Torres writes: > > <>??? > > Eric, I've noticed that this message > > > http://public-inbox.org/git/20170118182831.pkhqu2np3bh2puei@LykOS.localdomain/ > > and all messages from Santiago appear empty when they come via >

Re: [PATCH v3 5/5] describe: teach describe negative pattern matches

Jacob Keller writes: > From: Jacob Keller > > Teach git-describe the `--exclude` option which will allow specifying > a glob pattern of tags to ignore. This can be combined with the > `--match` patterns to enable more flexibility in determining

Re: [PATCH 21/27] attr: use hashmap for attribute dictionary

On Thu, Jan 12, 2017 at 3:53 PM, Brandon Williams wrote: > +/* Initialize an 'attr_hashmap' object */ > +void attr_hashmap_init(struct attr_hashmap *map) In case a reroll is needed, mark this static please.

Re: git fast-import crashing on big imports

On Wed, Jan 18, 2017 at 09:20:07PM +0100, Ulrich Spörlein wrote: > I found your commit via bisect in case you were wondering. Thanks for > picking this up. Still downloading. However, just looking at the code, the obvious culprit would be clear_delta_base_cache(), which is called from literally

Re: [PATCH 25/27] attr: store attribute stacks in hashmap

On Thu, Jan 12, 2017 at 3:53 PM, Brandon Williams wrote: > -static void prepare_attr_stack(const char *path, int dirlen) > +/* > + * This funciton should only be called from 'get_attr_stack()', which already "function" > + /* system-wide frame */ > +

Re: [PATCH v3 0/5] extend git-describe pattern matching

Jacob Keller writes: > From: Jacob Keller > > ** v3 fixes a minor typo in one of the test cases, so please ignore v2 >I left the interdiff as between v1 and v3 instead of v2 ** Very much appreciated. I just finished reading this round

Re: [PATCH 21/27] attr: use hashmap for attribute dictionary

On 01/18, Stefan Beller wrote: > On Thu, Jan 12, 2017 at 3:53 PM, Brandon Williams wrote: > > > +/* Initialize an 'attr_hashmap' object */ > > +void attr_hashmap_init(struct attr_hashmap *map) > > In case a reroll is needed, mark this static please. Will do. -- Brandon

Re: git fast-import crashing on big imports

On Wed, Jan 18, 2017 at 09:38:14AM -0500, Jeff King wrote: > On Wed, Jan 18, 2017 at 03:01:17PM +0100, Ulrich Spoerlein wrote: > > > Yo Jeff, your commit 8261e1f139db3f8aa6f9fd7d98c876cbeb0f927c from Aug > > 22nd, that changes delta_base_cache to use hashmap.h is the culprit for > > git

Re: [PATCH 25/27] attr: store attribute stacks in hashmap

On 01/13, Junio C Hamano wrote: > Brandon Williams writes: > > > The last big hurdle towards a thread-safe API for the attribute system > > is the reliance on a global attribute stack that is modified during each > > call into the attribute system. > > > > This patch removes

Re: [PATCH 25/27] attr: store attribute stacks in hashmap

On 01/18, Stefan Beller wrote: > On Thu, Jan 12, 2017 at 3:53 PM, Brandon Williams wrote: > > -static void prepare_attr_stack(const char *path, int dirlen) > > +/* > > + * This funciton should only be called from 'get_attr_stack()', which > > already > > "function" > > > +

Re: [PATCH] mingw: follow-up to "replace isatty() hack"

Johannes Sixt writes: >>> - dup2(new_fd, fd); >>> if (console == handle) >>> console = duplicate; >>> - handle = INVALID_HANDLE_VALUE; >>> + dup2(new_fd, fd); >>> >>> /* Close the temp fd. This explicitly closes "new_handle" >>> * (because it has

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

On Wed, Jan 18, 2017 at 12:11 PM, Junio C Hamano wrote: > Jacob Keller writes: > >> From: Jacob Keller >> >> Extend name-rev further to support matching refs by adding `--exclude` >> patterns. These patterns will limit the

Re: git fast-import crashing on big imports

On Wed, Jan 18, 2017 at 03:27:04PM -0500, Jeff King wrote: > On Wed, Jan 18, 2017 at 09:20:07PM +0100, Ulrich Spörlein wrote: > > > I found your commit via bisect in case you were wondering. Thanks for > > picking this up. > > Still downloading. However, just looking at the code, the obvious >

Re: "git diff --ignore-space-change --stat" lists files with only whitespace differences as "changed"

Jeff King writes: > So I dunno. A sensible rule to me is "iff -p would show a diff header, > then --stat should mention it". True but tricky (you need a better definition of "a diff header"). In addition to a new and deleted file, does a file whose executable bit was flipped

Re: [PATCH v3 1/5] doc: add documentation for OPT_STRING_LIST

"Philip Oakley" writes: >>> +`OPT_STRING_LIST(short, long, , arg_str, description)`:: >>> + Introduce an option with string argument. >>> + The string argument is stored as an element in `` which must be a >>> + struct string_list. Reset the list using `--no-option`. >>> +

Re: [PATCH v3 3/5] name-rev: add support to exclude refs by pattern match

Jacob Keller writes: > Yes this makes sense. I'm still looking at whether the alternative > implementation suggested based on the git-log style would make more > sense or not, but if we keep this as is, the added text you gave is > important. I actually think it is a

  1   2   >