[PATCH v9 5/5] bisect: allow any terms set by user

2015-06-25 Thread Matthieu Moy
From: Antoine Delaite Introduction of the git bisect terms command. The user can set his own terms. It will work exactly like before. The terms must be set before the start. Signed-off-by: Antoine Delaite Signed-off-by: Louis Stuber Signed-off-by: Matthieu Moy --- Documentation/git

[PATCH v9 1/5] bisect: correction of typo

2015-06-25 Thread Matthieu Moy
From: Antoine Delaite Signed-off-by: Antoine Delaite Signed-off-by: Matthieu Moy --- bisect.c| 2 +- t/t6030-bisect-porcelain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisect.c b/bisect.c index 03d5cd9..5b8357d 100644 --- a/bisect.c +++ b

[PATCH v9 4/5] bisect: add the terms old/new

2015-06-25 Thread Matthieu Moy
-off-by: Thomas Nguy Signed-off-by: Huynh Khoi Nguyen Nguyen Signed-off-by: Matthieu Moy --- Documentation/git-bisect.txt | 48 ++-- bisect.c | 11 +++--- git-bisect.sh| 43 +--

[PATCH v9 2/5] bisect: replace hardcoded "bad|good" by variables

2015-06-25 Thread Matthieu Moy
Jonas Signed-off-by: Lucien Kong Signed-off-by: Thomas Nguy Signed-off-by: Huynh Khoi Nguyen Nguyen Signed-off-by: Matthieu Moy --- bisect.c | 54 +- git-bisect.sh | 57 +++-- 2 files

[PATCH v9 3/5] bisect: simplify the addition of new bisect terms

2015-06-25 Thread Matthieu Moy
From: Antoine Delaite We create a file BISECT_TERMS in the repository .git to be read during a bisection. The fonctions to be changed if we add new terms are quite few. In git-bisect.sh : check_and_set_terms bisect_voc Co-authored-by: Louis Stuber Tweaked-by: Matthieu Moy

[PATCH v9 0/5] bisect terms

2015-06-25 Thread Matthieu Moy
This version takes into account Junio's remark on the previous series, and I did a much more thourough review of the whole, which led to a few fixes (one forgotten strcmp(..., "bad") in addition to the other noted by Junio), some style fixes, and some simplifications (the file TERMS_DEFINED of PATC

Re: [PATCH v8 3/5] bisect: simplify the addition of new bisect terms

2015-06-24 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> diff --git a/bisect.c b/bisect.c >> index 2d3dbdc..08be634 100644 >> --- a/bisect.c >> +++ b/bisect.c >> @@ -747,7 +747,10 @@ static void handle_bad_merge_base(void) >>

Re: [PATCH v8 5/5] bisect: allow any terms set by user

2015-06-24 Thread Matthieu Moy
}<"$GIT_DIR/BISECT_TERMS" >> +gettextln "Your current terms are $term1 and $term2." > > The same comment on this part. Instead of "git bisect terms" that > just says "You are using $term1 and $term2", the users woul

[PATCH v8 4/5] bisect: add the terms old/new

2015-06-24 Thread Matthieu Moy
-off-by: Thomas Nguy Signed-off-by: Huynh Khoi Nguyen Nguyen Signed-off-by: Matthieu Moy --- Documentation/git-bisect.txt | 48 ++-- bisect.c | 11 +++--- git-bisect.sh| 30 ++-

[PATCH v8 3/5] bisect: simplify the addition of new bisect terms

2015-06-24 Thread Matthieu Moy
From: Antoine Delaite We create a file BISECT_TERMS in the repository .git to be read during a bisection. The fonctions to be changed if we add new terms are quite few. In git-bisect.sh: check_and_set_terms bisect_voc Co-authored-by: Louis Stuber Tweaked-by: Matthieu Moy

[PATCH v8 5/5] bisect: allow any terms set by user

2015-06-24 Thread Matthieu Moy
From: Antoine Delaite Introduction of the git bisect terms function. The user can set its own terms. It will work exactly like before. The terms must be set before the start. Signed-off-by: Antoine Delaite Signed-off-by: Louis Stuber Signed-off-by: Matthieu Moy --- Documentation/git

[PATCH v8 1/5] bisect: correction of typo

2015-06-24 Thread Matthieu Moy
From: Antoine Delaite Signed-off-by: Antoine Delaite Signed-off-by: Matthieu Moy --- bisect.c| 2 +- t/t6030-bisect-porcelain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisect.c b/bisect.c index 03d5cd9..5b8357d 100644 --- a/bisect.c +++ b

[PATCH v8 2/5] bisect: replace hardcoded "bad|good" by variables

2015-06-24 Thread Matthieu Moy
Jonas Signed-off-by: Lucien Kong Signed-off-by: Thomas Nguy Signed-off-by: Huynh Khoi Nguyen Nguyen Signed-off-by: Matthieu Moy --- bisect.c | 51 ++- git-bisect.sh | 57 +++-- 2 files changed

[PATCH v8 0/5] Bisect terms

2015-06-24 Thread Matthieu Moy
This is a minor iteration over v7 to take into account Junio and Eric's comments, AND fix an important typo that I introduced in the strbuf code conversion (I used name_good instead of name_bad). This fixes the "git bisect visualize" bug I found earlier. I played a bit with the result and didn't fi

Re: [PATCH v6 09/10] send-email: allow multiple emails using --cc, --to and --bcc

2015-06-23 Thread Matthieu Moy
Remi Lespinet writes: > Helped-by: Remi Lespinet This is funny in a patch sent by the same Remi Lespinet ;-). Anyway, the whole series looks good to me now (I finally got all up to 10/10). Cheers, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send

Re: [PATCH v6 07/10] send-email: reduce dependencies impact on parse_address_line

2015-06-23 Thread Matthieu Moy
Your git send-email does not seem to like PATCHes 08-10/10 ;-). Up to PATCH 07, the series looks good. -- 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 majordo

Re: [PATCH v7 4/5] bisect: add the terms old/new

2015-06-23 Thread Matthieu Moy
Remi Galan Alfonso writes: > Matthieu Moy writes: >> Signed-off-by: Matthieu Moy >> Signed-off-by: Matthieu Moy > > Sounds like you went all out with this patch. Ah, the first line was in the original patch, and the second is added by send-email -s ... Both me and mys

Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit

2015-06-23 Thread Matthieu Moy
avoid the confusion" I mean "make it clear it's not a mis-indentation". Anyway, we're just bikeshedding here. Any version is fine with me. -- 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 v7 0/5] git bisect old/new

2015-06-23 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> I fixed a few minor issues in v6. Patch between my version and v6 is >> below. I also pushed my branch here: >> >> https://github.com/moy/git/tree/bisect-terms > > It is somewhat confusing to see v3 yesterd

Re: [PATCHv6 1/3] git-rebase -i: add command "drop" to remove a commit

2015-06-23 Thread Matthieu Moy
> I'll change it in my local version for now. Perhaps to avoid confusion, stg like: test_when_finished " ... && ... " && git checkout (the closing " alone on its 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 v7 3/5] bisect: simplify the addition of new bisect terms

2015-06-23 Thread Matthieu Moy
Eric Sunshine writes: > On Tue, Jun 23, 2015 at 8:54 AM, Matthieu Moy wrote: >> + strbuf_addstr(&bisect_refs_buf, "refs/bisect/"); >> + strbuf_addstr(&bisect_refs_buf, name_bad); > > A single strbuf_addf() rather than two strbuf

[PATCH v7 4/5] bisect: add the terms old/new

2015-06-23 Thread Matthieu Moy
-off-by: Thomas Nguy Signed-off-by: Huynh Khoi Nguyen Nguyen Signed-off-by: Matthieu Moy Signed-off-by: Matthieu Moy --- Documentation/git-bisect.txt | 48 ++-- bisect.c | 11 +++--- git-bisect.sh| 30

[PATCH v7 5/5] bisect: allows any terms set by user

2015-06-23 Thread Matthieu Moy
From: Antoine Delaite Introduction of the git bisect terms function. The user can set its own terms. It will work exactly like before. The terms must be set before the start. Signed-off-by: Antoine Delaite Signed-off-by: Louis Stuber Signed-off-by: Matthieu Moy --- Documentation/git

[PATCH v7 1/5] bisect: correction of typo

2015-06-23 Thread Matthieu Moy
From: Antoine Delaite Signed-off-by: Antoine Delaite Signed-off-by: Matthieu Moy --- bisect.c| 2 +- t/t6030-bisect-porcelain.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bisect.c b/bisect.c index 03d5cd9..5b8357d 100644 --- a/bisect.c +++ b

[PATCH v7 2/5] bisect: replace hardcoded "bad|good" by variables

2015-06-23 Thread Matthieu Moy
Jonas Signed-off-by: Lucien Kong Signed-off-by: Thomas Nguy Signed-off-by: Huynh Khoi Nguyen Nguyen Signed-off-by: Matthieu Moy Signed-off-by: Matthieu Moy --- bisect.c | 51 ++- git-bisect.sh | 57

[PATCH v7 3/5] bisect: simplify the addition of new bisect terms

2015-06-23 Thread Matthieu Moy
From: Antoine Delaite We create a file BISECT_TERMS in the repository .git to be read during a bisection. The fonctions to be changed if we add new terms are quite few. In git-bisect.sh : check_and_set_terms bisect_voc Co-authored-by: Louis Stuber Tweaked-by: Matthieu Moy

[PATCH v7 0/5] git bisect old/new

2015-06-23 Thread Matthieu Moy
Hi, I fixed a few minor issues in v6. Patch between my version and v6 is below. I also pushed my branch here: https://github.com/moy/git/tree/bisect-terms Not visible in the patch below: I squashed PATCH 5 into PATCH 3 to avoid the pattern "break stuff and then repair it". The first two patch

Re: [PATCH v4 04/19] for-each-ref: add '--points-at' option

2015-06-22 Thread Matthieu Moy
es makes sense to me. >> >> Thanks. > > That would mean squashing 3&4, 6&7 and 10&11 also on similar lines. I have a slight preference for keeping the pairs not squashed. This way, we have a clear separation "write reusable library code" / "use it". B

Re: [PATCH v2 2/7] bisect: replace hardcoded "bad|good" by variables

2015-06-22 Thread Matthieu Moy
Antoine Delaite writes: > Matthieu Moy wrote: > >>Being an acceptable ref name is a constraint you have to check (Junio >>already mentionned check-ref-format). I think quoting variables makes >>sense too > > I don't get how 'git check-ref-format'

Re: [PATCH v4 05/19] ref-filter: add parse_opt_merge_filter()

2015-06-22 Thread Matthieu Moy
in "advice" rather than "instruction". I still think we should prioritize the tag.c side, but if this patch is ready, it makes sense to keep it in the series. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [PATCH v5 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-21 Thread Matthieu Moy
> Subject: Re: [PATCH v5 07/10] send-email: reduce dependancies impact on > parse_address_line s/dependancies/dependencies/ -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [PATCH v5 09/10] send-email: allow multiple emails using --cc, --to and --bcc

2015-06-21 Thread Matthieu Moy
Remi Lespinet writes: > Helped-by: Remi Lespinet ??? At this point, it's realonable to consider that you're the main author of the patch, but you could add a Original-patch-by: to credit the initial author. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe f

Re: [PATCH v5 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-21 Thread Matthieu Moy
;Mail::Address') } This will fail if Mail::Address is not available. It would be better to declare Mail::Address as a prerequisite in t9000-address.sh (like what you're already doing for Test::More). Good job, modulo these minor details, the series looks good to me. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in

Re: [PATCH/RFC v4 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-19 Thread Matthieu Moy
Remi Lespinet writes: > Matthieu Moy writes: > >> Cool. Then almost all the work is done to get an automated test. Next >> step would be to add the tests itself in the code. I would do that by >> adding a hidden --selfcheck option to git send-email that would compare

Re: [PATCH/RFC v4 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-18 Thread Matthieu Moy
would be trivial. I can do that on top of your series if you don't have time. -- 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/RFC v4 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-18 Thread Matthieu Moy
archives can help someone else to do it. -- 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.1.0

2015-06-18 Thread Matthieu Moy
The changes are described in CHANGES. Contributions-by: Matthieu Moy Contributions-by: Richard Hansen Contributions-by: Michael Haggerty Contributions-by: Elijah Newren Contributions-by: Luke Mewburn Contributions-by: Dave Boutcher Contributions-by: Azat Khuzhin Contributions-by: Sebastian

Re: [PATCH v2] git-checkout.txt: Document "git checkout " better

2015-06-18 Thread Matthieu Moy
bad. > "restore working tree files" Not a native, but to me "restore file" sounds like "the file is damaged, it needs to be restored/repaired". In any case, Switch branches or restore working tree files is an improvement over the existing to me, so my bikeshed

Re: [PATCH v2] git-checkout.txt: Document "git checkout " better

2015-06-17 Thread Matthieu Moy
state into the worktree" (my favorite up to now I think). But as you say, it copies into the workspace, so "copy a previous version into the workspace" sounds good to me. Basically, I'm fine with anything starting with "Switch branches or", but please do chan

Re: [PATCH/RFC v4 05/10] send-email: Allow use of aliases in the From field of --compose mode

2015-06-17 Thread Matthieu Moy
is is inconsistent with other fields > (To, Cc, ...) which already support aliases. -- 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/RFC v4 07/10] send-email: reduce dependancies impact on parse_address_line

2015-06-17 Thread Matthieu Moy
er); > + } elsif ($token eq "@") { > + push @address, (splice @buffer), "@"; > + } elsif ($token eq ".") { > + push @address, (splice @buffer), "."; > + } else { # We don't kn

Re: [PATCH/RFC v4 10/10] send-email: suppress meaningless whitespaces in from field

2015-06-17 Thread Matthieu Moy
Remi Lespinet writes: > if (defined $sender) { > + $sender =~ s/^\s+|\s$//g; I would say \s+ also for the second \s. Not really different, but it feels wrong to iterate the substitution as many times as there are trailing spaces to remove. -- Matthieu Moy http://www-verimag.imag.f

Re: [PATCH v2] git-checkout.txt: Document "git checkout " better

2015-06-17 Thread Matthieu Moy
"Andres G. Aragoneses" writes: > On 17/06/15 13:54, Matthieu Moy wrote: >> "Andres G. Aragoneses" writes: >> >>> On 17/06/15 12:54, Matthieu Moy wrote: >>>> Duy Nguyen writes: >>>> >>>>> On Wed, Jun 17, 201

Re: [PATCH v2] git-checkout.txt: Document "git checkout " better

2015-06-17 Thread Matthieu Moy
"Andres G. Aragoneses" writes: > On 17/06/15 12:54, Matthieu Moy wrote: >> Duy Nguyen writes: >> >>> On Wed, Jun 17, 2015 at 2:54 PM, Torsten Bögershausen wrote: >>>> -git-checkout - Checkout a branch or paths to the working tree >>&

Re: [PATCH v2] git-checkout.txt: Document "git checkout " better

2015-06-17 Thread Matthieu Moy
ff between a commit and its parent", so it makes sense to "revert a change" (git revert), but not "restore a change". -- 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 11/11] for-each-ref: add '--contains' option

2015-06-17 Thread Matthieu Moy
Karthik Nayak writes: > Add the '--contains' option provided by 'ref-filter'. The '--contains' > option lists only refs which are contain the mentioned commit (HEAD if s/are // -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this

Re: [PATCH v3 06/11] ref-filter: implement '--merged' and '--no-merged' options

2015-06-17 Thread Matthieu Moy
ong the lines of /* * A merge filter implies that we're looking at refs pointing to * commits => discard non-commits early. The actual filtering is done * later. */ (perhaps something more concise) -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: s

Re: [PATCH v3 05/11] ref-filter: add parse_opt_merge_filter()

2015-06-17 Thread Matthieu Moy
karthik nayak writes: > On Tue, Jun 16, 2015 at 9:48 PM, Matthieu Moy > wrote: >> Karthik Nayak writes: >> >>> This is copied from 'builtin/branch.c' which will eventually be removed >>> when we port 'branch.c' to use ref-filter AP

Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-17 Thread Matthieu Moy
Antoine Delaite writes: > Matthieu Moy writes: > >>> >>>># terms_defined is 0 when the user did not define the terms explicitely >>>># yet. This is the case when running 'git bisect start bad_rev good_rev' >>>># before

Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-17 Thread Matthieu Moy
Antoine Delaite writes: > Matthieu Moy writes: > >># terms_defined is 0 when the user did not define the terms explicitely >># yet. This is the case when running 'git bisect start bad_rev good_rev' >># before we see an explicit reference to a term. >>

Re: [PATCH v3 05/11] ref-filter: add parse_opt_merge_filter()

2015-06-16 Thread Matthieu Moy
(actually, I see that you have more commits than you sent in your branch, so I guess it will come soon on the list) :-). -- 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...@vge

Re: [PATCH v3 04/11] for-each-ref: add '--points-at' option

2015-06-16 Thread Matthieu Moy
gt; + Only list refs of the given object. I would find "Only list refs pointing to the given object" clearer. -- 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 01/11] t6301: for-each-ref tests for ref-filter APIs

2015-06-16 Thread Matthieu Moy
oes not only list refs pointing directly at a commit, but also refs pointing at a tag pointing at the given commit). Such signed tag could be added here and used later in PATCH 04. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe

[PATCH] Documentation/describe: improve one-line summary

2015-06-16 Thread Matthieu Moy
git describe does not show 'the most recent tag that is reachable from a commit', but a descriptive name based on this tag. Fix the description to reflect that. Suggested-by: Albert Netymk Signed-off-by: Matthieu Moy --- > According to the man of git-describe, http://git-scm

Re: [RFC] send-email quote issues

2015-06-15 Thread Matthieu Moy
xpect anything that works in the To: header to work in the --to option of git send-email. If I read correctly, this is address-list in RFC 2822. Now, when the address list is invalid wrt the RFC, we can either reject it or try to guess. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubsc

Re: [RFC] send-email quote issues

2015-06-15 Thread Matthieu Moy
This introduce a change in the > behaviour: I would say that using parse_address_line is good for consistancy in Git anyway. If the behavior of parse_address_line is broken on some corner-cases, then it should be fixed anyway. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe

Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-15 Thread Matthieu Moy
t reset keep > the terms of the previous bisection" > or we could decided that this is the default behaviour of bisect. > > -two config variables to choose default terms I'd say: keep it simple, try to close this series ASAP. It'll still be time to send another seri

Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-15 Thread Matthieu Moy
Antoine Delaite writes: > Matthieu Moy writes: > >>> +if test -s "$GIT_DIR/TERMS_DEFINED" >>> +then >>> +terms_defined=1 >>> +get_terms >>> +rm -rf "$GIT_DIR/TERMS

Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-15 Thread Matthieu Moy
Antoine Delaite writes: > Louis Stuber writes: > >>Matthieu Moy writes: >> >>> Modifying in PATCH 7 some code that you introduced in PATCH 3 is >>> suspicious. Is there any reason you did not name the variable >>> "terms_defined" i

Re: [PATCH/RFCv5 3/3] git rebase -i: add static check for commands and SHA-1

2015-06-15 Thread Matthieu Moy
Remi Galan Alfonso writes: > Matthieu Moy writes: >> Remi Galan Alfonso writes: >> >> > It is mainly because here the SHA-1 is a long one (40 chars) >> >> OK, but then the minimum would be to add a comment saying that. >> >> Now, this makes

[ANNOUNCE] git-multimail 1.1.0-rc1

2015-06-14 Thread Matthieu Moy
this is done, there are other pull requests on top of this to support Atlassian Stash and Gerrit. * At some point, we'll need to start supporting Python 3.x, but I'd rather focus on features for now. Please, test, report bugs, send patches ... and have fun! -- Matthieu Moy http:

Re: [PATCH v2 01/11] t6301: for-each-ref tests for ref-filter APIs

2015-06-14 Thread Matthieu Moy
;& > + test_cmp expect actual > +' Isn't this test redundant with the content of t6300-for-each-ref.sh? At this point, you've done only internal refactoring, so you shouldn't need new tests (except to fix coverage holes in existing tests). I guess you're adding

Re: [PATCH v8 0/11] Create ref-filter from for-each-ref

2015-06-14 Thread Matthieu Moy
ter, unsigned int type); /* Clear all memory allocated to ref_array */ void ref_array_clear(struct ref_array *array); /* Parse format string and sort specifiers */ -- 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_config_set(?) adding and removing creates extraneous lines

2015-06-11 Thread Matthieu Moy
oC last year, but the project evolved in another direction. > Is this something that we want to fix? Patches welcome ;-). -- 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.kern

Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation

2015-06-11 Thread Matthieu Moy
#x27;filter_refs()'. > "Makes sense." Not sure if you're agreeing with me or you want me to > re-roll. I'm agreeing with you. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the bod

Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation

2015-06-11 Thread Matthieu Moy
Karthik Nayak writes: > On 06/11/2015 11:11 PM, Matthieu Moy wrote: >> Karthik Nayak writes: >> >> > +struct ref_filter_cbdata { >> > +struct ref_array array; >> > +struct ref_filter filter; >> > +}; >> >> I didn't not

Re: [PATCH v7 05/12] for-each-ref: introduce new structures for better organisation

2015-06-11 Thread Matthieu Moy
tes: > --- a/ref-filter.h > +++ b/ref-filter.h > @@ -42,12 +45,17 @@ struct ref_filter { > }; > > struct ref_filter_cbdata { > - struct ref_array array; > - struct ref_filter filter; > + struct ref_array *array; > + struct ref_filter *filter; >

Re: [PATCH v7 0/12] Create ref-filter from for-each-ref

2015-06-11 Thread Matthieu Moy
: clean up code' into two commits. > *Other small changes. My previous comments are all taken into account. The whole series looks good to me now. Thanks, -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the

Re: [PATCH v7 11/12] for-each-ref: introduce filter_refs()

2015-06-11 Thread Matthieu Moy
ndler, &ref_cbdata); > + else if (type & FILTER_REFS_ALL) > + return for_each_ref(ref_filter_handler, &ref_cbdata); > + else > + die("filter_refs: invalid type"); > + return 0; > +} I thought you would make a helper function that wo

Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-11 Thread Matthieu Moy
ED" Space after >. > @@ -574,7 +600,7 @@ case "$#" in > git bisect -h ;; > start) > bisect_start "$@" ;; > - bad|good|new|old) > + bad|good|new|old|$NAME_BAD|$NAME_GOOD) See my other message about quoting. -- 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 2/7] bisect: replace hardcoded "bad|good" by variables

2015-06-11 Thread Matthieu Moy
s sense too. > @@ -421,7 +426,7 @@ bisect_replay () { > start) > cmd="bisect_start $rev" > eval "$cmd" ;; > - good|bad|skip) > + $NAME_GOOD|$NAME_BAD|skip) $NAME_GOOD and $NAM

Re: [PATCH v2 7/7] bisect: allows any terms set by user

2015-06-11 Thread Matthieu Moy
ld state (you are calling it > '$NAME_OLD') and the new state ('$NAME_NEW')" would be a good idea. I'd put a very verbose message explaining the situation and the way out (use 'git bisect') for the second "die", and I would consider "git bisect terms" without arguments as a valid command to ask "please tell me what the terms are". -- 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 7/7] bisect: allows any terms set by user

2015-06-11 Thread Matthieu Moy
y This is relatively uncontroversial, and should be easy to finish. I would consider it a good thing anyway. > - add 'bisect terms' support. I'd put this on the low-priority whishlist. If the codebase is ready and a preliminary patch exists, it will be relatively easy for someo

Re: [PATCH 3/4] bisect: simplify the add of new bisect terms

2015-06-10 Thread Matthieu Moy
sed -n 2p "$GIT_DIR/BISECT_TERMS")" >> >>It is sad that we need to open the file twice. Can't we do >>something using "read" perhaps? > > The cost of it is quite low and we see directly what we meant. We didn't > found a pretty way t

Re: [PATCH v3 7/7] send-email: suppress leading and trailing whitespaces before alias expansion

2015-06-10 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Junio C Hamano writes: >> >>> Hmph, if I have "A, B, C" and call a function that gives an array of >>> addresses, treating the input as comma-separated addresses, I would >>> expect ("

Re: [PATCH/RFCv5 3/3] git rebase -i: add static check for commands and SHA-1

2015-06-10 Thread Matthieu Moy
odo`, I do get the short sha1. So, there's a piece of code doing what you want somewhere already. You may want to use it. -- 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...@vg

Re: [PATCH/RFCv5 2/3] git rebase -i: warn about removed commits

2015-06-10 Thread Matthieu Moy
Remi Galan Alfonso writes: > Matthieu Moy writes: >> > +warn_file "$todo".miss >> >> I would find it more elegant with less intermediate files, like >> >> git rev-list $opt <"$todo".miss | while read -r line &

Re: [PATCH v3 7/7] send-email: suppress leading and trailing whitespaces before alias expansion

2015-06-10 Thread Matthieu Moy
ally doing this. But if you have " A,B,C ", then you'll get " A", "B", "C ". But once you're trimming around commas, trimming leading and trailing spaces fits well with split itself. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- T

Re: [PATCH 3/4] bisect: simplify the add of new bisect terms

2015-06-10 Thread Matthieu Moy
filename, "r"); + + if (!fp) { + name_bad = "bad"; + name_good = "good"; -- 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 3/4] bisect: simplify the add of new bisect terms

2015-06-10 Thread Matthieu Moy
Junio C Hamano writes: > Matthieu Moy writes: > >> Louis-Alexandre Stuber writes: >> >>>> That is very different from ENOENT, which is an expected error when >>>> you are not using a customized terms. >>> >>> But in the curren

Re: [PATCH/RFCv5 3/3] git rebase -i: add static check for commands and SHA-1

2015-06-10 Thread Matthieu Moy
'%s' "$line" | read -r cmd sha1 rest case $sha1 in ... or maybe it's overkill. > + check_bad_cmd_and_sha <"$todo" > + > + if test -s "$todo".badsha > + then > + raiseError=t We usually don't use camelCase in shell-scripts. raise_error would be the usual way to spell in in Git's codebase. -- 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/RFCv5 2/3] git rebase -i: warn about removed commits

2015-06-10 Thread Matthieu Moy
rev-list $opt <"$todo".miss >"$todo".miss+ > + mv "$todo".miss+ "$todo".miss > + > + warn "Warning: some commits may have been dropped" \ > + "accidentally." > +

Re: [PATCH v3 7/7] send-email: suppress leading and trailing whitespaces before alias expansion

2015-06-10 Thread Matthieu Moy
finally understood that this was needed because alias expansion comes before sanitize_address, but the commit message should have told me that. Actually, once you have this, PATCH 6/7 becomes useless, right? (at least, the test passes if I revert it) It seems to me that doing this space trimming

Re: [PATCH v3 6/7] send-email: suppress leading and trailing whitespaces in addresses

2015-06-10 Thread Matthieu Moy
trailing whitespaces when sanitizing addresses so > that git send-email give the same output when passing arguments like > " j...@example.com " or "\t j...@example.com " as with > "j...@example.com". > > The next commit will introduce a test for this as

Re: [PATCH 0/7] changes from last version

2015-06-10 Thread Matthieu Moy
> Subject: Re: [PATCH 0/7] changes from last version This is not a good subject. You want the subject to say what the series is about. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a mess

Re: [PATCH 4/4] bisect: add the terms old/new

2015-06-10 Thread Matthieu Moy
. Git would not be where it is if Junio was merging patches based on "it works, we'll see if the code is good enough later" kinds of judgments ;-). Moving from "one hardcoded pair of terms" to "two hardcoded pairs of terms" is a nice feature, but hardly a step in t

Re: [PATCH 3/4] bisect: simplify the add of new bisect terms

2015-06-10 Thread Matthieu Moy
dable file is equivalent to no file at all. If something's wrong, as a user, I expect a helpful message telling me what's wrong, to give me a clue on how to solve it. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe gi

Re: [PATCH 2/4] bisect: replace hardcoded "bad|good" by variables

2015-06-10 Thread Matthieu Moy
sect_terms file is not called after > 'git bisect start bad_rev good_rev'. Then the variable name is not good. If the variable is there to mean "we did not define the terms yet", then bisect_terms_defined={0,1} would be much better (probably not the best possible name, tho

Re: [RFC/PATCH 3/9] for-each-ref: add '--points-at' option

2015-06-10 Thread Matthieu Moy
ent: $ cat config.mak CFLAGS += -Wdeclaration-after-statement -Wall -Werror and gcc will prevent you from doing this mistake again. -- 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.

Re: [PATCH 2/4] status: differentiate interactive from non-interactive rebases

2015-06-09 Thread Matthieu Moy
ches ([PATCH v3 2/4] in the subject, git send-email -v3 does this for you). -- 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://vge

Re: [PATCH 1/4] status: factor two rebase-related messages together

2015-06-09 Thread Matthieu Moy
b/wt-status.c > @@ -1025,6 +1025,19 @@ static int split_commit_in_progress(struct wt_status > *s) > free(rebase_orig_head); > return split_in_progress; > } > +static void print_rebase_state(struct wt_status *s, Please, skip a line between functions. -- Matthi

Re: On undoing a forced push

2015-06-09 Thread Matthieu Moy
ref itself. Typically, if a coworker pushed some code that I did not pull, and I force-push to the same branch, my reflog won't have the sha1 of my coworker's code. > This patch prints the latest SHA-1 before the forced push in full. Sounds like a good idea to me. -- Matthieu Moy

Re: gitscm vs. git-scm

2015-06-09 Thread Matthieu Moy
itscm.com should just redirect to git-scm.com (sending the Location: field, and/or with stg like http://git-scm.com"; /> ) Frames are so 2000 ;-). -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a

Re: [PATCH 2/4] bisect: replace hardcoded "bad|good" by variables

2015-06-09 Thread Matthieu Moy
and is the default we should keep that in > the names. I agree with this part though. If people working with the bisect codebase (which includes you) are more comfortable with good/bad, that's a valid reason to keep it. IOW, I still think old/new is more generic, but that is not a strong object

Re: [PATCH 3/4] bisect: simplify the add of new bisect terms

2015-06-09 Thread Matthieu Moy
est -s "$GIT_DIR/BISECT_TERMS" -a "$cmd" != "$NAME_BAD" -a > "$cmd" != "$NAME_GOOD" > + then > + die "$(eval_gettext "Invalid command : you're currently > in a \$NAME_BAD/\$NAME_GOOD bis

Re: [PATCH 2/4] bisect: replace hardcoded "bad|good" by variables

2015-06-08 Thread Matthieu Moy
quot;$NAME_BAD") > + die "$(gettext "'git bisect $NAME_BAD' can take only one > argument.")" ;; As Junio mentionned, you'll need an eval_gettext here. -- 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: [WIP/PATCH v5 05/10] for-each-ref: introduce 'ref_array_clear()'

2015-06-08 Thread Matthieu Moy
Karthik Nayak writes: > On 06/08/2015 10:51 PM, Matthieu Moy wrote: >> We could introduce ref-filter.h earlier, indeed. To me, the current >> solution is good enough, but introducing ref-filter.h early and adding >> function definition there in the same commit as

Re: [RFC/PATCH 2/9] ref-filter: implement '--points-at' option

2015-06-08 Thread Matthieu Moy
Karthik Nayak writes: > In 'tag -l' we have '--points-at' option which lets users > list only tags which point to a particular commit, Implement s/,/./ ? > this option in 'ref-filter.{c,h}' so that the other commands s/the// -- Matthieu Moy http://www-

Re: [RFC/PATCH 4/9] parse-options: add parse_opt_merge_filter()

2015-06-08 Thread Matthieu Moy
> + ? REF_FILTER_MERGED_OMIT > + : REF_FILTER_MERGED_INCLUDE; I would use starts_with("no-", opt->long_name) instead. I had a hard time understanding why the letter 'n' was special while the starts_with() version is self-explanatory. -- Matthieu Moy http://www-

Re: [RFC/PATCH 6/9] for-each-ref: add '--merged' and '--no-merged' options

2015-06-08 Thread Matthieu Moy
>parse_opt_points_at), > + OPT_MERGED(&ref_cbdata.filter, N_("print only merged refs")), > + OPT_NO_MERGED(&ref_cbdata.filter, N_("print only not merged > refs")), I'd spell that "only refs that are not merge

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