Hi,
Quoting René Scharfe (2015-08-12 21:40:48)
> Am 11.08.2015 um 12:40 schrieb Johannes Schauer:
> > for repositories with more than 16k files and folders, git-archive will
> > create
> > zip files which store the wrong number of entries. That is, it stores the
> > number of entries modulo 16k.
SZEDER Gábor writes:
>>
>> s/becase/because/;
>
> OK.
> ...
>> I agree with Peff that "--names-only" has a subtle difference with
>> an existing and well known subcommand option and it would be a bit
>> irritating to remember which options is for which command.
>
> OK.
> ...
The topic is now in
On Tue, Jun 02, 2015 at 07:11:10AM -0400, Michael Rappazzo wrote:
> In the "Tags and heads" view, the list of refs is globally sorted.
> The list of local refs (heads) is separated by the remote refs. This
> change re-orders the view toi be: local refs, remote refs tracked by
> local refs, remote
Quoting Junio C Hamano :
SZEDER Gábor writes:
'git config' can only show values or name-value pairs, so if a shell
script needs the names of set config variables it has to run 'git config
--list' or '--get-regexp' and parse the output to separate config
variable names from their values. How
On Wed, Aug 12, 2015 at 8:34 PM, Jacob Keller wrote:
> On Wed, Aug 12, 2015 at 9:10 AM, Junio C Hamano wrote:
>> Some design boundaries:
>>
>> - Moving the remote-tracking branch hierarchy from refs/remotes/$O/*
>>to refs/remotes/$O/heads/* would not fly, because it will break
>>existing
On Wed, Aug 12, 2015 at 3:41 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> I spoke to soon. We have an "init_notes_check" function which shows
>> that it does refuse to merge outside of refs/notes/* It prevents all
>> notes operations outside of refs/notes
>
> OK. Then it is OK to limit
Here are the topics that have been cooking. Commits prefixed with
'-' are only in 'pu' (proposed updates) while commits prefixed with
'+' are in 'next'.
The second batch of topics have graduated to 'master'. Most
notably, the rewritten "git am" is in. Also "worktree add" is
getting improved.
Y
David Turner writes:
> Instead of a linear search over common_list to check whether
> a path is common, use a trie. The trie search operates on
> path prefixes, and handles excludes.
>
> Signed-off-by: David Turner
> ---
>
> Probably overkill, but maybe we could later use it for making exclude
Am Catherine, a dying widow, am donating my trust fund money to any
God fearing individual willing to embrasse a life changing encounter.
Kindly contact me on catherinemelco...@gmail.com if you are priviledged to read
this mail for details.
Cath
---
This email has been checked for viruses by
Jacob Keller writes:
> I spoke to soon. We have an "init_notes_check" function which shows
> that it does refuse to merge outside of refs/notes/* It prevents all
> notes operations outside of refs/notes
OK. Then it is OK to limit notes..mergestrategy so that
refers to what comes after refs/not
On Wed, Aug 12, 2015 at 2:57 PM, Jacob Keller wrote:
> On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland wrote:
>> If we don't already refuse to merge into a ref outside refs/notes, then
>> I would consider that a bug to be fixed, and not some corner use case that
>> we must preserve for all future.
On Wed, Aug 12, 2015 at 11:43 PM, Jacob Keller wrote:
> On Wed, Aug 12, 2015 at 12:16 PM, Jacob Keller wrote:
>> Oh interesting. I did a test. If you provide a fully qualified ref not
>> inside refs/notes, then it assumes you meant refs/notes/refs/foo/y
>> rather than refs/foo/y
>>
>> I need to d
On Wed, Aug 12, 2015 at 5:34 PM, Stefan Beller wrote:
> On Wed, Aug 12, 2015 at 2:13 PM, Eric Sunshine
> wrote:
>> On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller wrote:
>>> if (!gitmodule_sha1_from_commit(commit_sha1, sha1))
>>> - return submodule;
>>> + retu
Using the new refs/worktree/ refs, make bisection per-worktree.
Signed-off-by: David Turner
---
Documentation/git-bisect.txt | 4 ++--
Documentation/rev-list-options.txt | 14 +++---
bisect.c | 2 +-
builtin/rev-parse.c| 6 --
git-bi
We need a place to stick refs for bisects in progress that is not
shared between worktrees. So we use the refs/worktree/ hierarchy.
The is_per_worktree_ref function and associated docs learn that
refs/worktree/ is per-worktree, as does the git_path code in path.c
The ref-packing functions learn
Instead of a linear search over common_list to check whether
a path is common, use a trie. The trie search operates on
path prefixes, and handles excludes.
Signed-off-by: David Turner
---
Probably overkill, but maybe we could later use it for making exclude
or sparse-checkout matching faster (o
Instead of common_list having formatting like ! and /, use a struct to
hold common_list data in a structured form.
We don't use 'exclude' yet; instead, we keep the old codepath that
handles info/sparse-checkout and logs/HEAD. Later, we will use exclude.
Signed-off-by: David Turner
---
Junio wa
On Wed, Aug 12, 2015 at 2:46 PM, Johan Herland wrote:
> If we don't already refuse to merge into a ref outside refs/notes, then
> I would consider that a bug to be fixed, and not some corner use case that
> we must preserve for all future.
>
> After all, we do already have a test in t3308 named 'f
Reordering the struct member env to be next to env_array
helps understanding the struct better.
This also adds comments to indicate that arg{s,v} and (env, env_array)
are used for the same purpose and only one must be used. Although
these comments are in the Documentation, I still think they are
a
On Wed, Aug 12, 2015 at 4:26 AM, Junio C Hamano wrote:
> Johan Herland writes:
>> I know that we don't yet have a "proper" place to put remote notes refs,
>> but the in notes..merge _must_ be a "local" notes ref (you even
>> use the notation in the documentation below). Thus, I believe
>> we ca
On Wed, Aug 12, 2015 at 12:16 PM, Jacob Keller wrote:
> Oh interesting. I did a test. If you provide a fully qualified ref not
> inside refs/notes, then it assumes you meant refs/notes/refs/foo/y
> rather than refs/foo/y
>
> I need to do some more digging on this to determine the exact thing going
On Wed, Aug 12, 2015 at 2:13 PM, Eric Sunshine wrote:
> On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller wrote:
>> In the first hunk, `submodule` is NULL all the time, so we can make it
>> clearer
>> by directly returning NULL.
>>
>> In the second hunk, we can directly return the lookup values as
On Wed, Aug 12, 2015 at 3:13 PM, Stefan Beller wrote:
> In the first hunk, `submodule` is NULL all the time, so we can make it clearer
> by directly returning NULL.
>
> In the second hunk, we can directly return the lookup values as it also makes
> the coder clearer.
>
> Signed-off-by: Stefan Bell
Karthik Nayak writes:
> On Wed, Aug 12, 2015 at 10:43 PM, Junio C Hamano wrote:
> ...
>> %(objectname:abbrev=8). To specify two modification magics, each of
>> which takes a number, the user would say e.g.
>>
>> %(objectname:abbrev=8,magic=4)
>> ...
>> And that would be following %(align:8)
On Wed, Aug 12, 2015 at 10:43 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> On Wed, Aug 12, 2015 at 12:22 AM, Junio C Hamano wrote:
>>
>>> Minor nits on the design. %(align:[,]) would let
>>> us write %(align:16)...%(end) and use the "default position", which
>>> may be beneficial if o
I'm pretty happy about Git in general, but for two situations where I've
found workarounds, which both have the same problem, which is that they
"touch" files unnecessarily:
* First case: merge into a dirty tree.
I often want to "git pull" into a tree
that's dirty. I know many people find this t
Jacob Keller writes:
> That still hasn't really resolved the question of how to deal with
> tags, but it does solve the question of how to deal with replace and
> notes refs.
I do not think it would be a good change to add a
[remote "foo"]
fetch = refs/tags/*:refs/tracking/foo/tags/
Am 11.08.2015 um 12:40 schrieb Johannes Schauer:
Hi,
for repositories with more than 16k files and folders, git-archive will create
zip files which store the wrong number of entries. That is, it stores the
number of entries modulo 16k. This will break unpackers that do not include
code to suppor
Marc Branchaud writes:
> Not a lot. Existing DWIMery already handles ambiguous branches, by
> preferring a local branch name over any remote ones. The only teaching
> that's really needed is ...
You need to remember that there are five useful things you can do to
mutable things.
- Creation c
Stefan Beller writes:
> However just as I was convinced of my review and sent out the email, I started
> working with it. And I found nits which I'd ask you to squash into the round
> or
> put on top.
Good ;-). I'd prefer a full reroll, as it has been quite a while
since v5 was originally post
On Wed, Aug 12, 2015 at 12:09 PM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano wrote:
>>> Johan Herland writes:
>>>
I know that we don't yet have a "proper" place to put remote notes refs,
but the in notes..merge _must_ be a "local
In the first hunk, `submodule` is NULL all the time, so we can make it clearer
by directly returning NULL.
In the second hunk, we can directly return the lookup values as it also makes
the coder clearer.
Signed-off-by: Stefan Beller
---
submodule-config.c | 12 +---
1 file changed, 5 in
On Wed, Aug 12, 2015 at 10:53 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> On Mon, Jun 15, 2015 at 2:48 PM, Junio C Hamano wrote:
>>> Thanks. Will replace and wait for comments from others.
>>
>> I have reviewed the patches carefully and they look good to me.
>
> OK, I recall there we
If you want to look up by name, use `submodule_from_name` instead.
Signed-off-by: Stefan Beller
---
Documentation/technical/api-submodule-config.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/technical/api-submodule-config.txt
b/Documentation/technical/a
Jacob Keller writes:
> On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano wrote:
>> Johan Herland writes:
>>
>>> I know that we don't yet have a "proper" place to put remote notes refs,
>>> but the in notes..merge _must_ be a "local" notes ref (you even
>>> use the notation in the documentation
On Tue, Aug 11, 2015 at 7:26 PM, Junio C Hamano wrote:
> Johan Herland writes:
>
>> I know that we don't yet have a "proper" place to put remote notes refs,
>> but the in notes..merge _must_ be a "local" notes ref (you even
>> use the notation in the documentation below). Thus, I believe
>> we
On Wed, Aug 12, 2015 at 11:54 AM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>>> Just thinking aloud, perhaps we can introduce a brand new top level
>>> hierarchy refs/remote/$O/{heads,tags,notes,...}, and give backward
>>> compatibility by making a moral equivalent of a symbolic link from
>>
Jacob Keller writes:
>> Just thinking aloud, perhaps we can introduce a brand new top level
>> hierarchy refs/remote/$O/{heads,tags,notes,...}, and give backward
>> compatibility by making a moral equivalent of a symbolic link from
>> refs/remote/$O/heads to refs/remotes/$O/. The true remote-tra
On Wed, Aug 12, 2015 at 9:10 AM, Junio C Hamano wrote:
> Jacob Keller writes:
>
>> Recently there was some discussion about git-notes and how we do not
>> fetch notes from remotes by default. The big problem with doing so is
>> because refs/remotes/* hierarchy is only setup for branches (heads),
Am 12.08.2015 um 13:58 schrieb Erik Faye-Lund:
On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin
wrote:
FWIW Git for Windows has this patch (that I wanted to contribute
in due time, what with being busy with all those tickets) to solve the
problem mentioned in your patch in a different way:
Am 12.08.2015 um 00:14 schrieb Junio C Hamano:
Now, I am wondering if it makes sense to do these two things:
* Teach revision.c::read_revisions_from_stdin() to use
strbuf_getline() instead of strbuf_getwholeline().
* Teach strbuf_getline() to remove CR at the end when stripping the
On Wed, Aug 12, 2015 at 04:24:51PM +0200, Elia Pinto wrote:
> Teach git about a new option, "http.sslVersion", which permits one to
> specify the SSL version to use when negotiating SSL connections. The
> setting can be overridden by the GIT_SSL_VERSION environment
> variable.
>
> Signed-off-by:
On Wed, Aug 12, 2015 at 07:43:01PM +0200, Johannes Sixt wrote:
> 27e1e22d (prune: factor out loose-object directory traversal, 2014-10-16)
> introduced a new function for_each_loose_file_in_objdir() with a helper
> for_each_file_in_obj_subdir(). The latter calls callbacks for each file
> found dur
Stefan Beller writes:
> On Mon, Jun 15, 2015 at 2:48 PM, Junio C Hamano wrote:
>> Thanks. Will replace and wait for comments from others.
>
> I have reviewed the patches carefully and they look good to me.
OK, I recall there were a few iterations with review comments before
this round. Is it
27e1e22d (prune: factor out loose-object directory traversal, 2014-10-16)
introduced a new function for_each_loose_file_in_objdir() with a helper
for_each_file_in_obj_subdir(). The latter calls callbacks for each file
found during a directory traversal and finally also a callback for the
directory
Karthik Nayak writes:
> On Wed, Aug 12, 2015 at 12:22 AM, Junio C Hamano wrote:
>
>> Minor nits on the design. %(align:[,]) would let
>> us write %(align:16)...%(end) and use the "default position", which
>> may be beneficial if one kind of alignment is prevalent (I guess all
>> the internal us
Also add some code comments explaining how the fields in "struct
diff_tempfile" are used.
Signed-off-by: Michael Haggerty
---
This is a replacement for tempfile patch v2 12/16 that includes some
extra code comments. It is also available from my GitHub repo [1] on
branch "tempfile".
[1] https://g
On Wed, Aug 12, 2015 at 10:10 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> On Tue, Aug 11, 2015 at 11:52 PM, Junio C Hamano wrote:
>>> Karthik Nayak writes:
>>>
+void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned
int width,
+co
On Wed, Aug 12, 2015 at 9:59 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
+ format_quote_value(atomv, quote_style, &output);
>>>
>>> If the one to add a literal string (with %hex escaping) is called "append_",
>>> then this should be called append_quoted_atom() or somethin
Michael Haggerty writes:
> No, prepare_temp_file() sometimes sets diff_tempfile::name to
> "/dev/null", and sometimes to point at its argument `name`.
That explains everything. Thanks. It's been a while since I wrote
this part of the system ;-).
--
To unsubscribe from this list: send the line
Karthik Nayak writes:
> On Tue, Aug 11, 2015 at 11:52 PM, Junio C Hamano wrote:
>> Karthik Nayak writes:
>>
>>> +void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned
>>> int width,
>>> +const char *s)
>>> +{
>>> + int display_len = utf8_strnwidth(s,
Karthik Nayak writes:
>>> + format_quote_value(atomv, quote_style, &output);
>>
>> If the one to add a literal string (with %hex escaping) is called "append_",
>> then this should be called append_quoted_atom() or something, no?
>
> Although it does append like "append_non_atom" this
Johannes Schindelin writes:
> Hi,
>
> On 2015-08-11 22:38, Johannes Sixt wrote:
>
>> diff --git a/t/t2019-checkout-ambiguous-ref.sh
>> b/t/t2019-checkout-ambiguous-ref.sh
>> index 8396320..199b22d 100755
>> --- a/t/t2019-checkout-ambiguous-ref.sh
>> +++ b/t/t2019-checkout-ambiguous-ref.sh
>> @@ -
On Wed, Aug 12, 2015 at 12:22 AM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> struct atom_value{
>
> Obviously not a problem with this step, but you need a SP before the
> open brace.
>
Will add.
>> @@ -692,6 +704,26 @@ static void populate_value(struct ref_array_item *ref)
>>
Jacob Keller writes:
> Recently there was some discussion about git-notes and how we do not
> fetch notes from remotes by default. The big problem with doing so is
> because refs/remotes/* hierarchy is only setup for branches (heads),
> so we don't have any clean location to put them.
I wouldn't
Duy Nguyen writes:
> I know this is a corner case, but because it has a valid use case,
> maybe we should do something about it. Immediate reaction is to add an
> option to send no "have"s. But maybe you guys have better ideas.
This and similar corner cases were discussed in very early days of
G
On 15-08-12 02:43 AM, Jacob Keller wrote:
> Hello,
>
> Recently there was some discussion about git-notes and how we do not fetch
> notes from remotes by default. The big problem with doing so is because
> refs/remotes/* hierarchy is only setup for branches (heads), so we don't
> have any clean lo
Elia Pinto writes:
> diff --git a/http.c b/http.c
> index e9c6fdd..1504005 100644
> --- a/http.c
> +++ b/http.c
> @@ -37,6 +37,8 @@ static int curl_ssl_verify = -1;
> static int curl_ssl_try;
> static const char *ssl_cert;
> static const char *ssl_cipherlist;
> +static const char *ssl_version;
On 08/11/2015 10:21 PM, Junio C Hamano wrote:
> Thanks for a pleasant read. All looked reasonable.
Thanks for your review!
Michael
--
Michael Haggerty
mhag...@alum.mit.edu
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
M
On 08/11/2015 10:03 PM, Junio C Hamano wrote:
> Michael Haggerty writes:
>
>> Signed-off-by: Michael Haggerty
>> ---
>> diff.c | 29 +++--
>> 1 file changed, 7 insertions(+), 22 deletions(-)
>
> Nice code reduction.
>
>> diff --git a/diff.c b/diff.c
>> index 7500c55..d
Hello all,
I am using git stashes to ensure that my source builds and tests
correctly. My general work flow is this: Before committing I create a
stash and clean everything:
git stash save -q --keep-index --include-untracked
Then I perform some tests (mvn compile test), after that I restore
Teach git about a new option, "http.sslVersion", which permits one to
specify the SSL version to use when negotiating SSL connections. The
setting can be overridden by the GIT_SSL_VERSION environment
variable.
Signed-off-by: Elia Pinto
---
This is the second version. I moved out of the else cla
2015-08-12 15:33 GMT+02:00 Remi Galan Alfonso
:
> Hello, Elia
>
> Elia Pinto writes:
>> +if (ssl_version != NULL && *ssl_version) {
>> +if (!strcmp(ssl_version,"tlsv1")) {
>> +sslversion = CURL_SSLVERSION_TLSv1;
>> +} else if (!strcmp
On Tue, Aug 11, 2015 at 11:52 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> +void strbuf_utf8_align(struct strbuf *buf, align_type position, unsigned
>> int width,
>> +const char *s)
>> +{
>> + int display_len = utf8_strnwidth(s, strlen(s), 0);
>> + int utf8_
Hello, Elia
Elia Pinto writes:
> +if (ssl_version != NULL && *ssl_version) {
> +if (!strcmp(ssl_version,"tlsv1")) {
> +sslversion = CURL_SSLVERSION_TLSv1;
> +} else if (!strcmp(ssl_version,"sslv2")) {
> +sslve
On Tue, Aug 11, 2015 at 11:43 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> get_ref_atom_value(info, parse_ref_filter_atom(sp + 2, ep),
>> &atomv);
>> - format_quote_value(atomv, quote_style, &output);
>> + set_formatting_state(atomv, &state);
>> +
On Tue, Aug 11, 2015 at 11:30 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> @@ -1283,9 +1279,11 @@ void show_ref_array_item(struct ref_array_item *info,
>> const char *format, int qu
>> if (color_parse("reset", color) < 0)
>> die("BUG: couldn't parse
On Tue, Aug 11, 2015 at 11:26 PM, Junio C Hamano wrote:
> Karthik Nayak writes:
>
>> -static void print_value(struct atom_value *v, int quote_style)
>> +static void format_quote_value(struct atom_value *v, int quote_style,
>> struct strbuf *output)
>> {
>
> Hmph...
>
>> -static void emit(const
Teach git about a new option, "http.sslVersion", which permits one to
specify the SSL version to use when negotiating SSL connections. The
setting can be overridden by the GIT_SSL_VERSION environment
variable.
Signed-off-by: Elia Pinto
---
Documentation/config.txt | 21 ++
On Wed, Aug 12, 2015 at 1:07 PM, Johannes Schindelin
wrote:
> Hi Johannes,
>
> On 2015-08-11 22:51, Johannes Sixt wrote:
>> Invoking plink requires special treatment, and we have support and even
>> test cases for the commands 'plink' and 'tortoiseplink'. We also support
>> .exe variants for these
This is a corner case that has a real use case:
git clone linux-2.6.git
cd linux-2.6
git remote add history git-history.git
git fetch history
# graft graft graft
Because history.gi and linux-2.6.git have nothing in common, the
server side keeps asking for more "have"s and the client keeps sending
Hi,
On 2015-08-11 22:38, Johannes Sixt wrote:
> diff --git a/t/t2019-checkout-ambiguous-ref.sh
> b/t/t2019-checkout-ambiguous-ref.sh
> index 8396320..199b22d 100755
> --- a/t/t2019-checkout-ambiguous-ref.sh
> +++ b/t/t2019-checkout-ambiguous-ref.sh
> @@ -69,7 +69,7 @@ test_expect_success 'wildcar
Hi Johannes,
On 2015-08-11 22:51, Johannes Sixt wrote:
> Invoking plink requires special treatment, and we have support and even
> test cases for the commands 'plink' and 'tortoiseplink'. We also support
> .exe variants for these two and there is a test for 'plink.exe'.
>
> On Windows, however, w
73 matches
Mail list logo
