Re: [PATCH v1] travis-ci: build documentation

2016-04-25 Thread Matthieu Moy
Lars Schneider writes: > On 22 Apr 2016, at 11:07, Matthieu Moy wrote: > >> The ; or the newline is not needed either. > Unfortunately it seems to be required. Travis CI generates a shell script > out of the yml file and I think they don't respect newli

Re: GSoC Project Selected | Incremental Rewrite of git bisect

2016-04-25 Thread Matthieu Moy
llow, but just a proof that you understood the amount of work to be done and that you have an idea on how to accomplish it. I wouldn't be the first one to write "value [...] Responding to change over following a plan" ;-). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To un

Re: [PATCH v1] travis-ci: build documentation

2016-04-25 Thread Matthieu Moy
. > we do not see a semicolon before "pushd". > > case "${TRAVIS_OS_NAME:-linux}" in > linux) > mkdir --parents custom/p4 > pushd custom/p4 I'm tempted to think that these lines create directori

[RFC/PATCH] git-multimail: update to release 1.3.0-rc1

2016-04-27 Thread Matthieu Moy
The changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: Stefan Tatschner Contributions-by: Simon P Contributions-by: Leander Hasty Signed-off-by: Matthieu Moy --- Not for inclusion, but tests and reviews welcome. contrib/hooks/multimail/CHANGES

Re: [PATCH v2] travis-ci: build documentation

2016-04-29 Thread Matthieu Moy
agree. My proposal to check for a handful of generated files was just because this extra paranoia was almost free (just 3 lines of code that won't need particular maintenance). In this case, I'm afraid the maintenance cost is much bigger than the expected benefits. -- Matthieu Moy

Re: [PATCH v2] travis-ci: build documentation

2016-04-29 Thread Matthieu Moy
in favor of ci/* -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2] travis-ci: build documentation

2016-04-29 Thread Matthieu Moy
Stefan Beller writes: > On Fri, Apr 29, 2016 at 5:21 AM, Matthieu Moy > wrote: >> Jeff King writes: >> >>> On Fri, Apr 29, 2016 at 11:35:34AM +0200, larsxschnei...@gmail.com wrote: >>> >>>> +# The follow numbers need to be adjusted when new do

Re: [PATCH v2] Documentation: add setup instructions for Travis CI

2016-05-02 Thread Matthieu Moy
the patch looks good to me. Thanks, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2015-10-06 Thread Matthieu Moy
SET)); ;-). One obvious issue with the initial version was this big hard-to-parse block, but another one is that the code did not make it easy to understand what was changing depending on which branch of the if, and depending on local/remote. It's getting much easier already. -- Mat

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

2015-10-06 Thread Matthieu Moy
Karthik Nayak writes: > On Mon, Oct 5, 2015 at 2:19 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >>> which does not play well with the implementation of --column as done >>> in tag.c. Where, If I'm not wrong the --column option captures all >>&

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

2015-10-07 Thread Matthieu Moy
Karthik Nayak writes: > On Wed, Oct 7, 2015 at 12:33 AM, Matthieu Moy > wrote: > >> To go a bit further, you can pre-build a string or strbuf aligned_short >> with value like "%%(align:20,left)%%(refname:short)%%(end)" and use it >> where needed (it

Re: [BUG] GIT_INDEX environment variable ignored?

2015-10-08 Thread Matthieu Moy
"McAuley, Ben" writes: > However when I run the same command again, this time using the > GIT_INDEX env variable to provide the index I previously saved on master, > I don't see file2 like I'd expect... The variable name is GIT_INDEX_FILE (read 'man git'

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-08 Thread Matthieu Moy
8,11 +58,11 @@ test_expect_success 'branch -v' ' > ' > > cat >expect <<\EOF > -b1 [origin/master] [ahead 1, behind 1] d > -b2 [origin/master] [ahead 1, behind 1] d > -b3 [origin/master] [behind 1] b > -b4 [origin/master] [ahead 2] f > -b5 [bro

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-08 Thread Matthieu Moy
Karthik Nayak writes: > On Thu, Oct 8, 2015 at 5:57 PM, Matthieu Moy > wrote: >>> + unsigned int nobracket = 0; >>> + >>> + if (!strcmp(valp, ",nobracket")) >>> +

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-08 Thread Matthieu Moy
Karthik Nayak writes: > On Thu, Oct 8, 2015 at 10:40 PM, Matthieu Moy > wrote: > >> This particular piece of code is so important and I won't fight for a >> better factored one, but in general "there are only two instances" is a >> dubious argument to

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

2015-10-08 Thread Matthieu Moy
sly translated in "branch" and you are removing this translation (well, not here, but when 09/10 starts using this code). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@

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

2015-10-08 Thread Matthieu Moy
die(_("format: %%(then) atom used after %%(else)")); here, just in case (adding the two corresponding test_must_fail wouldn't harm of course). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 02/10] ref-filter: implement %(if:equals=) and %(if:notequals=)

2015-10-08 Thread Matthieu Moy
om = 1; > + > /* Useless new blank line. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2015-10-08 Thread Matthieu Moy
> MINIMUM_ABBREV' ' > + git for-each-ref --format="%(objectname:short=1)" refs/heads >actual && > + test_cmp expected actual > +' > + > +cat >expected < +$(git rev-parse --short=10 HEAD) > +EOF Likewise. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v2 05/10] ref-filter: adopt get_head_description() from branch.c

2015-10-08 Thread Matthieu Moy
re going to add one anyway. Code movement is more "git blame" friendly than code copy, and as a reviewer I'd rather see the code movement here and not hear about it later in the series. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the li

Re: [PATCH v2 08/10] ref-filter: add support for %(upstream:track,nobracket)

2015-10-08 Thread Matthieu Moy
num_theirs); > + else > + sprintf(buf, "[ahead %d, behind > %d]", > num_ours, num_theirs); > v->s = xstrdup(b

Re: [PATCH v2 08/10] ref-filter: add support for %(upstream:track,nobracket)

2015-10-08 Thread Matthieu Moy
Oops, sorry, I sent the wrong message, this one is empty. Please ignore. Matthieu Moy writes: > Karthik Nayak writes: > >> Add support for %(upstream:track,nobracket) which will print the >> tracking information without the brackets (i.e. "ahead N, behind M"). >

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

2015-10-08 Thread Matthieu Moy
> +struct if_then_else { > + unsigned int then_atom : 1, > + else_atom : 1, Maybe "then_atom_seen" and "else_atom_seen" would be better names. Or maybe they'd be too long, I leave it up to you. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from t

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-09 Thread Matthieu Moy
} *used_atom; Just a thought, I'm not sure how useful this would be, and this may be too much change for this series (so it may deserve a separate topic). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in

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

2015-10-11 Thread Matthieu Moy
old style do not mix well, prepend a "modernize style" patch to the series, and adopt the new style in the patch itself. * If you're too lazy to do a "modernize style", adopt the old style for consistency. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

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

2015-10-11 Thread Matthieu Moy
Karthik Nayak writes: > On Fri, Oct 9, 2015 at 12:10 AM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> --- a/ref-filter.c >>> +++ b/ref-filter.c >>> @@ -1118,8 +1118,10 @@ static void populate_value(struct ref_array_item >>&g

[PATCH 3/3] branch, tag: use porcelain output

2015-10-11 Thread Matthieu Moy
Signed-off-by: Matthieu Moy --- builtin/branch.c | 2 ++ builtin/tag.c| 2 ++ 2 files changed, 4 insertions(+) diff --git a/builtin/branch.c b/builtin/branch.c index 9d6c062..041c649 100644 --- a/builtin/branch.c +++ b/builtin/branch.c @@ -531,6 +531,8 @@ int cmd_branch(int argc, const char

[PATCH 2/3] ref-filter: allow porcelain to translate messages in the output

2015-10-11 Thread Matthieu Moy
fmt("[%s]", v->s); free(to_free); } so we don't have to worry about brackets anywhere else in the code. Signed-off-by: Matthieu Moy --- ref-filter.c | 28 ref-filter.h | 3 +++ 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/ref-fil

[PATCH 1/3] fixup: use xstrfmt instead of fixed-size buf + sprintf + xstrdup

2015-10-11 Thread Matthieu Moy
The char buf[40] is safe (at least while the strings are not translated), but I'd rather avoid magic numbers like this 40 in the code, and use a construct that does not have this size limitation. Especially if it makes the code shorter. Signed-off-by: Matthieu Moy --- ref-filter.c

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Matthieu Moy
series starts getting close to finished, so you should not try to add to much to it (at least for me: I spend some time reviewing v2 and I have an idea of what the interdiff should look like, I'd rather avoid having new distraction in the v2->v3 interdiff). -- Matthieu Moy http://www-verima

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

2015-10-11 Thread Matthieu Moy
will always get the same result regardless of the current locale. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

[PATCH] git-multimail: update to release 1.2.0

2015-10-11 Thread Matthieu Moy
The changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: Elijah Newren Contributions-by: Edward d'Auvergne Contributions-by: Vadim Zeitlin Contributions-by: Paul Sokolovsky Contributions-by: Michael Haggerty Contributions-by: Elijah Newren Contributio

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-11 Thread Matthieu Moy
Karthik Nayak writes: > On Sun, Oct 11, 2015 at 9:51 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> Also does it make sense to integrate these changes here? Or would you like >>> to >>> have another series on this? >> >> To

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-12 Thread Matthieu Moy
top of >> which everything in flight that is not yet in 'next' is rebased." > > Ah, but I might take a while to get there, So I'd rather push code which > is almost ready and work on that slowly, if that's ok? That's OK to me. The "most preferable wa

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-12 Thread Matthieu Moy
more instance of sub-optimal code, it isn't hard to review. Inserting new code before them would make the interdiff far bigger. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord..

Re: [PATCH v3 1/3] Add Travis CI support

2015-10-12 Thread Matthieu Moy
time. We'd miss issues with perl but no pthread or so, but this should catch most issues. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo

Re: [PATCH v3 1/3] Add Travis CI support

2015-10-12 Thread Matthieu Moy
rating-from-legacy/?utm_source=legacy-notice&utm_medium=banner&utm_campaign=legacy-upgrade No big deal, but getting rid of sudo would be cool, and documenting why it can't easily be done in commit message and/or comments would be nice otherwise. Thanks for working on that!

Re: How to rebase when some commit hashes are in some commit messages

2015-10-12 Thread Matthieu Moy
"Update test output for " > become > "Update test output for 777..." > > Is it possible currently? And if yes how? AFAIK, it's not possible other than by editing the message by hand. -- Matthieu Moy http://www-verimag.

Re: [PATCH v2 08/10] ref-filter: add support for %(upstream:track,nobracket)

2015-10-13 Thread Matthieu Moy
d have the detection done up where we > locat "upstream" / "push", what would be a nice way to go around this? You mean, below else if (starts_with(name, "upstream")) { within populate_value()? I think it would, yes. > What I could think of: > 1.

Re: [BUG] Broken links in Git Documentation/user-manual.txt

2015-10-14 Thread Matthieu Moy
ithub.com/git/git-scm.com/issues/605 -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [BUG] Broken links in Git Documentation/user-manual.txt

2015-10-14 Thread Matthieu Moy
John Keeping writes: > On Wed, Oct 14, 2015 at 09:37:05AM +0200, Matthieu Moy wrote: >> Xue Fuqiao writes: >> >> > Hi list, >> > >> > In https://git-scm.com/docs/user-manual.html , all links to the >> > glossary[1] are broken. >> >&g

Re: repository corruption when pushing commits to a repository running 'git gc --prune='

2015-10-14 Thread Matthieu Moy
*documented* behavior, and an easy way to corrupt a repo should be very explicitly documented as very dangerous, and the precautions to take when using it should be explained clearly. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubs

Re: Alternative to manual editing with git add --patch

2015-10-14 Thread Matthieu Moy
lines. That said, a "split hunk line by line" option for "git add -p" could be nice. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: repository corruption when pushing commits to a repository running 'git gc --prune='

2015-10-14 Thread Matthieu Moy
ood to me. I think the same should be added to git-prune.txt under --expire. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: repository corruption when pushing commits to a repository running 'git gc --prune='

2015-10-14 Thread Matthieu Moy
ition. This looks like a race between deleting objects/05/ and creating objects/05/cdb51bb0ea3e229734a4b1bddd5ec70fbc65ed. I don't understand how this is possible, since the temporary file and the final one are in the same directory, so deleting the directory should fail. What am I missing?

Re: repository corruption when pushing commits to a repository running 'git gc --prune='

2015-10-14 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> This looks like a race between deleting objects/05/ and creating >> objects/05/cdb51bb0ea3e229734a4b1bddd5ec70fbc65ed. >> >> I don't understand how this is possible, since the temporary file and >> th

Re: repository corruption when pushing commits to a repository running 'git gc --prune='

2015-10-14 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Looks good to me. I think the same should be added to git-prune.txt >> under --expire. > > I thought about it, but decided against it, as the command is not > even recommended to end users. Even non-"end users&q

Re: [PATCH] Falis on commit --amend when already pushed

2015-10-14 Thread Matthieu Moy
ses to amend an already-pushed commit, so you can't break the flow of people using this. It must 1) be configurable, and 2) unless you have a really good reason, backward-compatible by default. Also, it lacks tests. Actually, the idea you have is far, far more difficult than what you prob

Re: [PATCH] Falis on commit --amend when already pushed

2015-10-15 Thread Matthieu Moy
at what other tests are doing in t/ (there's a README file there too). Start with cd t/ ls t*push*.sh to get examples. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...

Re: [PATCH v3 1/3] Add Travis CI support

2015-10-15 Thread Matthieu Moy
he commit message, but I won't insist on that. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 1/3] Add Travis CI support

2015-10-15 Thread Matthieu Moy
in 20sec: > https://travis-ci.org/larsxschneider/git/jobs/85432398 Since the tests are essentially IO-bound and not CPU-bound, it may even make sense to use -j3 here. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscrib

Re: [PATCH 1/3] strbuf: make stripspace() part of strbuf

2015-10-15 Thread Matthieu Moy
move and rename the function, and 2) change the callsites to strbuf_stripspace. This way 2) would be absolutely trivial to review. OTOH, this patch is already easy to review, so you may consider it's OK like this. Reviewed-by: Matthieu Moy -- Matthieu Moy http://www-verimag.imag.fr/~moy/ --

Re: [PATCH 1/3] strbuf: make stripspace() part of strbuf

2015-10-15 Thread Matthieu Moy
ay forever, while the SmallProjectsIdeas entries are meant to be deleted when they are completed. (Same in other patches) -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.o

Re: [PATCH 2/3] stripspace: Implement --count-lines option

2015-10-15 Thread Matthieu Moy
+|5$ > +- In the examples above, I read the | as part of the input (unlike $ which is used only to show the end of line). So the | should not be here. I don't think you need the $ either, the --count-lines option is no longer about trailing whitespaces. > +static const char * cons

Re: [PATCH v3 1/3] Add Travis CI support

2015-10-15 Thread Matthieu Moy
Johannes Schindelin writes: > On Thu, 15 Oct 2015, Matthieu Moy wrote: > >> Since the tests are essentially IO-bound and not CPU-bound, it may even >> make sense to use -j3 here. > > I would like to caution against overloading Travis. They are really nice > to us,

Re: [PATCH 2/3] stripspace: Implement --count-lines option

2015-10-15 Thread Matthieu Moy
han performance. Cheers, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH 2/3] stripspace: Implement --count-lines option

2015-10-16 Thread Matthieu Moy
Tobias Klauser writes: > On 2015-10-15 at 18:52:54 +0200, Matthieu Moy > wrote: >> Tobias Klauser writes: >> > +static const char * const usage_msg[] = { >> >> Stick the * to usage_msg please. > > Just noticed while looking at how other sub-comman

Re: [PATCH v2 0/4] stripspace: Implement and use --count-lines option

2015-10-16 Thread Matthieu Moy
the whole series is now Reviewed-by: Matthieu Moy -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: git tag --contains now takes a long time

2015-10-17 Thread Matthieu Moy
y review and/or benchmark). Sorry we didn't, and thanks to Jerry for the report. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vg

Re: [PATCH v2 00/10] port branch.c to use ref-filter's printing options

2015-10-19 Thread Matthieu Moy
Junio C Hamano writes: > I personally would suggest whichever order you feel more comfortable > and less error-prone. This is a good summary, and I fully agree with it. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe

Re: [PATCH v2 3/4] stripspace: Implement --count-lines option

2015-10-19 Thread Matthieu Moy
hat introducing test-strbuf would be even better. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: Commit 5841520b makes it impossible to connect to github from behind my company's firewall.

2015-10-20 Thread Matthieu Moy
etopt(result, CURLOPT_PROXYAUTH, CURLAUTH_ANY); > 470 #endif > 471 } > > And it works: > > $ git --version > git version 2.6.1 > $ git pull > Already up-to-date. > > > > Greetings, > > Johan -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To

Re: [PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

2015-10-26 Thread Matthieu Moy
x27; > -' > +'"$(printf '\r')" While we're there, it may be better to have a single "printf ' \t\n\r'" to avoid the whitespace magic in the source code. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from thi

Re: [PATCH v2 2/2] sh-setup: explicitly mark CR as a field separator

2015-10-27 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Johannes Schindelin writes: >> >>> This is the correct thing to do, really: we already specify LF as >>> field separator. >> >> I'm almost convinced that this is the right thing to do i

Re: [PATCH v2] ls-files: Add eol diagnostics

2015-10-31 Thread Matthieu Moy
locale/XX.po I would spell the first "in" or "idx" (for "index"), not "ca" (for "cache"). I think we avoid talking about "the cache" these days even though the doc sometimes says "cached in the index" (i.e. use "cache" as

Re: [PATCH v2] ls-files: Add eol diagnostics

2015-11-01 Thread Matthieu Moy
to the repository, play with "git add", "dos2unix" and friends. 4) check that it's OK 5) "git commit" At stage 4), you really want to see the content of the index, because your HEAD is still broken. -- Matthieu Moy http://www-verimag.imag.fr/~m

Re: [PATCH v2] ls-files: Add eol diagnostics

2015-11-01 Thread Matthieu Moy
Junio C Hamano writes: > i/ and w/ have been used to denote the "i"ndex and "w"orktree > versions for the past 7 years with diff.mnemonicprefix option, > which you may want to match. Indeed. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe

Re: configure: -lpthread doesn't belong in CFLAGS

2015-11-02 Thread Matthieu Moy
in this case is to use a case: case "$opt" in -l*) # ... ;; *) # ... ;; esac -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: git log --author=me

2015-11-02 Thread Matthieu Moy
corate[=...] decorate options -L Process line range n,m in file, counting from 1 There are far more options than this... -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] In configure.ac, try -lpthread in $LIBS instead of $CFLAGS to make picky linkers happy

2015-11-06 Thread Matthieu Moy
t; is important, but redundant with the body of the message. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [PATCH] configure.ac: try -lpthread in $LIBS instead of $CFLAGS

2015-11-08 Thread Matthieu Moy
"Rainer M. Canavan" writes: > configure.ac | 8 +++- > 1 file changed, 7 insertions(+), 1 deletion(-) Looks all right to me. Thanks for you contribution and for your patience! -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the l

Re: Apple Xcode Asserts Control Over Git - License Violation?

2015-11-11 Thread Matthieu Moy
vileges, please re-run as > root via sudo. > > Is Apple in violation of git’s license by imposing this restriction? AFAICT, no, see explanations here: http://permalink.gmane.org/gmane.comp.version-control.git/254890 or search "apple git gpl license violation" in your favorit

Re: [PATCH] rebase-i-exec: Allow space in SHELL_PATH

2015-11-13 Thread Matthieu Moy
ot;$rest" > - ${SHELL:-@SHELL_PATH@} -c "$rest" # Actual execution > + "${SHELL:-@SHELL_PATH@}" -c "$rest" # Actual execution Looks good to me. Don't know why I didn't add these double quotes when I introduced this line. Tha

Re: --color-diff='.' considered useful

2015-11-16 Thread Matthieu Moy
Michael J Gruber writes: > git tip of the day: > > git diff --color-words='.' > git show --color-words='.' Probably my main usage of --color-words indeed (except I omit the single quotes ;-) ). I think this deserves an explicit mention in the doc. -- Matthie

[BUG] gitk --all and git bisect visualize crash in non-english locale

2015-11-18 Thread Matthieu Moy
: Giuseppe Bilotta Signed-off-by: Paul Mackerras I'm not fluent enough in Tcl to fix this myself, sorry ;-). Thanks, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html

Re: [BUG] --bare is ignored before command word

2015-11-18 Thread Matthieu Moy
ot; accept a --bare option, with a different meaning (read "man git" to find what the first does). So, I wouldn't call the current behavior a really good one, but it's the documented behavior. It would be nice to warn in this case though: I don't see any use for "git --b

Re: [BUG] gitk --all and git bisect visualize crash in non-english locale

2015-11-20 Thread Matthieu Moy
Indeed. I should obviously have started by updating my master branch, sorry for the noise. Thanks, Dennis Kaarsemaker writes: > Hi Matthieu, > > This has been reported quite a few times before. A fix is in master, > see 482456a^2 and children. > > On wo, 2015-11-18 at 19:31 +

Re: [BUG] --bare is ignored before command word

2015-11-20 Thread Matthieu Moy
Jeff King writes: > On Wed, Nov 18, 2015 at 10:29:20PM +0100, Matthieu Moy wrote: > >> But as you say, options before the command word apply to "git", not to >> the particular command. The case of --bare is a bit unfortunate: both >> "git" and "gi

Re: [PATCH] Documentation/diff: give --word-diff-regex=. example

2015-11-20 Thread Matthieu Moy
Michael J Gruber writes: > It's just so useful. Confirmed-by: Matthieu Moy Thanks, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More major

Re: [PATCH] wt-status: use strncmp() for length-limited string comparison

2015-11-25 Thread Matthieu Moy
a1, DEFAULT_ABBREV)); >> return 1; >> } > > Yeah, I think parsing left-to-right like this makes things much more > obvious. Agreed. >> +for (end = target; *end && *end != '\n'; end++) >> +; > > This loop (w

Re: [PATCH v2] wt-status: correct and simplify check for detached HEAD

2015-11-25 Thread Matthieu Moy
>buf, > find_unique_abbrev(nsha1, DEFAULT_ABBREV)); > - return 1; > } > - strbuf_add(&cb->buf, target, end - target); > return 1; > } Indeed, the code is much simpler like this than with the previous attempts. Loo

Re: [PATCH] Makefile: add missing phony target

2015-12-10 Thread Matthieu Moy
ing .PHONY for targets that are not meant to generate files, and depend on FORCE where the rule actually generate a file named after its target, but needs to be re-ran every time it's called. If you disagree with this, then you need to justify the change in the commit message. -- Matthieu Mo

Re: [PATCHv2] Makefile: add missing phony target

2015-12-11 Thread Matthieu Moy
Elia Pinto writes: > This is the second version of this patch. > Added the corrections suggested by Matthieu Moy ($gmane/282221) Sorry, but my main concern was that the patch could not be reviewed in good conditions as-is, and I think it still cannot be. It's very hard to spot w

Re: [PATCHv2] Makefile: add missing phony target

2015-12-11 Thread Matthieu Moy
Elia Pinto writes: > 2015-12-11 15:40 GMT+01:00 Matthieu Moy : >> Elia Pinto writes: >> >>> This is the second version of this patch. >>> Added the corrections suggested by Matthieu Moy ($gmane/282221) >> >> Sorry, but my main concern was th

Re: [PATCHv3] Makefile: add missing phony target

2015-12-16 Thread Matthieu Moy
Elia Pinto writes: > Add some missing phony target to Makefile. > > Signed-off-by: Elia Pinto > Helped-by: Matthieu Moy > --- > This is the third version of this patch. Thanks. I double-checked with grep .PHONY Makefile | sed 's/.PHONY: //; s/#.*//' | tr ' &

Re: 'Comma in -to/-cc entry' on valid addresses

2015-12-16 Thread Matthieu Moy
9ee555 (Check and document the options to prevent mistakes., 2006-06-21). The check was _removed_ in Git 2.6.0, which happily accepts your command. IOW, the bug is already fixed :-). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe

Re: [RFC] git-send-email: do not double-escape quotes from mutt

2016-01-04 Thread Matthieu Moy
ng to save an alias with "Dub O." "Q" > in the From: header, mutt shortens it to the expected \"Dub O. Q\" > without extra quotes. I wouldn't worry too much about corner-cases, but perhaps some people do use escaped quotes inside escaped quotes. I'd say

[PATCH] git-multimail: update to release 1.5.0

2019-01-07 Thread Matthieu Moy
Changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: William Stewart Contributions-by: Ville Skyttä Contributions-by: Dirk Olmes Contributions-by: Björn Kautler Contributions-by: Konstantin Ryabitsev Contributions-by: Gareth Pye Contributions-by: David Lazar

Students projects: looking for small and medium project ideas

2019-01-14 Thread Matthieu Moy
expect more than just microprojects). You may suggest ideas by editting the wiki page, or just by replying to this email (I'll point my students to the thread). Don't hesitate to remove entries (or ask me to do so) on the wiki page if you think they are not relevant anymore. Thanks in advance, -- Matthieu Moy https://matthieu-moy.fr/

Re: [PATCH] reflog: specify default pretty format in config

2019-01-30 Thread Matthieu Moy
format = CMIT_FMT_ONELINE; > - rev.use_terminator = 1; > + if (cfg_have_pretty != 0) { I'd write just "if (cfg_have_pretty)". > rev.always_show_header = 1; > + > cmd_log_init_finish(argc, argv, prefix, &rev, &opt); Avoid adding unrelated whitespace changes like this one. Regards, -- Matthieu Moy https://matthieu-moy.fr/

Re: [PATCH] [WIP/RFC] add git pull and git fetch --set-upstream

2019-04-04 Thread Matthieu Moy
x27; > + > + Style: you sometimes leave 2 blank lines, sometimes 1 between tests. Try to be consistent. > +test_expect_success 'pull --set-upstream upstream other sets branch other' ' Test title and content say the opposite of each other. > + git pull --set-upstream

Re: [PATCH] [WIP/RFC] add git pull and git fetch --set-upstream

2019-04-18 Thread Matthieu Moy
to say "It is OK for the variable to be missing, and > it also is OK for the variable to have an empty string as its value; > all other cases are unacceptable", Actually, I don't think the "present but empty" case makes sense here, so just test_must_fail git config "$1" should do the trick. I agree with all other remarks. -- Matthieu Moy https://matthieu-moy.fr/

Re: [PATCH] [WIP/RFC] add git pull and git fetch --set-upstream

2019-04-18 Thread Matthieu Moy
quot;You need to specify excatly one branch with the set-upstream option.")); ? -- Matthieu Moy https://matthieu-moy.fr/

Re: [PATCH] [WIP/RFC] add git pull and git fetch --set-upstream

2019-04-19 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> -u:: >> --set-upstream:: >> For every branch that is up to date or successfully pushed, add >> upstream (tracking) reference, used by argument-less >> linkgit:git-pull[1] and other command

Re: [PATCH] [WIP/RFC] add git pull and git fetch --set-upstream

2019-04-22 Thread Matthieu Moy
not depend on what has been executed previously. There are several places where you really need it. It probably makes sense to use it at the start of every tests for consistency and future-proof-ness. > +test_expect_success 'fetch --set-upstream http://nosuchdomain.example.com > fails with the bad url' ' > + test_must_fail git fetch --set-upstream http://nosuchdomain.example.com > && > + check_config master upstream refs/heads/other && > + check_config_empty other && > + check_config_empty other2 > +' It would probably make sense to check what happens when running git fetch --set-upstream i.e. use a URL instead of a named remote. -- Matthieu Moy https://matthieu-moy.fr/

Re: [RFC PATCH] Introduce "precious" file concept

2018-11-12 Thread Matthieu Moy
verwrite it. * If you don't know about precious files, just keep the default setting and the worse that can happen is to get your file overwritten with a bakup of the old version kept around. This would probably play better with a notion of "precious" files than with a notion of "trashable" files. -- Matthieu Moy https://matthieu-moy.fr/

Re: [PATCH] push: change needlessly ambiguous example in error

2018-11-13 Thread Matthieu Moy
is IMHO less common. It may confuse users. Or users may learn it and be happy thanks to your message. I don't know. -- Matthieu Moy https://matthieu-moy.fr/

Re: [PATCH] push: change needlessly ambiguous example in error

2018-11-13 Thread Matthieu Moy
push.default, but it does say so and it's the actual behavior. > already and widely known? https://stackoverflow.com/questions/14031970/git-push-current-branch-shortcut 458 votes for the answer suggesting it. -- Matthieu Moy https://matthieu-moy.fr/

Re: Do test-path_is_{file,dir,exists} make sense anymore with -x?

2019-02-26 Thread Matthieu Moy
t;works with dash" as a heuristic for "should word on any shell", but it doesn't always work). If -x doesn't work in some setups, it may be a good reason to wait a bit before trashing test_path_is_*, but if it's clear enough that the vast majority of platforms get -x, then why not trash these wrappers indeed. -- Matthieu Moy https://matthieu-moy.fr/

Re: Students projects: looking for small and medium project ideas

2019-02-26 Thread Matthieu Moy
ely un-interested way, but once you start getting the benefits of your own patches in the way _you_ use Git, it's really rewarding ! Cheers, -- Matthieu Moy https://matthieu-moy.fr/

<    4   5   6   7   8   9   10   11   12   13   >