[PATCH 13/35] attr: convert git_check_attrs() callers to use the new API

From: Junio C Hamano The remaining callers are all simple "I have N attributes I am interested in. I'll ask about them with various paths one by one". After this step, no caller to git_check_attrs() remains. After removing it, we can extend "struct git_attr_check" struct

[PATCH 22/35] attr.c: introduce empty_attr_check_elems()

From: Junio C Hamano One codepath needs to just empty the git_attr_check_elem array in the git_attr_check structure, without releasing the entire resource. Introduce a helper to do so and rewrite git_attr_check_clear() using it. Signed-off-by: Junio C Hamano

[PATCH 12/35] attr: convert git_all_attrs() to use "struct git_attr_check"

From: Junio C Hamano This updates the other two ways the attribute check is done via an array of "struct git_attr_check_elem" elements. These two niches appear only in "git check-attr". * The caller does not know offhand what attributes it wants to ask about and cannot

[PATCH 19/35] attr.c: pass struct git_attr_check down the callchain

From: Junio C Hamano The callchain that starts from git_check_attrs() down to collect_some_attrs() used to take an array of git_attr_check_elem as their parameters. Pass the enclosing git_attr_check instance instead, so that they will have access to new fields we will add to

[PATCH 06/35] attr.c: mark where #if DEBUG ends more clearly

From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attr.c b/attr.c index

[PATCH 05/35] attr.c: complete a sentence in a comment

From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- attr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/attr.c b/attr.c index

[PATCH 18/35] attr.c: add push_stack() helper

From: Junio C Hamano There are too many repetitious "I have this new attr_stack element; push it at the top of the stack" sequence. The new helper function push_stack() gives us a way to express what is going on at these places, and as a side effect, halves the number of

[PATCH 11/35] attr: (re)introduce git_check_attr() and struct git_attr_check

From: Junio C Hamano A common pattern to check N attributes for many paths is to (1) prepare an array A of N git_attr_check_elem items; (2) call git_attr() to intern the N attribute names and fill A; (3) repeatedly call git_check_attrs() for path with N and A; A look-up

[PATCH 09/35] attr.c: plug small leak in parse_attr_line()

From: Junio C Hamano If any error is noticed after the match_attr structure is allocated, we shouldn't just return NULL from this function. Add a fail_return label that frees the allocated structure and returns NULL, and consistently jump there when we want to return NULL

[PATCH 10/35] attr: rename function and struct related to checking attributes

From: Junio C Hamano The traditional API to check attributes is to prepare an N-element array of "struct git_attr_check" and pass N and the array to the function "git_check_attr()" as arguments. In preparation to revamp the API to pass a single structure, in which these N

[PATCH 02/35] attr.c: use strchrnul() to scan for one line

From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- attr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/attr.c b/attr.c index

[PATCHv3 00/35] Revamp the attr subsystem!

previous discussion: https://public-inbox.org/git/20161028185502.8789-1-sbel...@google.com/ Changes since v2: * dropped one patch (that exposes git_attr_counted, nobody uses it throughout the series ) * added pathspec guarding and added a test with git-add to see if it works. * squashed

[PATCH 20/35] attr.c: rename a local variable check

From: Junio C Hamano Throughout this series, we are trying to use "check" to name an instance of "git_attr_check" structure; let's rename a "check" that refers to an array whose elements are git_attr_check_elem to avoid confusion. Signed-off-by: Junio C Hamano

Re: [PATCH v1 0/2] Fix default macOS build locally and on Travis CI

Lars Schneider writes: >> I've followed what was available at the public-inbox archive, but it >> is unclear what the conclusion was. >> >> For the first one your "how about" non-patch, to which Peff said >> "that's simple and good", looked good to me as well, but is

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

On Thu, Nov 10, 2016 at 01:33:29PM -0800, Junio C Hamano wrote: > Jeff King writes: > > > IMHO, the value in the http tests is not testing the server side, but > > the client side. Without being able to set up a dummy HTTP server, we do > > not have any way to exercise the client

Re: 2.11.0-rc1 will not be tagged for a few days

Junio C Hamano writes: > I'll report back an updated schedule when able. I pushed some updates out on 'master' today. Between 'master' and 'pu' on the first-parent history there is a merge 52975d2b1f ("Merge branch 'ls/macos-update' into jch", 2016-11-10) and that matches

Re: [PATCH v2] t6026-merge-attr: don't fail if sleep exits early

On Thu, Nov 10, 2016 at 02:30:36PM -0800, Junio C Hamano wrote: > As everybody knows there is no appropriate timeout value that is > good for everybody. I wonder if we can replace the sleep 1 with > something like > > ( while sleep 3600; do :; done ) & > > so that leaked fd will be kept

Re: [PATCH v2] t6026-merge-attr: don't fail if sleep exits early

Jeff King writes: > I do think the test would be a lot more obvious if it confirmed at the > end of the test that the process was still running, as opposed to > relying on test_when_finished to check it. I agree that "check that the process is still running" is a wrong thing to

Re: [PATCH v2] t6026-merge-attr: don't fail if sleep exits early

On Thu, Nov 10, 2016 at 02:55:06PM -0800, Junio C Hamano wrote: > If we ensure that the process is still running, then such a check is > a good belt-and-suspenders way to catch a breakage in the mechanism > we choose to ensure it. So probably we can require that the kill in > the "when finished"

[PATCH 16/35] attr: expose validity check for attribute names

From: Junio C Hamano Export attr_name_valid() function, and a helper function that returns the message to be given when a given pair is not a good name for an attribute. We could later update the message to exactly spell out what the rules for a good attribute

[PATCH 35/35] completion: clone can initialize specific submodules

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- contrib/completion/git-completion.bash | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index

[PATCH 29/35] pathspec: move long magic parsing out of prefix_pathspec

`prefix_pathspec` is quite a lengthy function and we plan on adding more. Split it up for better readability. As we want to add code into the inner loop of the long magic parsing, we also benefit from lower indentation. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH 26/35] attr: convert to new threadsafe API

This revamps the API of the attr subsystem to be thread safe. Before we had the question and its results in one struct type. The typical usage of the API was static struct git_attr_check *check; if (!check) check = git_attr_check_initl("text", NULL); git_check_attr(path,

[PATCH 34/35] clone: add --init-submodule= switch

The new switch passes the pathspec to `git submodule update --init` which is called after the actual clone is done. Additionally this configures the submodule.defaultUpdatePath to be the given pathspec, such that any future invocation of `git submodule update --init-default-paths` will keep up

[PATCH 33/35] submodule update: add `--init-default-path` switch

The new switch `--init-default-path` initializes the submodules which are configured in `submodule.defaultUpdatePath` instead of those given as command line arguments before updating. In the first implementation this is made incompatible with further command line arguments as it is unclear what

[PATCH 03/35] attr.c: update a stale comment on "struct match_attr"

From: Junio C Hamano When 82dce998 (attr: more matching optimizations from .gitignore, 2012-10-15) changed a pointer to a string "*pattern" into an embedded "struct pattern" in struct match_attr, it forgot to update the comment that describes the structure. Signed-off-by:

[PATCH 30/35] pathspec: move prefix check out of the inner loop

The prefix check is not related the check of pathspec magic; also there is no code that is relevant after we'd break the loop on a match for "prefix:". So move the check before the loop and shortcircuit the outer loop. Signed-off-by: Stefan Beller Signed-off-by: Junio C

[PATCH 32/35] pathspec: allow escaped query values

In our own .gitattributes file we have attributes such as: *.[ch] whitespace=indent,trail,space When querying for attributes we want to be able to ask for the exact value, i.e. git ls-files :(attr:whitespace=indent,trail,space) should work, but the commas are used in the attr magic to

[PATCH 15/35] attr: add counted string version of git_check_attr()

From: Junio C Hamano Often a potential caller has pair that represents the path it wants to ask attributes for; when path[pathlen] is not NUL, the caller has to xmemdupz() only to call git_check_attr(). Add git_check_attr_counted() that takes such a counted

[PATCH 25/35] attr: make git_check_attr_counted static

It's not used outside the attr code, so let's keep it private. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- attr.c | 4 ++-- attr.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/attr.c b/attr.c index

[PATCH 31/35] pathspec: allow querying for attributes

The pathspec mechanism is extended via the new ":(attr:eol=input)pattern/to/match" syntax to filter paths so that it requires paths to not just match the given pattern but also have the specified attrs attached for them to be chosen. Signed-off-by: Stefan Beller

[PATCH 27/35] attr: keep attr stack for each check

Instead of having a global attr stack, attach the stack to each check. This allows to use the attr in a multithreaded way. Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- attr.c| 101

[PATCH 04/35] attr.c: explain the lack of attr-name syntax check in parse_attr()

From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- attr.c | 6 ++ 1 file changed, 6 insertions(+) diff --git a/attr.c b/attr.c index

[PATCH 14/35] attr: retire git_check_attrs() API

From: Junio C Hamano Since nobody uses the old API, make it file-scope static, and update the documentation to describe the new API. Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano

[PATCH 28/35] Documentation: fix a typo

Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- Documentation/gitattributes.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/gitattributes.txt b/Documentation/gitattributes.txt index 8a061af..5b31797

[PATCH 08/35] attr.c: tighten constness around "git_attr" structure

From: Junio C Hamano It holds an interned string, and git_attr_name() is a way to peek into it. Make sure the involved pointer types are pointer-to-const. Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio

[PATCH 07/35] attr.c: simplify macroexpand_one()

From: Junio C Hamano The double-loop wants to do an early return immediately when one matching macro is found. Eliminate the extra variable 'a' used for that purpose and rewrite the "assign the found item to 'a' to make it non-NULL and force the loop(s) to terminate" with a

[PATCH 01/35] commit.c: use strchrnul() to scan for one line

From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- commit.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/commit.c b/commit.c

[PATCH 21/35] attr.c: correct ugly hack for git_all_attrs()

From: Junio C Hamano The collect_some_attrs() function has an ugly hack since 06a604e6 (attr: avoid heavy work when we know the specified attr is not defined, 2014-12-28) added an optimization that relies on the fact that the caller knows what attributes it is interested in,

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

Jeff King writes: > IMHO, the value in the http tests is not testing the server side, but > the client side. Without being able to set up a dummy HTTP server, we do > not have any way to exercise the client side of git-over-http at all. > And people on macOS _do_ use that. :)

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

On Thu, Nov 10, 2016 at 01:49:52PM -0800, Junio C Hamano wrote: > Yes, I recall the IIS one raised and discussed at least twice on the > list in the past, and it sounded that we want some solution to that. The patches had some issues. I suspect the population of people who want to run a git

Re: [PATCH] doc: fill in omitted word

Kristoffer Haugsbakk writes: > Signed-off-by: Kristoffer Haugsbakk > --- > Documentation/gitcore-tutorial.txt | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/Documentation/gitcore-tutorial.txt >

Re: [PATCH] doc: fill in omitted word

On Thu, Nov 10, 2016 at 02:07:30PM -0800, Junio C Hamano wrote: > Kristoffer Haugsbakk writes: > > > Signed-off-by: Kristoffer Haugsbakk > > --- > > Documentation/gitcore-tutorial.txt | 2 +- > > 1 file changed, 1 insertion(+), 1

Re: [git-for-windows] [ANNOUNCE] Prerelease: Git for Windows v2.11.0-rc0

Hi Lars, On Wed, 9 Nov 2016, Lars Schneider wrote: > On 05 Nov 2016, at 10:50, Johannes Schindelin > wrote: > > > I finally got around to rebase the Windows-specific patches (which seem to > > not make it upstream as fast as we get new ones) on top of upstream Git

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

Jeff King writes: >> I however do not know what the universally available simplest dummy >> HTTP server would be. There probably are better alternative than >> Apache with distro-customized ways of configuration that we have to >> adjust. >> >> A solution around

Re: "git subtree --squash" interacts poorly with revert, merge, and rebase

On Wed, 2016-10-26 at 19:07 -0400, Matt McCutchen wrote: > Maybe we would never hit any of these problems in practice, but they > give me a bad enough feeling that I'm planning to write my own tool > that tracks the upstream commit ID in a file (like a submodule) and > doesn't generate any extra

[PATCH 17/35] attr: support quoting pathname patterns in C style

From: Nguyễn Thái Ngọc Duy Full pattern must be quoted. So 'pat"t"ern attr' will give exactly 'pat"t"ern', not 'pattern'. Also clarify that leading whitespaces are not part of the pattern and document comment syntax. Signed-off-by: Nguyễn Thái Ngọc Duy

Re: [PATCH v2] t6026-merge-attr: don't fail if sleep exits early

Hi all, On Thu, 10 Nov 2016, Junio C Hamano wrote: > Andreas Schwab writes: > > > Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end > > of test case") added a kill command to clean up after the test, but this > > can fail if the sleep command exits before

Re: [PATCH v2] t6026-merge-attr: don't fail if sleep exits early

Johannes Schindelin writes: >> OK. sleep.pid is a reasonable easy-to-access side effect we can >> observe to make sure that the sleep-one-second merge driver was >> indeed invoked, which was missing from the earlier round. > > No, this is incorrect. The condition

Re: [PATCH v7 03/17] ref-filter: implement %(if:equals=) and %(if:notequals=)

On Thu, Nov 10, 2016 at 9:31 AM, Karthik Nayak wrote: > On Wed, Nov 9, 2016 at 4:52 AM, Jacob Keller wrote: >> On Tue, Nov 8, 2016 at 12:11 PM, Karthik Nayak wrote: >> >> Ok. How does this handle whitespace? The previous if

Re: [PATCH v7 04/17] ref-filter: modify "%(objectname:short)" to take length

On Thu, Nov 10, 2016 at 9:36 AM, Karthik Nayak wrote: > On Wed, Nov 9, 2016 at 4:57 AM, Jacob Keller wrote: >> On Tue, Nov 8, 2016 at 12:11 PM, Karthik Nayak wrote: >>> From: Karthik Nayak >>> >>> Add

Re: [PATCH] t6026: ensure that long-running script really is

Am 11.11.2016 um 00:53 schrieb Junio C Hamano: > Johannes Schindelin writes: > >> When making sure that background tasks are cleaned up in 5babb5b >> (t6026-merge-attr: clean up background process at end of test case, >> 2016-09-07), we considered to let the

Did You Get My Message This Time?

This is the second time i am sending you this mail.I, Friedrich Mayrhofer Donate $ 1,000,000.00 to You, Email Me personally for more details. Regards. Friedrich Mayrhofer

Re: [PATCH v7 03/17] ref-filter: implement %(if:equals=) and %(if:notequals=)

On Thu, Nov 10, 2016 at 3:26 PM, Junio C Hamano wrote: > Jacob Keller writes: > >>> @@ -49,6 +51,10 @@ static struct used_atom { >>> enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, >>> C_SUB } option; >>>

Re: [PATCH v7 01/17] ref-filter: implement %(if), %(then), and %(else) atoms

Jacob Keller writes: > Ok, so I have only one minor nit, but otherwise this looks quite good > to me. A few comments explaining my understanding, but only one > suggested > change which is really a minor nit and not worth re-rolling just for it. As you didn't snip parts

Re: [PATCH v7 03/17] ref-filter: implement %(if:equals=) and %(if:notequals=)

Jacob Keller writes: >> @@ -49,6 +51,10 @@ static struct used_atom { >> enum { C_BARE, C_BODY, C_BODY_DEP, C_LINES, C_SIG, >> C_SUB } option; >> unsigned int nlines; >> } contents; >> + struct

[PATCH] fetch: do not redundantly calculate tag refmap

builtin/fetch.c redundantly calculates refmaps for tags twice. Remove the first calculation. This is only a code simplification and slight performance improvement - the result is unchanged, as the redundant refmaps are subsequently removed by the invocation to "ref_remove_duplicates" anyway.

Re: 2.11.0-rc1 will not be tagged for a few days

Junio C Hamano writes: > Junio C Hamano writes: > >> I'll report back an updated schedule when able. > > I pushed some updates out on 'master' today. Between 'master' and > 'pu' on the first-parent history there is a merge 52975d2b1f ("Merge > branch

Re: [PATCH] fetch: do not redundantly calculate tag refmap

On Thu, Nov 10, 2016 at 04:13:28PM -0800, Jonathan Tan wrote: > builtin/fetch.c redundantly calculates refmaps for tags twice. Remove > the first calculation. > > This is only a code simplification and slight performance improvement - > the result is unchanged, as the redundant refmaps are

Re: [PATCH v7 01/17] ref-filter: implement %(if), %(then), and %(else) atoms

Karthik Nayak writes: >> Minor nit. I'm not sure what standard we use here at Git, but >> traditionally, I prefer to see { } blocks on all sections even if only >> one of them needs it. (That is, only drop the braces when every >> section is one line.) It also looks weird

Re: [PATCH] t6026: ensure that long-running script really is

Johannes Schindelin writes: > When making sure that background tasks are cleaned up in 5babb5b > (t6026-merge-attr: clean up background process at end of test case, > 2016-09-07), we considered to let the background task sleep longer, just > to be certain that it will

Re: [PATCH v7 04/17] ref-filter: modify "%(objectname:short)" to take length

Karthik Nayak writes: > else if (!strcmp(arg, "short")) > - atom->u.objectname = O_SHORT; > - else > + atom->u.objectname.option = O_SHORT; > + else if (skip_prefix(arg, "short=", )) { > + atom->u.objectname.option =

[PATCH 23/35] attr.c: always pass check[] to collect_some_attrs()

From: Junio C Hamano This function used to be called with check=NULL to signal it to collect all attributes in the global check_all_attr[] array. Because the longer term plan is to allocate check_all_attr[] and attr_stack data structures per git_attr_check instance (i.e.

[PATCH 24/35] attr.c: outline the future plans by heavily commenting

From: Junio C Hamano Signed-off-by: Junio C Hamano Signed-off-by: Stefan Beller Signed-off-by: Junio C Hamano --- attr.c | 40 +++- 1 file changed, 39 insertions(+), 1 deletion(-)

Re: [PATCH v1 0/2] Fix default macOS build locally and on Travis CI

> On 10 Nov 2016, at 00:39, Junio C Hamano wrote: > > larsxschnei...@gmail.com writes: > >> From: Lars Schneider >> >> Apple removed the OpenSSL header files in macOS and therefore Git does >> not build out of the box on macOS anymore. See

Re: Cleaning ignored files

On Wed, Nov 9, 2016 at 1:23 PM, Roman Terekhov wrote: > Hi, > > I want to ask about git clean -dXf command behaviour. > > I do the following: > > $ mkdir gitignore_test > $ cd gitignore_test/ > $ git init > Initialized empty Git repository in ~/gitignore_test/.git/ > > $

Hello,

We currently have openings to fund early startups at the preferential interest rate of two percent per year. Regards, Larry Koetze

Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano wrote: > Nguyễn Thái Ngọc Duy writes: > >> --- >> v2 changes just the subject line > > That's not sufficient, is it? What you did in the documentation > would raise the same "Hmph, is this only about HEAD?"

Re: [PATCH 4/5] attr: do not respect symlinks for in-tree .gitattributes

On Thu, Nov 10, 2016 at 7:23 AM, Jeff King wrote: > On Wed, Nov 09, 2016 at 04:18:29PM -0800, Junio C Hamano wrote: > >> Jeff King writes: >> >> > On Wed, Nov 09, 2016 at 02:58:37PM -0800, Junio C Hamano wrote: >> > >> > I'm slightly confused. Did you mean

[PATCH v2] Makefile: set NO_OPENSSL on macOS by default

From: Lars Schneider Apple removed the OpenSSL header files in macOS 10.11 and above. OpenSSL was deprecated since macOS 10.7. Set `NO_OPENSSL` and `APPLE_COMMON_CRYPTO` to `YesPlease` as default for macOS. It is possible to override this and use OpenSSL by defining

[RFC] Add way to make Git credentials accessible from clean/smudge filter

Hi, we just implemented the first "real-world" user of the new clean/smudge "filter protocol" interface (see "convert: add filter..process option" edcc858 for details) and the results are fantastic. Filtering 12,000 files in my artificial test repo is more than 60x faster (depending on the

Re: [RFC] Add way to make Git credentials accessible from clean/smudge filter

Lars Schneider writes: > I haven't looked at an implemenation approach at all. I wonder if this could > be OK from a conceptional point of view or if there are obvious security > problems that I am missing. Did you consider just running "git credential" from the

Re: [PATCH v7 01/17] ref-filter: implement %(if), %(then), and %(else) atoms

Hey, On Wed, Nov 9, 2016 at 4:43 AM, Jacob Keller wrote: > On Tue, Nov 8, 2016 at 12:11 PM, Karthik Nayak wrote: >> From: Karthik Nayak >> >> +Some atoms like %(align) and %(if) always require a matching %(end). >> +We call

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

On Thu, Nov 10, 2016 at 12:07:14PM +0100, Lars Schneider wrote: > > Using Apache in the tests has been the source of frequent portability > > problems and configuration headaches. I do wonder if we'd be better off > > using some small special-purpose web server (even a short perl script > >

Re: [PATCH v1 2/2] travis-ci: disable GIT_TEST_HTTPD for macOS

> On 07 Nov 2016, at 22:20, Jeff King wrote: > > On Sun, Nov 06, 2016 at 10:42:36PM +0100, Lars Schneider wrote: > >>> From: Lars Schneider >>> >>> TravisCI changed their default macOS image from 10.10 to 10.11 [1]. >>> Unfortunately the HTTPD tests

Re: [RFC] Add way to make Git credentials accessible from clean/smudge filter

On Thu, Nov 10, 2016 at 01:10:17PM +0100, Matthieu Moy wrote: > Lars Schneider writes: > > > I haven't looked at an implemenation approach at all. I wonder if this could > > be OK from a conceptional point of view or if there are obvious security > > problems that I

Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

On Thu, Nov 10, 2016 at 6:09 PM, Duy Nguyen wrote: > On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano wrote: >> Nguyễn Thái Ngọc Duy writes: >> >>> --- >>> v2 changes just the subject line >> >> That's not sufficient, is it? What you

Re: [PATCH v2] rebase: add --forget to cleanup rebase, leave everything else untouched

Duy Nguyen writes: > On Thu, Nov 10, 2016 at 6:09 PM, Duy Nguyen wrote: >> On Thu, Nov 10, 2016 at 3:12 AM, Junio C Hamano wrote: >>> Nguyễn Thái Ngọc Duy writes: >>> --- v2 changes just the subject line

Re: [PATCH v7 05/17] ref-filter: move get_head_description() from branch.c

On Wed, Nov 9, 2016 at 5:01 AM, Jacob Keller wrote: > On Tue, Nov 8, 2016 at 12:11 PM, Karthik Nayak wrote: > >> >> - if (starts_with(name, "refname")) >> + if (starts_with(name, "refname")) { >>

Re: [PATCH v2] t6026-merge-attr: don't fail if sleep exits early

Andreas Schwab writes: > Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end > of test case") added a kill command to clean up after the test, but this > can fail if the sleep command exits before the cleanup is executed. > Ignore the error from the kill

Re: [PATCH v7 02/17] ref-filter: include reference to 'used_atom' within 'atom_value'

>> >> /* >> @@ -370,7 +368,7 @@ static void align_atom_handler(struct atom_value *atomv, >> struct ref_formatting_s >> push_stack_element(>stack); >> new = state->stack; >> new->at_end = end_align_handler; >> - new->at_end_data = >u.align; >> +

Re: [PATCH v7 04/17] ref-filter: modify "%(objectname:short)" to take length

On Wed, Nov 9, 2016 at 4:57 AM, Jacob Keller wrote: > On Tue, Nov 8, 2016 at 12:11 PM, Karthik Nayak wrote: >> From: Karthik Nayak >> >> Add support for %(objectname:short=) which would print the >> abbreviated unique

Re: [PATCH v7 03/17] ref-filter: implement %(if:equals=) and %(if:notequals=)

On Wed, Nov 9, 2016 at 4:52 AM, Jacob Keller wrote: > On Tue, Nov 8, 2016 at 12:11 PM, Karthik Nayak wrote: > > Ok. How does this handle whitespace? The previous if implementation > treated whitespace as trimming to ignore. Does this require an

Re: [ANNOUNCE] Prerelease: Git for Windows v2.11.0-rc0

Am 05.11.2016 um 10:50 schrieb Johannes Schindelin: > Dear Git users, > > I finally got around to rebase the Windows-specific patches (which seem to > not make it upstream as fast as we get new ones) on top of upstream Git > v2.11.0-rc0, and to bundle installers, portable Git and MinGit [*1*]: >

[PATCH v2] t6026-merge-attr: don't fail if sleep exits early

Commit 5babb5bdb3 ("t6026-merge-attr: clean up background process at end of test case") added a kill command to clean up after the test, but this can fail if the sleep command exits before the cleanup is executed. Ignore the error from the kill command. Explicitly check for the existence of the