Stefan Beller writes:
>On Sun, Sep 25, 2016 at 11:39 AM, Junio C Hamano wrote:
>> Johannes Sixt writes:
>>
>>> Am 24.09.2016 um 13:30 schrieb René Scharfe:
Starting with v2.5.0 git merge can handle FETCH_HEAD internally and
warns when it's called like 'git merge HEAD ' because
t
Junio C Hamano writes:
>"Satoshi Yasushima" writes:
>
>> There seems to be a cause in the following taboo.
>> Sure, PATCH 3/6 is little too great.
>> http://vger.kernel.org/majordomo-info.html#taboo
>> >Taboo things to be done when discussing at VGER lists
>> : (abbr.)
>> > * Message size ex
Am 03.10.2016 um 10:30 schrieb Pat Thoyts:
The only problem I see here is that generally git-gui tries to continue
to work with older versions of git as well. So adding a guard using the
git-version procedure should maintain that backwards compatibility.
Makes sense for a stand-alone tool.
I
Apologies if this has already been discussed, but did any of the
proposed patches to allow .gitmodules to be configured for a submodule
to be automatically recursive cloned and/or automatically updated on
pull make it in yet?
My use-case for submodules - which is shared libraries - almost alwa
Alex Riesen writes:
>It is very confusing that the file which diff is displayed is marked as
>selected, but it is not in fact selected (that means the array of selected
>files does not include the file in question).
>
>Fixing this also improves the use of $FILENAMES in custom defined tools: one
>
Vasco Almeida writes:
>Fix wrong use of append command in strings marked for translation.
>According to Tcl/Tk Documentation [1],
> append varName ?value value value ...?
>appends all value arguments to the current value of variable varName.
>This means that
> append "[appname] ([repo
Vasco Almeida writes:
>Mark strings for translation in lib/index.tcl that were seemingly
>left behind by 700e560 ("git-gui: Mark forgotten strings for
>translation.", 2008-09-04) which marks string in do_revert_selection
>procedure.
>These strings are passed to unstage_help and add_helper procedu
On Thu, Sep 29, 2016 at 2:28 AM, Junio C Hamano wrote:
> After reading the three patches through, however, I do not think we
> use the command line option anywhere. I'm inclined to say that we
> shouldn't add it at all. Or at least do so in a separate follow-up
> patch "now we have an internal m
Hi,
On Tue, 27 Sep 2016, Jeff King wrote:
> On Tue, Sep 27, 2016 at 10:05:37AM -0700, Junio C Hamano wrote:
>
> > The subject says it all. Would it be bad if we introduce an
> > environment variable, GIT_SYSTEM_CONFIG=/etc/gitconfig, that names
> > an alternative location of the system-wide con
On Mon, Oct 03, 2016 at 01:06:10PM +0200, Johannes Schindelin wrote:
> Hi,
>
> On Tue, 27 Sep 2016, Jeff King wrote:
>
> > On Tue, Sep 27, 2016 at 10:05:37AM -0700, Junio C Hamano wrote:
> >
> > > The subject says it all. Would it be bad if we introduce an
> > > environment variable, GIT_SYSTE
> W dniu 31.08.2016 o 14:31, Vasco Almeida pisze:
> > Use of sprintf following die or error_msg is necessary for
> > placeholder
> > substitution take place.
>
> No, it is not. Though I don't think that we have in out Git::I18N
> the support for Perl i18n placeholder substitution.
I will try to
A Qui, 29-09-2016 às 23:27 +0200, Jakub Narębski escreveu:
> W dniu 29.09.2016 o 19:05, Junio C Hamano pisze:
> >
> > Vasco Almeida writes:
> >
> > >
> > > On the other hand, would it make sense to translate these
> > > commands? If
> > > so, we would mark for translation the commands name of @
A Sáb, 01-10-2016 às 18:49 +0200, Jakub Narębski escreveu:
> W dniu 26.09.2016 o 20:15, Vasco Almeida pisze:
> >
> > A Qua, 31-08-2016 às 12:31 +, Vasco Almeida escreveu:
> > >
> > >
> > > Mark plural strings for translation. Unfold each action case in
> > > one
> > > entire sentence.
> > >
A Sáb, 01-10-2016 às 19:09 +0200, Jakub Narębski escreveu:
> W dniu 26.09.2016 o 01:09, Junio C Hamano pisze:
> > Vasco Almeida writes:
> >
> >> -print colored $prompt_color,
> $patch_mode_flavour{VERB},
> >> - ($hunk[$ix]{TYPE} eq 'mode' ? ' mode change' :
> >> -
A Seg, 03-10-2016 às 11:30 +0100, Pat Thoyts escreveu:
> Vasco Almeida writes:
>
> >
> > Mark strings for translation in lib/index.tcl that were seemingly
> > left behind by 700e560 ("git-gui: Mark forgotten strings for
> > translation.", 2008-09-04) which marks string in
> > do_revert_selection
A Sex, 30-09-2016 às 19:26 +0200, Jakub Narębski escreveu:
> W dniu 31.08.2016 o 14:31, Vasco Almeida pisze:
> > Mark messages in here document without interpolation for
> translation.
> >
> > Marking for translation by removing here documents this way, rather
> than
> > take advantage of "print _
Hi, Junio.
> I however notice that there is no new tests to protect these two new
> features from future breakages. Perhaps you want to add some in
> [6/5]?
I'll be working on this. I spent some time looking around for example
tests for format. Are there any that I should pay special attention t
Hi Josef,
On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote:
> In several projects, we are using git mergetool for comparing files from
> different folders.
> Unfortunately, when we have opened three files for comparing using meld tool
> (e.q. Old_version -- Result -- New_version),
> we can s
Jonathan Tan writes:
> On 09/30/2016 12:34 PM, Junio C Hamano wrote:
>>> 2) The Linux kernel's repository has some "commit ... upstream." lines
>>> in this position (below the commit title) - for example, in commit
>>> dacc0987fd2e.
>>
>> "A group of people seem to prefer it there" does not lead
Did this ever get anywhere? Can we recursively update submodules with
"git pull" in the supermodule now?
--
Best regards,
Jeremy Morton (Jez)
On 04/06/2014 10:30, Chris Packham wrote:
Add a config option that will cause clone to recurse into submodules as
if the --recurse-submodules option ha
Pat Thoyts writes:
> I'm just starting to catch up once again. hopefully I can be
> a bit more reactive than recently. Merging 52285c83 looks fine. I'll
> stick that onto the 0.20.0 head and see what else I can pick up on top.
> There are a few from the git for windows set among others.
Nice to
Jeff King writes:
> I admit both of those are uses for git _developers_, though, not git
> _users_.
Yes, this is meant for developers and not users.
The initial question probably should have stated more explicitly,
e.g. "I am wondering if it would be helpful to developers if we add
this thing;
Lars Schneider writes:
>> If the filter process refuses to die forever when Git told it to
>> shutdown (by closing the pipe to it, for example), that filter
>> process is simply buggy. I think we want users to become aware of
>> that, instead of Git leaving it behind, which essentially is to
>>
Jeff King writes:
> I guess my point was that the poor name may have contributed to the need
> to explain it.
The comment was not about "it may not be obvious but this tries to
pad and align", but to say "the way this tries to pad and align is
based on an unsaid assumption that leads to this lim
> On 01 Oct 2016, at 22:48, Jakub Narębski wrote:
>
> W dniu 01.10.2016 o 20:59, Lars Schneider pisze:
>> On 29 Sep 2016, at 23:27, Junio C Hamano wrote:
>>> Lars Schneider writes:
>>>
>>> If the filter process refuses to die forever when Git told it to
>>> shutdown (by closing the pipe to i
On Mon, Oct 3, 2016 at 8:36 AM, Jeremy Morton wrote:
> Did this ever get anywhere? Can we recursively update submodules with "git
> pull" in the supermodule now?
I think the idea is sound.
>> diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
>> index 7ca10b8..fc2c189 1007
When using kerberos authentication, one URL pattern which is
allowed is http://@gitserver.example.com. This leads to a username
of zero-length, rather than a NULL username. But the two cases
should be treated the same by http.emptyauth.
Signed-off-by: David Turner
---
http.c | 2 +-
1 file cha
On 01/10/2016 19:19, René Scharfe wrote:
It's hard to imagine an implementation of qsort(3) that can't handle
zero elements. QSORT's safety feature is that it prevents the compiler
from removing NULL checks for the array pointer. E.g. the last two
lines in the following example could be optimi
> On 03 Oct 2016, at 19:02, Junio C Hamano wrote:
>
> Lars Schneider writes:
>
>>> If the filter process refuses to die forever when Git told it to
>>> shutdown (by closing the pipe to it, for example), that filter
>>> process is simply buggy. I think we want users to become aware of
>>> that
On 09/30/2016 01:49 PM, Junio C Hamano wrote:
Junio C Hamano writes:
Jonathan Tan writes:
I vaguely recall that there were some discussion on the definition
of "what's a trailer line" with folks from the kernel land, perhaps
while discussing the interpret-trailers topic. IIRC, when somebod
On 01/10/2016 19:19, René Scharfe wrote:
It's hard to imagine an implementation of qsort(3) that can't handle
zero elements. QSORT's safety feature is that it prevents the compiler
from removing NULL checks for the array pointer. E.g. the last two
lines in the following example could be optimiz
Stefan Beller writes:
>> * jc/attr (2016-05-25) 18 commits
>> ...
>> The attributes API has been updated so that it can later be
>> optimized using the knowledge of which attributes are queried.
>>
>> I wanted to polish this topic further to make the attribute
>> subsystem thread-ready, but b
At the moment, supermodules must reference a given commit in each of
its submodules. If one is in control of a submodule and it changes on
a regular basis, this can cause a lot of overhead with "submodule
updated" commits in the supermodule. It would be useful of git allows
the option of refe
Jeremy Morton writes:
> At the moment, supermodules must reference a given commit in each of
> its submodules. If one is in control of a submodule and it changes on
> a regular basis, this can cause a lot of overhead with "submodule
> updated" commits in the supermodule. It would be useful of g
Jonathan Tan writes:
> That sounds reasonable to me. Would a patch set to implement this new
> trailer block heuristic (in both sequencer and trailer) be reasonable?
> And if yes, should trailer know about the "(cherry picked from"
> prefix? (I can see it both ways - knowing about the "(cherry pi
Junio C Hamano writes:
> Pat Thoyts writes:
>
>> I'm just starting to catch up once again. hopefully I can be
>> a bit more reactive than recently. Merging 52285c83 looks fine. I'll
>> stick that onto the 0.20.0 head and see what else I can pick up on top.
>> There are a few from the git for win
On Mon, Oct 3, 2016 at 11:07 AM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>>> * jc/attr (2016-05-25) 18 commits
>>> ...
>>> The attributes API has been updated so that it can later be
>>> optimized using the knowledge of which attributes are queried.
>>>
>>> I wanted to polish this topi
Stefan Beller writes:
>> The minimum that would future-proof us, that is still missing from
>> the series, would probably be to separate the query parameter
>> "struct git_attr_check" and the return values from git_check_attr().
>
> Not sure what you mean here with separating as a preparation for
This series is the result of René nerd-sniping me with the claim that we
could "easily" teach count-objects to print out the list of alternates
in:
http://public-inbox.org/git/c27dc1a4-3c7a-2866-d9d8-f5d3eb161...@web.de/
My real goal is just patch 17, which is needed for the quarantine series
i
Besides being our normal style, this correctly checks for an
error exit() versus signal death.
Signed-off-by: Jeff King
---
t/t5613-info-alternate.sh | 12 ++--
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/t/t5613-info-alternate.sh b/t/t5613-info-alternate.sh
index 4548f
Our usual style when working with subdirectories is to chdir
inside a subshell or to use "git -C", which means we do not
have to constantly return to the main test directory. Let's
convert this old test, which does not follow that style.
Signed-off-by: Jeff King
---
t/t5613-info-alternate.sh | 9
These tests are just trying to show that we allow recursion
up to a certain depth, but not past it. But the counting is
a bit non-intuitive, and rather than test at the edge of the
breakage, we test "OK" cases in the middle of the chain.
Let's explain what's going on, and explicitly test the
switch
Our normal test style these days puts the opening quote of
the body on the description line, and indents the body with
a single tab. This ancient test did not follow this.
Signed-off-by: Jeff King
---
t/t5613-info-alternate.sh | 114 +-
1 file changed,
When we add a new alternate to the list, we try to normalize
out any redundant "..", etc. However, we do not look at the
return value of normalize_path_copy(), and will happily
continue with a path that could not be normalized. Worse,
the normalizing process is done in-place, so we are left
with wh
This function makes sure that "git fsck" does not report any
errors. But "--full" has been the default since f29cd39
(fsck: default to "git fsck --full", 2009-10-20), and we can
use the exit code (instead of counting the lines) since
e2b4f63 (fsck: exit with non-zero status upon errors,
2007-03-05)
This function was never used since its inception in dd05ea1
(test case for transitive info/alternates, 2006-05-07).
Which is just as well, since it mutates the repo state in a
way that would invalidate further tests, without cleaning up
after itself. Let's get rid of it so that nobody is tempted
to
The submodule code wants to temporarily add an alternate
object store to our in-memory alt_odb list, but does it
manually. Let's provide a helper so it can reuse the code in
link_alt_odb_entry().
While we're adding our new add_to_alternates_memory(), let's
document add_to_alternates_file(), as the
Allocating a struct alternate_object_database is tricky, as
we must over-allocate the buffer to provide scratch space,
and then put in particular '/' and NUL markers.
Let's encapsulate this in a function so that the complexity
doesn't leak into callers (and so that we can modify it
later).
Signed
The string handling in link_alt_odb_entry() is mostly an
artifact of the original version, which took the path as a
ptr/len combo, and did not have a NUL-terminated string
until we created one in the alternate_object_database
struct. But since 5bdf0a8 (sha1_file: normalize alt_odb
path before comp
The alternate_object_database struct holds a path to the
alternate objects, but we also use that buffer as scratch
space for forming loose object filenames. Let's pull that
logic into a helper function so that we can more easily
modify it.
Signed-off-by: Jeff King
---
sha1_file.c | 19 ++
The alternate_object_database struct uses a single buffer
both for storing the path to the alternate, and as a scratch
buffer for forming object names. This is efficient (since
otherwise we'd end up storing the path twice), but it makes
life hard for callers who just want to know the path to the
al
This function forms a sha1 as "xx/...", but skips over
the slot for the slash rather than writing it, leaving it to
the caller to do so. It also does not bother to put in a
trailing NUL, even though every caller would want it (we're
forming a path which by definition is not a directory, so
the
We pre-size the scratch buffer to hold a loose object
filename of the form "xx/...", which leads to allocation
code that is hard to verify. We have to use some magic
numbers during the initial allocation, and then writers must
blindly assume that the buffer is big enough. Using a strbuf
makes i
There's no way to get the list of alternates that git
computes internally; our tests only infer it based on which
objects are available. In addition to testing, knowing this
list may be helpful for somebody debugging their alternates
setup.
Let's add it to the "count-objects -v" output. We could g
We recursively expand alternates repositories, so that if A
borrows from B which borrows from C, A can see all objects.
For the root object database, we allow relative paths, so A
can point to B as "../B/objects". However, we currently do
not allow relative paths when recursing, so B must use an
a
It's currently the responsibility of the caller to give
fill_sha1_file() enough bytes to write into, leading them to
manually compute the required lengths. Instead, let's just
write into a strbuf so that it's impossible to get this
wrong.
The alt_odb caller already has a strbuf, so this makes
thin
On a case-insensitive filesystem, we should realize that
"a/objects" and "A/objects" are the same path. We already
use fspathcmp() to check against the main object directory,
but until recently we couldn't use it for comparing against
other alternates (because their paths were not
NUL-terminated st
Here's a v2; the original was at:
http://public-inbox.org/git/20160930193533.ynbepaago6oyc...@sigill.intra.peff.net/
which contains the rationale. The required alternate-objects patches
(both the "allow recursive relative" one, and the helper to add an
internal alt-odb) have been pushed into
This avoids "." and "..", as we already do, but also leaves
room for index-pack to store extra data in the quarantine
area (e.g., for passing back any analysis to be read by the
pre-receive hook).
Signed-off-by: Jeff King
---
tmp-objdir.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
di
This lets callers influence the environment seen by
rev-list, which will be useful when we start providing
quarantined objects.
Signed-off-by: Jeff King
---
connected.c | 1 +
connected.h | 5 +
2 files changed, 6 insertions(+)
diff --git a/connected.c b/connected.c
index 8e3e4b1..136c2ac 1
When a client pushes objects to us, index-pack checks the
objects themselves and then installs them into place. If we
then reject the push due to a pre-receive hook, we cannot
just delete the packfile; other processes may be depending
on it. We have to do a normal reachability check at this
point v
Once objects are added to the object database by a process,
they cannot easily be deleted, as we don't know what other
processes may have started referencing them. We have to
clean them up with git-gc, which will apply the usual
reachability and grace-period checks.
This patch provides an alternat
The presence of the GIT_QUARANTINE_PATH variable lets any
called programs know that they're operating in a temporary
object directory (and where that directory is).
Signed-off-by: Jeff King
---
cache.h | 1 +
tmp-objdir.c | 2 ++
2 files changed, 3 insertions(+)
diff --git a/cache.h b/cach
Stefan Beller writes:
> I am looking at the tip of jc/attr-more and for a minimum
> thread safety we'd want to change the call sites to be aware of the
> threads, i.e. instead of doing
>
static struct git_attr_check *check;
> if (!check)
> check = git_attr_check_initl("crl
Santiago Torres writes:
> Hi, Junio.
>> I however notice that there is no new tests to protect these two new
>> features from future breakages. Perhaps you want to add some in
>> [6/5]?
>
> I'll be working on this. I spent some time looking around for example
> tests for format. Are there any t
On Mon, Oct 03, 2016 at 01:19:28PM -0400, David Turner wrote:
> When using kerberos authentication, one URL pattern which is
> allowed is http://@gitserver.example.com. This leads to a username
> of zero-length, rather than a NULL username. But the two cases
> should be treated the same by http.
This seems to be because I'm now on 'pu' as of a day or two ago in
order to test the abbrev logic, but lookie here:
time git ls-remote ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
.. shows all the branches and tags ..
real 0m0.655s
user 0m0.011s
sys 0m0.004s
so the r
On Mon, Oct 3, 2016 at 2:11 PM, Linus Torvalds
wrote:
> This seems to be because I'm now on 'pu' as of a day or two ago in
> order to test the abbrev logic, but lookie here:
>
> time git ls-remote ra.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux
> .. shows all the branches and tags .
+cc Heiko
On Mon, Oct 3, 2016 at 2:17 PM, Stefan Beller wrote:
>
> * sb/push-make-submodule-check-the-default (2016-08-24) 1 commit
> - push: change submodule default to check
>
> Turn the default of "push.recurseSubmodules" to "check".
>
> Will hold to wait for hv/submodule-not-yet-pushed-
Jeff King writes:
> Here's a v2; the original was at:
>
>
> http://public-inbox.org/git/20160930193533.ynbepaago6oyc...@sigill.intra.peff.net/
>
> which contains the rationale. The required alternate-objects patches
> (both the "allow recursive relative" one, and the helper to add an
> intern
On 10/03/2016 12:17 PM, Junio C Hamano wrote:
It may be necessary for the code to analize the lines in a block
identified as "likely to be a trailing block" more carefully,
though. The example 59f0aa94 in the message you are responding to
has "Link 1:" that consists of 3 physical lines. An inst
On Mon, Oct 03, 2016 at 02:25:23PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > Here's a v2; the original was at:
> >
> >
> > http://public-inbox.org/git/20160930193533.ynbepaago6oyc...@sigill.intra.peff.net/
> >
> > which contains the rationale. The required alternate-objects patc
On Mon, Oct 3, 2016 at 1:49 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> I am looking at the tip of jc/attr-more and for a minimum
>> thread safety we'd want to change the call sites to be aware of the
>> threads, i.e. instead of doing
>>
> static struct git_attr_check *check;
>>
> -Original Message-
> From: Jeff King [mailto:p...@peff.net]
> Sent: Monday, October 03, 2016 5:01 PM
> To: David Turner
> Cc: git@vger.kernel.org; sand...@crustytoothpaste.net
> Subject: Re: [PATCH] http: http.emptyauth should allow empty (not just
> NULL) usernames
>
> On Mon, Oct 03,
Stefan Beller writes:
> // Note: git_attr_check_elem seems to be useless now, as the
> // results are not stored in there, we only make use of the `attr` key.
I do not think git_attr_check_elem would be visible to the callers,
once we split the "inquiry" and "result" like the code illust
On Mon, Oct 03, 2016 at 09:54:19PM +, David Turner wrote:
> > I dunno. The code path you are changing _only_ affects anything if the
> > http.emptyauth config is set. But I guess I just don't understand why you
> > would say "http://@gitserver"; in the first place. Is that a common thing?
>
>
Am 03.10.2016 um 19:09 schrieb Kevin Bracey:
As such, NULL checks can still be elided even with your change. If you
effectively change your example to:
if (nmemb > 1)
qsort(array, nmemb, size, cmp);
if (!array)
printf("array is NULL\n");
array may only be checked for NUL
Stefan Beller writes:
> On Mon, Oct 3, 2016 at 2:17 PM, Stefan Beller wrote:
>>
>> * sb/push-make-submodule-check-the-default (2016-08-24) 1 commit
>> - push: change submodule default to check
>>
>> Turn the default of "push.recurseSubmodules" to "check".
>>
>> Will hold to wait for hv/sub
Jonathan Tan writes:
> There are other options like checking for indentation or checking for
> balanced parentheses/brackets, but I think that these would lead to
> surprising behavior for the user (this would mean that whitespace or
> certain characters could turn a valid trailer into an invalid
On Mon, Oct 3, 2016 at 2:56 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> // Note: git_attr_check_elem seems to be useless now, as the
>> // results are not stored in there, we only make use of the `attr` key.
>
> I do not think git_attr_check_elem would be visible to the callers
> -Original Message-
> From: Jeff King [mailto:p...@peff.net]
> Sent: Monday, October 03, 2016 5:59 PM
> To: David Turner
> Cc: git@vger.kernel.org; sand...@crustytoothpaste.net
> Subject: Re: [PATCH] http: http.emptyauth should allow empty (not just
> NULL) usernames
>
> On Mon, Oct 03,
On Fri, Sep 30, 2016 at 05:19:37PM -0700, Junio C Hamano wrote:
> Introduce a mechanism, where we estimate the number of objects in
> the repository upon the first request to abbreviate an object name
> with the default setting and come up with a sane default for the
> repository. Based on the ex
The latest maintenance release Git v2.10.1 is now available at
the usual places.
The tarballs are found at:
https://www.kernel.org/pub/software/scm/git/
The following public repositories all have a copy of the 'v2.10.1'
tag and the 'maint' branch that the tag points at:
url = https://kern
Welcome to the Git development community.
This message is written by the maintainer and talks about how Git
project is managed, and how you can work with it.
* Mailing list and the community
The development is primarily done on the Git mailing list. Help
requests, feature proposals, bug reports
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 ones marked with '.' do not appear in any of
the integration branches, but I am still holding onto them.
With fixes since 2.10 accumulated
On Mon, Oct 3, 2016 at 3:27 PM, Jeff King wrote:
>
> + if (len < 0) {
> + unsigned long count = approximate_object_count();
> + len = (msb(count) + 1) / 2;
> + if (len < 0)
> + len = FALLBACK_DEFAULT_ABBREV;
> + }
that se
On Mon, Oct 03, 2016 at 03:34:03PM -0700, Linus Torvalds wrote:
> On Mon, Oct 3, 2016 at 3:27 PM, Jeff King wrote:
> >
> > + if (len < 0) {
> > + unsigned long count = approximate_object_count();
> > + len = (msb(count) + 1) / 2;
> > + if (len < 0)
Jeff King writes:
> On Mon, Oct 03, 2016 at 03:34:03PM -0700, Linus Torvalds wrote:
>
>> On Mon, Oct 3, 2016 at 3:27 PM, Jeff King wrote:
>> >
>> > + if (len < 0) {
>> > + unsigned long count = approximate_object_count();
>> > + len = (msb(count) + 1) / 2;
>> >
David Turner writes:
>> > > I dunno. The code path you are changing _only_ affects anything if
>> > > the http.emptyauth config is set. But I guess I just don't
>> > > understand why you would say "http://@gitserver"; in the first place.
>> Is that a common thing?
>> >
>> > I have no idea if it i
Junio C Hamano writes:
>Junio C Hamano writes:
>
>> Pat Thoyts writes:
>>
>>> I'm just starting to catch up once again. hopefully I can be
>>> a bit more reactive than recently. Merging 52285c83 looks fine. I'll
>>> stick that onto the 0.20.0 head and see what else I can pick up on top.
>>> The
René Scharfe writes:
>Am 03.10.2016 um 10:30 schrieb Pat Thoyts:
>> The only problem I see here is that generally git-gui tries to continue
>> to work with older versions of git as well. So adding a guard using the
>> git-version procedure should maintain that backwards compatibility.
>
>Makes se
On Mon, Oct 03, 2016 at 03:52:44PM -0700, Junio C Hamano wrote:
> Jeff King writes:
>
> > On Mon, Oct 03, 2016 at 03:34:03PM -0700, Linus Torvalds wrote:
> >
> >> On Mon, Oct 3, 2016 at 3:27 PM, Jeff King wrote:
> >> >
> >> > + if (len < 0) {
> >> > + unsigned long count = a
On Mon, Oct 03, 2016 at 09:54:19PM +, David Turner wrote:
>
> > I dunno. The code path you are changing _only_ affects anything if the
> > http.emptyauth config is set. But I guess I just don't understand why you
> > would say "http://@gitserver"; in the first place. Is that a common thing?
>
On 10/03/2016 03:13 PM, Junio C Hamano wrote:
Jonathan Tan writes:
There are other options like checking for indentation or checking for
balanced parentheses/brackets, but I think that these would lead to
surprising behavior for the user (this would mean that whitespace or
certain characters c
On Mon, Oct 03, 2016 at 03:31:02PM -0700, Junio C Hamano wrote:
> * lt/abbrev-auto (2016-10-03) 3 commits
> (merged to 'next' on 2016-10-03 at bb188d00f7)
> + abbrev: auto size the default abbreviation
> + abbrev: prepare for new world order
> + abbrev: add FALLBACK_DEFAULT_ABBREV to prepare
Pat Thoyts writes:
> I've tried to merge in these branches as they appear in your version
> although I already had one patch on top of 0.20.0 for some time. I've
> tentatively pushed this up to http://github.com/patthoyts/git-gui as
> branch 'pu' with additional stuff on top of the patches you al
Jeff King writes:
>> OK, as Linus's "count at the point of use" is already in 'next',
>> could you make it incremental with a log message?
>
> Sure. I wasn't sure if you actually liked my direction or not, so I was
> mostly just showing off what the completed one would look like.
To be quite hon
Jeff King writes:
>> * lt/abbrev-auto (2016-10-03) 3 commits
>
> I kind of expected this one to cook in next for a bit while people
> decided whether the larger hashes were irritating or not. Despite
> working on the implementation, I'm on the fence myself.
>
> I'd kind of hoped people would play
Hi Anatoly,
| Sent: Monday, October 3, 2016 5:18:44 PM
|
| Hi Josef,
|
|
| On Mon, Oct 3, 2016 at 8:36 AM, Josef Ridky wrote:
| > In several projects, we are using git mergetool for comparing files from
| > different folders.
| > Unfortunately, when we have opened three files for comparing u
1 - 100 of 119 matches
Mail list logo
