Johan Herland wrote:
> On Tue, May 20, 2014 at 4:55 PM, Michael Haggerty
> wrote:
> > On 05/19/2014 11:31 PM, Junio C Hamano wrote:
> >> Felipe Contreras writes:
> >>> Where is git-imerge packaged?
> >>
> >> I didn't see it on the archive the said Ubuntu box slurps from, but
> >> I did not check
Felipe Contreras writes:
> Junio C Hamano wrote:
>> Felipe Contreras writes:
>> ...
>> > So to make it clear, I now request that you do:
>> >
>> > 1) Remove all the code.
>> ...
>> I'll do that, but just one thing to make sure---do you want the
>> helper to exit with status 0?
>
> It doesn't ma
Junio C Hamano wrote:
> Felipe Contreras writes:
>
> > Or have an option to specify a dynamic instruction sheet, so you can cat
> > the instructions of 'match-next' and replace the base. However, I don't
> > see the point of re-applying the branches for 'next' if you already know
> > that 'next'
I've noticed that --max-count doesn't seem to speed up `git log --graph'
computation time. Here are some numbers using the linux kernel
repository:
| command | time* |
|--+---|
| git log --graph --max-count=5000 | 4.11s |
On 20/05/14 22:40, Jonathan Nieder wrote:
> Ramsay Jones wrote:
>
>> --- a/t/t-basic.sh
>> +++ b/t/t-basic.sh
>> @@ -296,8 +296,9 @@ test_expect_success 'test --verbose-only' '
>> '
>>
>> test_expect_success 'GIT_SKIP_TESTS' "
>> -GIT_SKIP_TESTS='git.2' \
>> -run_sub_te
Hi,
Ramsay Jones wrote:
> On 20/05/14 22:40, Jonathan Nieder wrote:
>> What should happen if I have set GIT_SKIP_TESTS explicitly to run
>> only some of the tests in t-basic?
>
> A quick test (with the above patch applied) shows that
> it works as I would expect:
>
> $ GIT_SKIP_TESTS=t
Felipe Contreras writes:
> I'm not sure what would be the usefulness of using things like
> 'xx/topic~4'.
As a notation it is not very pretty ;-).
Imagine that xx/topic is about a multistep introduction of a
backward incompatible feature. The beginning part of the series up
to xx/topic~4 are t
Mitchel Humpherys writes:
> I've noticed that --max-count doesn't seem to speed up `git log --graph'
> computation time.
AFAIK, --graph wants to compute the whole history and the max-count
only affects the output phase after --graph does its computation.
Besides, "log --max-count=n" and "log HE
On Tue, May 20, 2014 at 5:47 PM, Junio C Hamano wrote:
> Felipe Contreras writes:
>
>> I'm not sure what would be the usefulness of using things like
>> 'xx/topic~4'.
>
> As a notation it is not very pretty ;-).
>
> Imagine that xx/topic is about a multistep introduction of a
> backward incompati
When an explicit '--git-dir' option points to a directory inside
the work tree, git treats it as if it were any other directory.
In particular, 'git status' lists it as untracked, while 'git add -A'
stages the metadata directory entirely
Add GIT_DIR to the list of excludes in setup_standard_exclud
On 20/05/14 23:44, Jonathan Nieder wrote:
> Hi,
>
> Ramsay Jones wrote:
>> On 20/05/14 22:40, Jonathan Nieder wrote:
>
>>> What should happen if I have set GIT_SKIP_TESTS explicitly to run
>>> only some of the tests in t-basic?
>>
>> A quick test (with the above patch applied) shows that
>> i
On Tue, May 20 2014 at 03:50:43 PM, Junio C Hamano wrote:
> Mitchel Humpherys writes:
>
>> I've noticed that --max-count doesn't seem to speed up `git log --graph'
>> computation time.
>
> AFAIK, --graph wants to compute the whole history and the max-count
> only affects the output phase after --
Surely. I am on a bus with terrible WiFi that does not let me use the
usual terminal,
but you would find a code in revision.c that sets revs->topo_order = 1
when it parses
"--graph" option. If you disable it, that would stop "--graph" from
wanting to compute
the whole history before starting to emi
A release candidate Git v2.0.0-rc4, hopefully the final one before
the real thing, is now available for testing at the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/testing/
The following public repositories all have a copy of the 'v2.0.0-rc4'
tag and t
On Tue, May 20, 2014 at 04:27:40AM -0400, Jeff King wrote:
> On Tue, May 20, 2014 at 01:00:06AM -0700, Jeremiah Mahler wrote:
>
...
> > +test_expect_success 'format-patch --signature-file=file' '
> > + git format-patch --stdout --signature-file=expect -1 >output &&
> > + check_patch output &&
On Tue, May 20, 2014 at 08:06:50AM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > You could do:
> >
> > #define DEFAULT_SIGNATURE git_version_string
> > static const char *signature = DEFAULT_SIGNATURE;
> >
> > ...
> >
> > if (signature == DEFAULT_SIGNATURE)
> > ...
> >
> > b
Ronnie Sahlberg wrote:
> This changes the locking slightly for walker_fetch. Previously the code would
> lock all refs before writing them but now we do not lock the refs until the
> commit stage. There is thus a very short window where changes could be done
> locally during the fetch which would
Junio C Hamano wrote:
> * The remote-helper interface to fast-import/fast-export via the
>transport-helper has been tightened to avoid leaving the import
>marks file from a failed/crashed run, as such a file that is out-of-
>sync with reality confuses a later invocation of itself.
Re
Ronnie Sahlberg wrote:
> No external users call write_ref_sha1 any more so lets declare it static.
Yay!
[...]
> +++ b/refs.c
> @@ -251,6 +251,8 @@ struct ref_entry {
[...]
> static void read_loose_refs(const char *dirname, struct ref_dir *dir);
> +static int write_ref_sha1(struct ref_lock *lock
Ronnie Sahlberg wrote:
> No external callers reference lock_ref_sha1 any more so lets declare it
> static.
>
> Signed-off-by: Ronnie Sahlberg
> ---
> refs.c | 2 +-
> refs.h | 3 ---
> 2 files changed, 1 insertion(+), 4 deletions(-)
Reviewed-by: Jonathan Nieder
--
To unsubscribe from this lis
v6 of patch to add format-patch --signature-file option.
This revision includes more suggestions from Jeff King and Junio C Hamano:
- Adding #define DEFAULT_SIGNATURE was a good idea but it could be
used in a way that nullifies the pointer comparison used to see if
the default has chan
Added option that allows a signature file to be used with format-patch
so that signatures with newlines and other special characters can be
easily included.
$ git format-patch --signature-file ~/.signature -1
The config variable format.signaturefile is also provided so that it
can be added by d
On Tue, May 20, 2014 at 10:10:46AM -0700, Junio C Hamano wrote:
> Alexey Shumkin writes:
>
> > AFAIU, Junio already applied my patches (existance of a branch
> > as/pretty-truncate tells us that). So, we can only send other patches that
> > fix errors brought with former patches.
>
> No, NO, NOO
Good day.
I am Elizabeth Sakura, a staff of Lloyds TSB Group Plc.here in Hong
Kong. I will need you to assist me in executing a business project
from Hong Kong to your country.Contact me Email address(
tseselizabeth...@yahoo.com ) for more information.Regards,Mrs.Sukura
Elizabeth tse
--
To unsub
Felipe Contreras writes:
> Junio C Hamano wrote:
>
>> * The remote-helper interface to fast-import/fast-export via the
>>transport-helper has been tightened to avoid leaving the import
>>marks file from a failed/crashed run, as such a file that is out-of-
>>sync with reality confuses
101 - 125 of 125 matches
Mail list logo