On Fri, Jun 26, 2015 at 03:34:19PM -0700, Stefan Beller wrote:
> > 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 got a warning for it while
> benchmarking some changes in ALLOC_GROW. (which originally
On Fri, Jun 26, 2015 at 12:40:19PM -0700, Stefan Beller wrote:
> 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.
Yeah, I think
On Fri, Jun 26, 2015 at 6:56 PM, Jeff King 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 worktree
On Sat, Jun 27, 2015 at 6:25 AM, Junio C Hamano wrote:
> On Fri, Jun 26, 2015 at 9:10 PM, Christian Couder
> 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=s
On Fri, Jun 26, 2015 at 9:10 PM, Christian Couder
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 --name-bad=slow --name-good=fast
This is in support of alternate ref backends which don't necessarily
store reflogs as files.
Signed-off-by: David Turner
---
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 8e9e2cd..27155bc 100755
--- a/g
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: Da
This is just for clarity.
Signed-off-by: David Turner
---
builtin/checkout.c | 10 +-
refs.c | 31 ---
refs.h | 2 +-
3 files changed, 26 insertions(+), 17 deletions(-)
diff --git a/builtin/checkout.c b/builtin/checkout.c
index 93f63d
Instead of directly writing to and reading from files in
$GIT_DIR, use ref API to interact with CHERRY_PICK_HEAD
and REVERT_HEAD.
Signed-off-by: David Turner
---
branch.c | 4 ++--
builtin/commit.c | 6 +++---
builtin/merge.c | 2 +-
co
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 error
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
---
git-bisect.sh | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/git-bisect.sh b/git-bisect.sh
index ae3fec2..dddcc89 100755
--
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
On Sat, Jun 27, 2015 at 12:25 AM, Junio C Hamano wrote:
> Matthieu Moy writes:
>
>>> Matthieu Moy writes:
>>>
+ git bisect terms
>>>
>>> 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 $g
--
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 will
On Fri, Jun 26, 2015 at 3:27 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> Signed-off-by: Stefan Beller
>
> 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 got a warning for it while
benchmarking so
Stefan Beller writes:
> Signed-off-by: Stefan Beller
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(-)
>
> diff --git a/t/perf/p5310-pack-b
Matthieu Moy writes:
>> Matthieu Moy writes:
>>
>>> + git bisect terms
>>
>> 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 the
person who has been working on this topi
David Turner writes:
> This is in support of alternate ref backends which don't necessarily
> store reflogs as files.
>
> Signed-off-by: David Turner
> ---
6/7 and 7/7 looked sensible; "git reflog create/exists" needs a doc
update, though.
Thanks.
--
To unsubscribe from this list: send the lin
David Turner 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
> ---
> @@ -629,9 +628,8 @@ static void update_refs_
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 m
David Turner writes:
> This is just for clarity.
>
> Signed-off-by: David Turner
> ---
> 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
> +++ b/refs.c
> @@ -3118,6 +3118,14 @@ static i
David Turner 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
> ---
Interesting. From the patch, it seems that the codepath that writes
BISECT_HEAD were already doing update-ref instead of w
David Turner 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
> @@ -160,19 +160,20
Junio C Hamano 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");
>> }
>
> Shoul
Matthieu Moy 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 show_early
Signed-off-by: Stefan Beller
---
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
+++ b/t/perf/p5310-pack-bitmaps.sh
@
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
Mentored-by: Matthieu Moy
Signed-off-by: Karthik Nayak
---
built
Christian Couder writes:
> On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy wrote:
>> 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.
>
> After looking a bit at
Stefan Beller 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 --git"
This i
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
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
---
Junio C Hamano writes:
> M
Paul Tan 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?
> return strb
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
Signe
On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy wrote:
> 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.
After looking a bit at the code, I think that for now exist
From: Michael Haggerty
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 places where exam
Junio C Hamano writes:
> Matthieu Moy writes:
>
>> And indeed "git bisect terms foo bar" errors out. I think the reason it
>> is this way is to allow
>>
>> $ git bisect terms foo bar
>> $ git bisect start
>>
>> But actually, we can allow "git bisect terms" until BISECT_TERMS is
>> created, whi
On Mon, Jun 1, 2015 at 1:23 PM, Junio C Hamano wrote:
> Eric Sunshine 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 hunk that does not do anything
>
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
---
Notes:
> So I think the right solution is just
Enrique Tobis 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
> proxy (e.g. http_proxy, htt
On Fri, Jun 26, 2015 at 6:58 PM, Matthieu Moy 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 = STRBUF_INIT;
>
Junio C Hamano 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 work in somewhere
Jeff King 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 object is
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 con
Matthieu Moy 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] [ [...]] [--] [...]
erik elfström writes:
> On Fri, Jun 26, 2015 at 11:03 AM, Jeff King 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 that one while reviewing and que
Matthieu Moy 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 seems. Sorry for the nois
Michael Haggerty 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 ` `. I think that listing t
On Fri, Jun 26, 2015 at 11:03 AM, Jeff King 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 "unsubscribe git"
Michael Haggerty 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 sent
Jeff King 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 that
Nguyễn Thái Ngọc Duy 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 were designed
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/putt
Nguyễn Thái Ngọc Duy 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 set it when work
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
Junio C Hamano 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
> doing
From: Michael Haggerty
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 places where exam
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-bisect.tx
From: Antoine Delaite
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' and good': the commits which have a cert
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/bis
From: Antoine Delaite
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
Signed-off-by: Louis Stuber
Signed-off-by: Valentin Duperray
Signed-off-by: Franck Jonas
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
Signe
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
Signed-off-by: Matthieu Moy
---
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
+++ b/Documentation/git-bisect.
Matthieu Moy writes:
> Junio C Hamano writes:
>
>> The second sentence may want to be something like
>>
>> If you mistyped one of the terms, you can do another "git
>> bisect terms " to correct them, but
>> that is possible only before you start the bisection.
>
> Applied, thanks
Michael Haggerty 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 were redundant. I r
Christian Couder writes:
> On Fri, Jun 26, 2015 at 4:58 PM, Michael Haggerty
> 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 unsubscribe from this list: send the line "uns
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
Thanks; will queue.
--
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
Jeff King 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" wou
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
On Fri, Jun 26, 2015 at 02:56:58AM -0400, Eric Sunshine wrote:
> > +test_expect_success 'cat-file --batch-all-objects shows all objects' '
> > + # make new repos so we now the full set of objects; we will
>
> s/now/know/
Yeah. I don't think this series otherwise needs re-rolled. Here it is
On Fri, Jun 26, 2015 at 4:58 PM, Michael Haggerty wrote:
> On 06/26/2015 03:15 PM, Christian Couder wrote:
>> On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy
>> wrote:
>>> Christian Couder writes:
>>>
On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty
wrote:
[...]
> +
On 06/26/2015 03:15 PM, Christian Couder wrote:
> On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy
> wrote:
>> Christian Couder writes:
>>
>>> On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty
>>> wrote:
>>>
>>> [...]
>>>
+Eventually there will be no more revisions left to bisect, and the
>>>
On 06/26/2015 02:50 PM, Matthieu Moy wrote:
> Michael Haggerty 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
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,
On Fri, Jun 26, 2015 at 3:00 PM, Matthieu Moy
wrote:
> Christian Couder writes:
>
>> On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty
>> wrote:
>>
>> [...]
>>
>>> +Eventually there will be no more revisions left to bisect, and the
>>> +command will print out a description of the first bad comm
Christian Couder writes:
> On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty
> 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` tha
Michael Haggerty 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.
[...]
> -* Look fo
On Fri, Jun 26, 2015 at 1:30 PM, Michael Haggerty 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
> +commit.
This could
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 s
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
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 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 set_git_
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 ma
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;
> +
> +
Junio C Hamano writes:
> The second sentence may want to be something like
>
> If you mistyped one of the terms, you can do another "git
> bisect terms " to correct them, but
> that is possible only before you start the bisection.
Applied, thanks.
I currently have this in add
On Thu, Jun 25, 2015 at 12:36 AM, Johannes Schindelin
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 strbuf *sb,
>> cons
Hi Junio,
On 2015-06-26 00:29, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Johannes Schindelin 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
>>> functions that assume NUL-termin
On Thu, Jun 25, 2015 at 9:40 PM, Paul Tan wrote:
> On Wed, Jun 24, 2015 at 11:10 PM, Johannes Schindelin
> wrote:
>>> + else if (l1.len && l2.len && l3.len && is_email(paths->items->string))
>>> + ret = PATCH_FORMAT_MBOX;
>>
>> Maybe we can do better than this by folding the `is_e
Christian Couder 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 already
90 matches
Mail list logo
