Re: [PATCH 6/9] ref-filter: introduce format_ref_array_item()

Karthik Nayak writes: > Introduce format_ref_array_item() which will output the details of a > given ref_array_item as per the given format and quote_style to the > given strbuf. Why do you need it in this series and you could do without for tag? Going through PATCH 8/9,

Re: [PATCH 8/9] branch: use ref-filter printing APIs

Karthik Nayak writes: > - if (upstream_is_gone) { > - if (show_upstream_ref) > - strbuf_addf(stat, _("[%s: gone]"), fancy.buf); The old string was translated, and you're replacing it with one which isn't. I'm not a big fan of

Re: [PATCH 1/2] test-path-utils.c: remove incorrect assumption

I'm going to have to attach this as a file, git-send-email isn't working for me; apologies. On Sat, Oct 3, 2015 at 1:44 PM, Ray Donnelly wrote: > In normalize_ceiling_entry(), we test that normalized paths end with > slash, *unless* the path to be normalized was already

Re: [PATCH 3/9] ref-filter: add support for %(path) atom

Karthik Nayak writes: > This adds %(path) and %(path:short) atoms. The %(path) atom will print > the path of the given ref, while %(path:short) will only print the > subdirectory of the given ref. What does "path" mean in this context? How is it different from %(refname)?

git svn pushing to wrong branch

Hello dear gitters, I've been trying to use git-svn to work with branches. When I merge branch A into branch B, and then do a dcommit, the change is not pushed to branch B. I've attached a bash script that demonstrates the issue. I've tested with svn 1.9 and git 2.5. The problem goes away

Re: [PATCH 7/9] ref-filter: make %(upstream:track) prints "[gone]" for invalid upstreams

Karthik Nayak writes: > diff --git a/ref-filter.c b/ref-filter.c > index 099acd6..48b06e3 100644 > --- a/ref-filter.c > +++ b/ref-filter.c > @@ -1133,8 +1133,10 @@ static void populate_value(struct ref_array_item *ref) > char buf[40]; > >

Re: [BUG?] applypatch-msg hook no-longer thinks stdin is a tty

Am 03.10.2015 um 09:37 schrieb Chris Packham: On Sat, Oct 3, 2015 at 6:43 AM, Junio C Hamano wrote: If you want to go interactive from the hook, you'd have to open and interact with /dev/tty yourself in your hook anyway. That may be what I have to do, although I have

Re: [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms

Karthik Nayak writes: > Implement %(if), %(then) and %(else) atoms. Used as > %(if)..%(then)..%(end) or %(if)..%(then)..%(else)..%(end). I prefer ... to .., which often means "interval" as in HEAD^^..HEAD. > If there is an atom with value or string literal after the

[PATCH 1/2] test-path-utils.c: remove incorrect assumption

In normalize_ceiling_entry(), we test that normalized paths end with slash, *unless* the path to be normalized was already the root directory. However, normalize_path_copy() does not even enforce this condition. Even worse: on Windows, the root directory gets translated into a Windows directory

Re: [PATCH 41/68] init: use strbufs to store paths

On 03.10.15 18:54, Junio C Hamano wrote: > Torsten Bögershausen writes: > >> On 30.09.15 02:23, Jeff King wrote: >>> On Tue, Sep 29, 2015 at 04:50:39PM -0700, Michael Blume wrote: >>> I see compile errors on my mac: >> >> This is my attempt, passing the test, but not

Re: [PATCH v2 01/43] refs.c: create a public version of verify_refname_available

On Sat, 2015-10-03 at 07:02 +0200, Torsten Bögershausen wrote: > On 29.09.15 00:01, David Turner wrote: > > > (Not sure if this is the right thread to report on) > > In file included from builtin/commit.c:20: > ./refs.h:695:16: warning: redefinition of typedef 'ref_transaction_free_fn' > is a

Re: [PATCH v2 43/43] refs: tests for db backend

On Mon, Sep 28, 2015 at 06:02:18PM -0400, David Turner wrote: > Add tests for the database backend. > > Signed-off-by: David Turner > --- > t/t1460-refs-be-db.sh| 1103 > ++ > t/t1470-refs-be-db-reflog.sh | 353

Re: [PATCH v8 0/7] git-p4: add support for large file systems

Junio C Hamano writes: > Luke Diamand writes: > >> All looks good to me, Ack. >> >> One tiny thing perhaps Junio could comment on: the git commit message >> for 75abe9fa5b39980de27dfc33dd5b4f4b5926f34c, "git-p4: add optional >> type specifier to gitConfig

Re: Git feature request: mark a commit as minor

You are right. It could be useful to fix old commits (already pushed) but it could encourage bad practices. Minor changes should be avoided, it is an exception, not a rule. Thank you Fredrik. On 03/10/2015 15:12, Fredrik Gustafsson wrote: > On Fri, Oct 02, 2015 at 06:38:46PM -0300, Felipe

Re: [PATCH v2 01/43] refs.c: create a public version of verify_refname_available

On 03.10.15 18:50, David Turner wrote: > On Sat, 2015-10-03 at 07:02 +0200, Torsten Bögershausen wrote: >> On 29.09.15 00:01, David Turner wrote: >>> >> (Not sure if this is the right thread to report on) >> >> In file included from builtin/commit.c:20: >> ./refs.h:695:16: warning: redefinition of

Re: [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms

Matthieu Moy writes: > My take on it: > > Implement %(if), %(then) and %(else) atoms. Used as > %(if)...%(then)...%(end) or %(if)...%(then)...%(else)...%(end). If the > format string between %(if) and %(then) expands to an empty string, or > to only whitespaces,

[PATCH 1/2] quote: fix broken sq_quote_buf() related comment

Since 77d604c (Enhanced sq_quote(), 10 Oct 2005), the comment at the beginning of quote.c is broken. Let's fix it. --- quote.c | 1 + 1 file changed, 1 insertion(+) diff --git a/quote.c b/quote.c index 7920e18..890885a 100644 --- a/quote.c +++ b/quote.c @@ -7,6 +7,7 @@ int quote_path_fully = 1;

[PATCH 2/2] quote: move comment before sq_quote_buf()

A big comment at the beginning of quote.c is really related to sq_quote_buf(), so let's move it in front of this function. --- quote.c | 10 +- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/quote.c b/quote.c index 890885a..fe884d2 100644 --- a/quote.c +++ b/quote.c @@ -4,6

Re: [PATCH v8 0/7] git-p4: add support for large file systems

Luke Diamand writes: > On 26 September 2015 at 08:54, wrote: >> From: Lars Schneider >> >> diff to v7: >> * fix commit message line length (thanks Junio) >> * fix sync command for large file system support (thanks Luke!) >>

Re: [PATCH 41/68] init: use strbufs to store paths

Torsten Bögershausen writes: > On 30.09.15 02:23, Jeff King wrote: >> On Tue, Sep 29, 2015 at 04:50:39PM -0700, Michael Blume wrote: >> >>> I see compile errors on my mac: >>> > > This is my attempt, passing the test, but not fully polished. Thanks. > diff --git

Re: Git feature request: mark a commit as minor

On Fri, Oct 02, 2015 at 06:38:46PM -0300, Felipe Micaroni Lalli wrote: > A minor change (also called "cosmetic") usually is a typo fix, doc > improvement, a little code refactoring that don't change the behavior etc. > > In Wikipedia we can mark an edition as "minor". > > It would be nice to

Re: [PATCH 1/2] test-path-utils.c: remove incorrect assumption

Ray Donnelly writes: > In normalize_ceiling_entry(), we test that normalized paths end with > slash, *unless* the path to be normalized was already the root > directory. > > However, normalize_path_copy() does not even enforce this condition. Perhaps the real issue to

Re: [PATCH v8 0/7] git-p4: add support for large file systems

On 26 September 2015 at 08:54, wrote: > From: Lars Schneider > > diff to v7: > * fix commit message line length (thanks Junio) > * fix sync command for large file system support (thanks Luke!) > * add test case for sync command > * rename

Re: [RFC/PATCH v1] Add Travis CI support

On 28 September 2015 at 19:47, Junio C Hamano wrote: > I won't enable it on github.com:gitster/git anyway, so I do not > think that is a concern. I thought what people are talking about > was to add it on github.com:git/git, but have I been misreading the > thread? I do not

Re: [RFC/PATCH v1] Add Travis CI support

On Sat, Oct 3, 2015 at 3:23 PM, Roberto Tyley wrote: > > Given this, enabling Travis CI for git/git seems pretty low risk, > are there any strong objections to it happening? I still don't see a reason why git/git needs to be the one that is used, when somebody so

Re: [RFC/PATCH v1] Add Travis CI support

Junio C Hamano writes: > On Sat, Oct 3, 2015 at 3:23 PM, Roberto Tyley wrote: >> >> Given this, enabling Travis CI for git/git seems pretty low risk, >> are there any strong objections to it happening? > > I still don't see a reason why git/git needs

Re: [PATCH 41/68] init: use strbufs to store paths

On Sat, Oct 03, 2015 at 11:12:13PM +0200, Torsten Bögershausen wrote: > > Hmph, Peff's quick-fix passed the original "CoNfIg" in directly > > to probe_utf8_pathname_composition() without changing its signature. > True, ( I was thinking that the test did only work on case insensitive FS). > We

Re: [RFC/PATCH v1] Add Travis CI support

On Sat, Oct 03, 2015 at 11:23:52PM +0100, Roberto Tyley wrote: > On 28 September 2015 at 19:47, Junio C Hamano wrote: > > I won't enable it on github.com:gitster/git anyway, so I do not > > think that is a concern. I thought what people are talking about > > was to add it on

Re: Git feature request: mark a commit as minor

Thank you Jacob. Actually we already use the keyword MINOR for that, exactly as you said. The suggestion was made because I think it is a common behavior and it would be nice to be a meta info to standardize this (today each team adopt a different pattern for that - you used "TRIVIAL" e.g.).

Re: [PATCH 1/9] ref-filter: implement %(if), %(then), and %(else) atoms

On Sat, Oct 3, 2015 at 2:15 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> +static int is_empty(const char * s){ >> + while (*s != '\0') { >> + if (!isspace(*s)) >> + return 0; >> + s++; >> + }

Re: [PATCH 2/9] ref-filter: implement %(if:equals=) and %(if:notequals=)

On Sat, Oct 3, 2015 at 2:24 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> Implement %(if:equals=) wherein the if condition is only >> satisfied if the value obtained between the %(if:...) and %(then) atom >> is the same as the given ''. >> >>

Re: [PATCH 4/9] ref-filter: modify "%(objectname:short)" to take length

On Sat, Oct 3, 2015 at 2:32 AM, Junio C Hamano wrote: > Karthik Nayak writes: > >> Add support for %(objectname:short,) which would print the >> abbreviated unique objectname of given length. When no length is >> specified 7 is used. The minimum length

Re: [BUG?] applypatch-msg hook no-longer thinks stdin is a tty

On Sat, Oct 3, 2015 at 6:43 AM, Junio C Hamano wrote: > Junio C Hamano writes: > >> Chris Packham writes: >> >>> As of git 2.6 this has stopped working and stdin always fails the tty >>> check. >> >> We now run that hook thru

Re: Git feature request: mark a commit as minor

On Fri, Oct 2, 2015 at 2:38 PM, Felipe Micaroni Lalli wrote: > A minor change (also called "cosmetic") usually is a typo fix, doc > improvement, a little code refactoring that don't change the behavior etc. > > In Wikipedia we can mark an edition as "minor". > > It would

Re: Git feature request: mark a commit as minor

On Sat, Oct 3, 2015 at 8:11 AM, Jacob Keller wrote: > On Fri, Oct 2, 2015 at 2:38 PM, Felipe Micaroni Lalli > wrote: >> A minor change (also called "cosmetic") usually is a typo fix, doc >> improvement, a little code refactoring that don't change