Re: [PATCH 7/7] cat-file: add --batch-all-objects option

2015-06-26 Thread Eric Sunshine
On Mon, Jun 22, 2015 at 6:45 AM, Jeff King p...@peff.net wrote: [...] This patch adds an option to cat-file --batch-check to operate on all available objects (rather than reading names from stdin). Signed-off-by: Jeff King p...@peff.net --- diff --git a/t/t1006-cat-file.sh

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

2015-06-26 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: Matthieu Moy matthieu@imag.fr writes: + +git bisect terms term-new term-old + The mnemonic for git bisect start bad good is Bad comes before Good (B

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

2015-06-26 Thread Matthieu Moy
Christian Couder christian.cou...@gmail.com writes: So perhaps you could use a function like: write_bisect_terms() { if test ! -s $GIT_DIR/BISECT_TERMS then echo $NAME_BAD $GIT_DIR/BISECT_TERMS echo $NAME_GOOD $GIT_DIR/BISECT_TERMS fi } I

Re: [PATCH/WIP v3 06/31] am: detect mbox patches

2015-06-26 Thread Paul Tan
On Thu, Jun 25, 2015 at 9:40 PM, Paul Tan pyoka...@gmail.com wrote: On Wed, Jun 24, 2015 at 11:10 PM, Johannes Schindelin johannes.schinde...@gmx.de wrote: + else if (l1.len l2.len l3.len is_email(paths-items-string)) + ret = PATCH_FORMAT_MBOX; Maybe we can do better than

Re: git error in tag ...: unterminated header

2015-06-26 Thread Johannes Schindelin
Hi Junio, On 2015-06-26 00:29, Junio C Hamano wrote: Junio C Hamano gits...@pobox.com writes: Johannes Schindelin johannes.schinde...@gmx.de writes: ... If the buffer does *not* contain an empty line, the fsck code runs the danger of looking beyond the allocated memory because it uses

Re: [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo

2015-06-26 Thread Paul Tan
On Thu, Jun 25, 2015 at 12:36 AM, Johannes Schindelin johannes.schinde...@gmx.de wrote: On 2015-06-18 13:25, Paul Tan wrote: diff --git a/builtin/am.c b/builtin/am.c index 7b97ea8..d6434e4 100644 --- a/builtin/am.c +++ b/builtin/am.c @@ -94,6 +126,105 @@ static int read_state_file(struct

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

2015-06-26 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: The second sentence may want to be something like If you mistyped one of the terms, you can do another git bisect terms term-new term-old to correct them, but that is possible only before you start the bisection. Applied, thanks. I

Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-06-26 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Sun, Apr 26, 2015 at 08:30:12PM +, brian m. carlson wrote: Improve the check by looking for plink or tortoiseplink (or those names suffixed with .exe) only in the final component of the path. This has the downside that a program such as plink-0.63 would

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Matthieu Moy
Michael Haggerty mhag...@alum.mit.edu writes: I didn't like this example so much because (1) the code snippet is pretty trivial, and (2) the explanation afterwards is more of a general explanation of `git bisect` than a description of this particular example. I agree that the explanations

[PATCH v10 7/7] bisect: allow any terms set by user

2015-06-26 Thread Matthieu Moy
From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr 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 antoine.dela...@ensimag.grenoble-inp.fr

[PATCH v10 6/7] bisect: add the terms old/new

2015-06-26 Thread Matthieu Moy
From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr When not looking for a regression during a bisect but for a fix or a change in another given property, it can be confusing to use 'good' and 'bad'. This patch introduce `git bisect new` and `git bisect old` as an alternative to 'bad'

[PATCH v10 1/7] bisect: correction of typo

2015-06-26 Thread Matthieu Moy
From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr Signed-off-by: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr Signed-off-by: Matthieu Moy matthieu@imag.fr --- bisect.c| 2 +- t/t6030-bisect-porcelain.sh | 2 +- 2 files changed, 2 insertions(+), 2

[PATCH v10 3/7] Documentation/bisect: revise overall content

2015-06-26 Thread Matthieu Moy
From: Michael Haggerty mhag...@alum.mit.edu Thoroughly revise the git bisect manpage, including: * Beef up the Description section. * Make the first long example less specific to kernel development. * De-emphasize implementation details in a couple of places. * Add (roughly N steps) in the

[PATCH v10 4/7] bisect: replace hardcoded bad|good by variables

2015-06-26 Thread Matthieu Moy
From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr To add new tags like old/new and have keywords less confusing, the first step is to avoid hardcoding the keywords. The default mode is still bad/good. Signed-off-by: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr

[PATCH v10 5/7] bisect: simplify the addition of new bisect terms

2015-06-26 Thread Matthieu Moy
From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr 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

Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-06-26 Thread Jeff King
On Fri, Jun 26, 2015 at 09:16:20AM -0700, Junio C Hamano wrote: FYI, this ended up biting me today. We have some integration tests that make sure we can clone over putty, and we wrap plink in a plink-wrapper.sh script that tweaks a few extra options. That used to match under the old

Re: git error in tag ...: unterminated header

2015-06-26 Thread Jeff King
On Fri, Jun 26, 2015 at 10:06:20AM +0200, Johannes Schindelin wrote: I understood what you were saying, but it still appears too fragile to me to mix functions that assume NUL-terminated strings with an ad-hoc counted string check. Yeah, I agree. It is not that you cannot make it safe, but

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Matthieu Moy
Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 4:58 PM, Michael Haggerty mhag...@alum.mit.edu wrote: The reference `refs/bisect/bad` will be left pointing at that commit. Yeah ok. I took this one. -- Matthieu Moy http://www-verimag.imag.fr/~moy/ -- To

[PATCH v10 2/7] Documentation/bisect: move getting help section to the end

2015-06-26 Thread Matthieu Moy
Signed-off-by: Matthieu Moy matthieu@imag.fr --- Documentation/git-bisect.txt | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 4cb52a7..2bdc3b8 100644 --- a/Documentation/git-bisect.txt +++

[PATCH v10 0/7] bisect terms

2015-06-26 Thread Matthieu Moy
This version include Michael Haggerty's improvement to the doc. The general ones are at the beginning of the series, and the terms-specific ones are squashed into the appropriate commits. I added more tests to git bisect terms, and there are a few code improvement. Antoine Delaite (5): bisect:

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Christian Couder
On Fri, Jun 26, 2015 at 4:58 PM, Michael Haggerty mhag...@alum.mit.edu wrote: On 06/26/2015 03:15 PM, Christian Couder wrote: On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 1:30 PM,

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Michael Haggerty
On 06/26/2015 03:15 PM, Christian Couder wrote: On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty mhag...@alum.mit.edu wrote: [...] +Eventually there

Re: [PATCH] setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR

2015-06-26 Thread Duy Nguyen
On Fri, Jun 26, 2015 at 6:56 PM, Jeff King p...@peff.net wrote: On Fri, Jun 26, 2015 at 05:37:35PM +0700, Nguyễn Thái Ngọc Duy wrote: This is where the fun is. The legacy behavior is, if $GIT_WORK_TREE is not set but $GIT_DIR is, cwd is chosen as worktree's top. If you happen to stand at

Re: [PATCH] setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR

2015-06-26 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: Bottom line is, when $GIT_DIR is set, $GIT_WORK_TREE should be set too unless there's no work tree. But setting $GIT_WORK_TREE inside set_git_dir() may backfire. We don't know at that point if work tree is already configured by the caller. So

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

2015-06-26 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: This is currently how it's implemented. You need to say $ git bisect terms foo bar $ git bisect start Ahh, it means everything including the description (i.e. you start bisection) is consistent and perfectly fine. I misread the patch, it

[PATCH] http: always use any proxy auth method available

2015-06-26 Thread Enrique Tobis
By default, libcurl honors some environment variables that specify a proxy (e.g. http_proxy, https_proxy). Also by default, libcurl will only try to authenticate with a proxy using the Basic method. This change makes libcurl always try the most secure proxy authentication method available. As a

Re: git error in tag ...: unterminated header

2015-06-26 Thread Junio C Hamano
Jeff King p...@peff.net writes: On Fri, Jun 26, 2015 at 10:06:20AM +0200, Johannes Schindelin wrote: I understood what you were saying, but it still appears too fragile to me to mix functions that assume NUL-terminated strings with an ad-hoc counted string check. Yeah, I agree. It is not

Re: [PATCH v10 7/7] bisect: allow any terms set by user

2015-06-26 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: diff --git a/Documentation/git-bisect.txt b/Documentation/git-bisect.txt index 24171a5..b1ef41c 100644 --- a/Documentation/git-bisect.txt +++ b/Documentation/git-bisect.txt @@ -19,6 +19,7 @@ on the subcommand: git bisect start [--no-checkout] [bad

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

2015-06-26 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: And worse yet, majority of users may read git bisect start is where you start bisection, but bisect start (either called directly, or via bisect_autostart by the first git bisect good) is where you set up the machinery, so doing bisect terms before

Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-06-26 Thread Johannes Schindelin
Hi Peff, On 2015-06-26 18:27, Jeff King wrote: On Fri, Jun 26, 2015 at 09:16:20AM -0700, Junio C Hamano wrote: FYI, this ended up biting me today. We have some integration tests that make sure we can clone over putty, and we wrap plink in a plink-wrapper.sh script that tweaks a few extra

Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-06-26 Thread Jeff King
On Fri, Jun 26, 2015 at 07:13:15PM +0200, Johannes Schindelin wrote: It's the test suite for the server side of our git infrastructure, so nothing gets installed. It's more like: export GIT_SSH=$PROJECT_ROOT/test/plink-wrapper.sh export REAL_PLINK=$PROJECT_ROOT/vendor/putty/plink

Re: [PATCH] setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR

2015-06-26 Thread Junio C Hamano
Nguyễn Thái Ngọc Duy pclo...@gmail.com writes: This is where the fun is. The legacy behavior is, if $GIT_WORK_TREE is not set but $GIT_DIR is, cwd is chosen as worktree's top. If you happen to stand at worktree's top when you do this, all is well. It is not legacy, though. It is how things

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: Eventually there will be no more revisions left to bisect, and the command will print out a description of the first bad commit. The reference `refs/bisect/bad` created by bisect will point at that commit. I agree that is better. For the last

Re: [PATCH v8 1/5] setup: add gentle version of read_gitfile

2015-06-26 Thread erik elfström
On Fri, Jun 26, 2015 at 11:03 AM, Jeff King p...@peff.net wrote: I happened to be playing with clang's static analyzer today, and it noticed that there is a subtle use-after-free here. Doh, sorry about that. Thanks for fixing my bug. /Erik -- To unsubscribe from this list: send the line

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Junio C Hamano
Michael Haggerty mhag...@alum.mit.edu writes: By the way, when I was revising the text two things occurred to me that have probably been discussed to death elsewhere but let me mention them anyway: 1. I found it confusing that `git bisect terms` lists its arguments in the order `term-new

Re: [PATCH 3/3] trace: add GIT_TRACE_STDIN

2015-06-26 Thread Junio C Hamano
Jeff King p...@peff.net writes: My other motive for trace.* was that we could have something like trace.prune, and have git-prune provide verbose debugging information. We have custom patches like that on GitHub servers, which we've used to debug occasional weirdness (e.g., you find that an

Re: [PATCH v8 1/5] setup: add gentle version of read_gitfile

2015-06-26 Thread Junio C Hamano
erik elfström erik.elfst...@gmail.com writes: On Fri, Jun 26, 2015 at 11:03 AM, Jeff King p...@peff.net wrote: I happened to be playing with clang's static analyzer today, and it noticed that there is a subtle use-after-free here. Doh, sorry about that. Thanks for fixing my bug. I missed

Re: Bug in 'git am' when applying a broken patch

2015-06-26 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: In the hunk header we can learn about the expected lines to read for this hunk and after the hunk we only have 3 possible lines: * it's the next hunk, then the line starts with @@ This is true. * it's a new file, so the line starts with diff

Re: [RFC/PATCH 5/9] ref-filter: add option to match literal pattern

2015-06-26 Thread Karthik Nayak
Just a few things I need to fix, personal note. On 06/25/2015 05:13 PM, Karthik Nayak wrote: Since 'ref-filter' only has an option to match path names. Add an option for regular pattern matching. Mentored-by: Christian Couder christian.cou...@gmail.com Mentored-by: Matthieu Moy

Re: [PATCH v10.1 5/7] bisect: simplify the addition of new bisect terms

2015-06-26 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: We do need two functions because we pass the pointer as callback, but it reads nicer with a third helper function. diff --git a/revision.c b/revision.c index 3ff8723..5cd08e9 100644 --- a/revision.c +++ b/revision.c @@ -21,6 +21,9 @@ volatile

Re: [PATCH] setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR

2015-06-26 Thread Junio C Hamano
Junio C Hamano gits...@pobox.com writes: But I am not sure if it is true for our children (e.g. hooks, filters etc. that is spawned by us). With this change, they inherit GIT_WORK_TREE and no GIT_DIR, in such a case. If they set GIT_DIR themselves for their own use, perhaps arranging to

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

2015-06-26 Thread Junio C Hamano
Matthieu Moy matthieu@grenoble-inp.fr writes: Junio C Hamano gits...@pobox.com writes: The second sentence may want to be something like If you mistyped one of the terms, you can do another git bisect terms term-new term-old to correct them, but that is possible only

[PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-26 Thread Matthieu Moy
From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr 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 antoine.dela...@ensimag.grenoble-inp.fr

Re: [PATCH/WIP v3 07/31] am: extract patch, message and authorship with git-mailinfo

2015-06-26 Thread Junio C Hamano
Paul Tan pyoka...@gmail.com writes: OK, I'll try that out. Looks like this now: static char *read_shell_var(FILE *fp, const char *key) { ... str = sq_dequote(sb.buf); if (!str) return NULL; You are unlikely to get !str, but if it does, you leak sb here, don't you?

Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-06-26 Thread brian m. carlson
On Fri, Jun 26, 2015 at 09:15:24AM -0400, Jeff King wrote: On Sun, Apr 26, 2015 at 08:30:12PM +, brian m. carlson wrote: Improve the check by looking for plink or tortoiseplink (or those names suffixed with .exe) only in the final component of the path. This has the downside that a

Re: [PATCH v10 7/7] bisect: allow any terms set by user

2015-06-26 Thread Matthieu Moy
Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy matthieu@imag.fr wrote: From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr Introduction of the git bisect terms command. The user can set his own terms. It will work exactly like

[PATCH] p5310: Fix broken chain in performance test

2015-06-26 Thread Stefan Beller
Signed-off-by: Stefan Beller sbel...@google.com --- t/perf/p5310-pack-bitmaps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/t/perf/p5310-pack-bitmaps.sh b/t/perf/p5310-pack-bitmaps.sh index f8ed857..de2a224 100755 --- a/t/perf/p5310-pack-bitmaps.sh +++

Re: [PATCH v10.1 5/7] bisect: simplify the addition of new bisect terms

2015-06-26 Thread Matthieu Moy
Junio C Hamano gits...@pobox.com writes: static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data) { -return for_each_ref_in_submodule(submodule, refs/bisect/bad, fn, cb_data); +return for_each_bisect_ref(submodule, fn, cb_data, bad); }

Re: [PATCH v3 2/7] cherry-pick: treat CHERRY_PICK_HEAD and REVERT_HEAD as refs

2015-06-26 Thread Junio C Hamano
David Turner dtur...@twopensource.com writes: Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD and REVERT_HEAD. ... diff --git a/sequencer.c b/sequencer.c index f8421a8..de904aa 100644 --- a/sequencer.c +++ b/sequencer.c @@

[PATCH v10.1 5/7] bisect: simplify the addition of new bisect terms

2015-06-26 Thread Matthieu Moy
From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr 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

Re: [PATCH v10 5/7] bisect: simplify the addition of new bisect terms

2015-06-26 Thread Christian Couder
On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy matthieu@imag.fr wrote: static int for_each_bad_bisect_ref(const char *submodule, each_ref_fn fn, void *cb_data) { - return for_each_ref_in_submodule(submodule, refs/bisect/bad, fn, cb_data); + struct strbuf bisect_refs =

[PATCH] revision.c: Remove unneeded check for NULL

2015-06-26 Thread Stefan Beller
The function is called only from one place, which makes sure to have `interesting_cache` not NULL. Additionally it is a dereferenced a few lines before unconditionally, which would result in a segmentation fault. Signed-off-by: Stefan Beller sbel...@google.com --- Notes: So I think the

Re: Bug in 'git am' when applying a broken patch

2015-06-26 Thread Stefan Beller
On Mon, Jun 1, 2015 at 1:23 PM, Junio C Hamano gits...@pobox.com wrote: Eric Sunshine sunsh...@sunshineco.com writes: s/enw/new/ Heh, thanks; I wasn't planning to commit this one yet, but why not. Here is with an updated log message and a test. -- 8 -- Subject: [PATCH] apply: reject a

Re: [PATCH v10 7/7] bisect: allow any terms set by user

2015-06-26 Thread Christian Couder
On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy matthieu@imag.fr wrote: From: Antoine Delaite antoine.dela...@ensimag.grenoble-inp.fr 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.

Re: [PATCH] http: always use any proxy auth method available

2015-06-26 Thread Junio C Hamano
Enrique Tobis enrique.to...@twosigma.com writes: Thanks. I wonder why this was addressed me directly (i.e. I am not an area expert, and I haven't seen this patch discussed here and reviewed by other people), but anyway... By default, libcurl honors some environment variables that specify a

Re: [PATCH v3 3/7] bisect: treat BISECT_HEAD as a ref

2015-06-26 Thread Junio C Hamano
David Turner dtur...@twopensource.com writes: Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with BISECT_HEAD. Signed-off-by: David Turner dtur...@twopensource.com --- Interesting. From the patch, it seems that the codepath that writes

Re: [PATCH v3 7/7] git-stash: use git-reflog instead of creating files

2015-06-26 Thread Junio C Hamano
David Turner dtur...@twopensource.com writes: This is in support of alternate ref backends which don't necessarily store reflogs as files. Signed-off-by: David Turner dtur...@twopensource.com --- 6/7 and 7/7 looked sensible; git reflog create/exists needs a doc update, though. Thanks. --

Re: [PATCH v3 5/7] refs: add safe_create_reflog function

2015-06-26 Thread Junio C Hamano
David Turner dtur...@twopensource.com writes: Make log_ref_setup private, and add public safe_create_reflog which calls log_ref_setup. In a moment, we will use safe_create_reflog to add reflog creation commands to git-reflog. Signed-off-by: David Turner dtur...@twopensource.com --- @@

Re: [PATCH] p5310: Fix broken chain in performance test

2015-06-26 Thread Junio C Hamano
Stefan Beller sbel...@google.com writes: Signed-off-by: Stefan Beller sbel...@google.com Thanks. How did you find this (does the auto -chain test apply to t/perf stuff as well)? Will queue. --- t/perf/p5310-pack-bitmaps.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)

RE: [PATCH] http: always use any proxy auth method available

2015-06-26 Thread Enrique Tobis
Thanks for your feedback! -Original Message- From: Junio C Hamano [mailto:jch2...@gmail.com] On Behalf Of Junio C Hamano Sent: Friday, June 26, 2015 15:25 To: Enrique Tobis Cc: 'git@vger.kernel.org'; 'Nelson Benitez Leon' Subject: Re: [PATCH] http: always use any proxy auth method

Re: [PATCH v3 4/7] refs: Break out check for reflog autocreation

2015-06-26 Thread Junio C Hamano
David Turner dtur...@twopensource.com writes: This is just for clarity. Signed-off-by: David Turner dtur...@twopensource.com --- refs.c | 14 +- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/refs.c b/refs.c index b34a54a..dff91cf 100644 --- a/refs.c +++

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-26 Thread Junio C Hamano
Matthieu Moy matthieu@imag.fr writes: Matthieu Moy matthieu@imag.fr writes: + git bisect terms term-old term-new I think this is the other way around. Indeed. I hate to be saying this, but this is a strong indication that consistency with start $bad $good... must be broken. If

Re: [PATCH] p5310: Fix broken chain in performance test

2015-06-26 Thread Stefan Beller
On Fri, Jun 26, 2015 at 3:27 PM, Junio C Hamano gits...@pobox.com wrote: Stefan Beller sbel...@google.com writes: Signed-off-by: Stefan Beller sbel...@google.com Thanks. How did you find this (does the auto -chain test apply to t/perf stuff as well)? Apparently the -chain tests for it as I

This is a genuine business transaction

2015-06-26 Thread John Wright
-- For your kind attention, I will be very glad if you do assist me to relocate a sum of (15 Million USD)to your personal bank account for the benefit of both of us. You will be entitled to have 35% of this fund as my foreign partner, since you will provide a bank account where this money

RE: [ANNOUNCE] Git v2.5.0-rc0

2015-06-26 Thread steve.norman
Jeff / Duy, Fixes since v2.4 * Access to objects in repositories that borrow from another one on a slow NFS server unnecessarily got more expensive due to recent code becoming more cautious in a naive way not to lose objects to pruning. (merge ee1c6c3 jk/prune-mtime later to

Re: [PATCH v8 1/5] setup: add gentle version of read_gitfile

2015-06-26 Thread Jeff King
On Mon, Jun 15, 2015 at 09:39:51PM +0200, Erik Elfström wrote: +cleanup_return: free(buf); + + if (return_error_code) + *return_error_code = error_code; + + if (error_code) { + if (return_error_code) + return NULL; + +

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-26 Thread Christian Couder
On Sat, Jun 27, 2015 at 12:25 AM, Junio C Hamano gits...@pobox.com wrote: Matthieu Moy matthieu@imag.fr writes: Matthieu Moy matthieu@imag.fr writes: + git bisect terms term-old term-new I think this is the other way around. Indeed. I hate to be saying this, but this is a strong

[PATCH v4 4/6] refs: Break out check for reflog autocreation

2015-06-26 Thread David Turner
This is just for clarity. Signed-off-by: David Turner dtur...@twopensource.com --- builtin/checkout.c | 10 +- refs.c | 31 --- refs.h | 2 +- 3 files changed, 26 insertions(+), 17 deletions(-) diff --git a/builtin/checkout.c

[PATCH v4 1/6] refs.c: add err arguments to reflog functions

2015-06-26 Thread David Turner
Add an err argument to log_ref_setup that can explain the reason for a failure. This then eliminates the need to manage errno through this function since we can just add strerror(errno) to the err string when meaningful. No callers relied on errno from this function for anything else than the

[PATCH v4 3/6] bisect: treat BISECT_HEAD as a ref

2015-06-26 Thread David Turner
Instead of directly writing to and reading from files in $GIT_DIR, use ref API to interact with BISECT_HEAD. Signed-off-by: David Turner dtur...@twopensource.com --- git-bisect.sh | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/git-bisect.sh b/git-bisect.sh index

[PATCH v4 0/6] refs backend preamble

2015-06-26 Thread David Turner
This version addresses Junio's comments on v3. -- 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 v4 5/6] git-reflog: add create and exists functions

2015-06-26 Thread David Turner
These are necessary because alternate ref backends might store reflogs somewhere other than .git/logs. Code that now directly manipulates .git/logs should instead go through git-reflog. In a moment, we will use these functions to make git stash work with alternate ref backends. Signed-off-by:

[PATCH v4 6/6] git-stash: use git-reflog instead of creating files

2015-06-26 Thread David Turner
This is in support of alternate ref backends which don't necessarily store reflogs as files. Signed-off-by: David Turner dtur...@twopensource.com --- git-stash.sh | 4 ++-- refs.c | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/git-stash.sh b/git-stash.sh index

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-26 Thread Junio C Hamano
On Fri, Jun 26, 2015 at 9:10 PM, Christian Couder christian.cou...@gmail.com wrote: If we don't want to support positional arguments, then I would suggest supporting first the following instead: git bisect terms --name-good=fast --name-bad=slow git bisect terms

Re: [PATCH v10.1 7/7] bisect: allow any terms set by user

2015-06-26 Thread Christian Couder
On Sat, Jun 27, 2015 at 6:25 AM, Junio C Hamano gits...@pobox.com wrote: On Fri, Jun 26, 2015 at 9:10 PM, Christian Couder christian.cou...@gmail.com wrote: If we don't want to support positional arguments, then I would suggest supporting first the following instead: git bisect

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Matthieu Moy
Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty mhag...@alum.mit.edu wrote: [...] +Eventually there will be no more revisions left to bisect, and the +command will print out a description of the first bad commit, and also +create a

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Christian Couder
On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty mhag...@alum.mit.edu wrote: [...] +Eventually there will be no more revisions left to bisect, and the +command will print out a description of the first bad commit, and also +create a reference called `refs/bisect/bad` that points at that

Re: [PATCH] setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR

2015-06-26 Thread Jeff King
On Fri, Jun 26, 2015 at 05:37:35PM +0700, Nguyễn Thái Ngọc Duy wrote: This is where the fun is. The legacy behavior is, if $GIT_WORK_TREE is not set but $GIT_DIR is, cwd is chosen as worktree's top. If you happen to stand at worktree's top when you do this, all is well. If you are in a subdir

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Matthieu Moy
Michael Haggerty mhag...@alum.mit.edu writes: * Remove the Look for a fix instead of a regression in the code example, as (1) it was in the git bisect run section, but it doesn't use that command, and (2) I think this usage is adequately explained in the Alternate terms section. [...]

[PATCH] bisect: revise manpage

2015-06-26 Thread Michael Haggerty
Thoroughly revise the git bisect manpage, including: * Beef up the Description section. * Integrate the good/bad alternate terms into more of the text. * Merge the sections Alternative terms: bisect new and bisect old and Alternative terms: use your own terms into a single Alternate terms

Re: [PATCH] bisect: revise manpage

2015-06-26 Thread Christian Couder
On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy matthieu@grenoble-inp.fr wrote: Christian Couder christian.cou...@gmail.com writes: On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty mhag...@alum.mit.edu wrote: [...] +Eventually there will be no more revisions left to bisect, and the

Re: [PATCH v3 3/3] connect: improve check for plink to reduce false positives

2015-06-26 Thread Jeff King
On Sun, Apr 26, 2015 at 08:30:12PM +, brian m. carlson wrote: The git_connect function has code to handle plink and tortoiseplink specially, as they require different command line arguments from OpenSSH (-P instead of -p for ports; tortoiseplink additionally requires -batch). However,

[PATCH] setup: set env $GIT_WORK_TREE when work tree is set, like $GIT_DIR

2015-06-26 Thread Nguyễn Thái Ngọc Duy
In the test case, we run setup_git_dir_gently() the first time to read $GIT_DIR/config so that we can resolve aliases. We'll enter setup_discovered_git_dir() and may or may not call set_git_dir() near the end of the function, depending on whether the detected git dir is .git or not. This

Re: [ANNOUNCE] Git v2.5.0-rc0

2015-06-26 Thread Jeff King
On Fri, Jun 26, 2015 at 09:36:04AM +, steve.nor...@thomsonreuters.com wrote: Jeff / Duy, Fixes since v2.4 * Access to objects in repositories that borrow from another one on a slow NFS server unnecessarily got more expensive due to recent code becoming more cautious in a