On 10/13/2016 10:43 PM, Jeff King wrote:
No problem. I do think you'll benefit a lot from packing everything into
a single pack, but it's also clear that Git was doing more work than it
needed to be. This was a known issue when we added the racy-check to
has_sha1_file(), and knew that we might ha
Reducing the scope of where we change the record separator ($/)
avoids bugs in calls which rely on the input record separator
further down, such as the 'chomp' usage in command_oneline.
This is necessary for a future change to git-svn, but exists in
Git.pm since it seems useful for gitweb and our
git-svn internals were previously not aware of repository
layout differences for users of the "git worktree" command.
Introduce this awareness by using "git rev-parse --git-path"
instead of relying on outdated uses of GIT_DIR and friends.
Thanks-to: Duy Nguyen
Reported-by: Mathieu Arnold
Signed-
+Cc Jakub since gitweb could probably take advantage of get_record
from the first patch, too. I'm not completely sure about the API
for this, though.
The following changes since commit 3cdd5d19178a54d2e51b5098d43b57571241d0ab:
Sync with maint (2016-10-11 14:55:48 -0700)
are available in the g
Hi,
How to use 'git config --global' to set default strategy like recursive.
Example:
Currently , when we want to enforce a specific strategic we need to include
its reference on the command line :
git.exe merge --strategy=recursive --strategy-option=ignore-all-space dev-local
we would like
Alexander Shopov writes:
>Signed-off-by: Alexander Shopov
>---
> lib/remote.tcl | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/lib/remote.tcl b/lib/remote.tcl
>index 4e5c784..26af8ae 100644
>--- a/lib/remote.tcl
>+++ b/lib/remote.tcl
>@@ -250,12 +250,12 @@ proc update
Schönen Tag
Dies ist die Santander Consumer Finance wir Darlehen zu 3% für beide
Unternehmen Darlehen und persönliche Darlehen bieten für Ihr Projekt und
individuellen Anforderungen der Position Darlehen anbieten zu können.
Füllen Sie das Formular aus, wenn interessiert
Vor-und Nachname:
Land
> On Wed, Oct 12, 2016 at 4:33 PM, Junio C Hamano wrote:
> so I am hoping that we won't have to do this uglier variant
---8<--- attr.h:
...
struct git_attr_result {
int check_nr;
/* Whether is was statically allocated and cannot be resized. */
int static_alloc;
const char *value[F
Dear Concern,
I am Talent Scout For BLUE SKY FILM STUDIO, Present Blue sky Studio a
Film Corporation Located in the United State, is Soliciting for the
Right to use Your Photo/Face and Personality as One of the Semi -Major
Role/ Character in our Upcoming ANIMATED Stereoscope 3D Movie-The Story
of
Duy Nguyen wrote:
> On Thu, Oct 13, 2016 at 8:52 AM, Eric Wong wrote:
> > +sub svn_dir {
> > + my $git_dir = scalar @_ ? $_[0] : $ENV{GIT_DIR};
> > + my $common = $ENV{GIT_COMMON_DIR} || "$git_dir/commondir";
> > + $git_dir .= '/'.::file_to_s($common) if -e $common;
> > +
On Thu, Oct 13, 2016 at 08:18:11PM +0200, Vegard Nossum wrote:
> > My guess is that the number is relatively high. And that would explain
> > why nobody else has really complained much; such a pattern is probably
> > uncommon.
>
> I get ~3,700 objects "they are advertising that we don't have".
>
Am 13.10.2016 um 16:56 schrieb Johannes Schindelin:
On Wed, 12 Oct 2016, Junio C Hamano wrote:
You have at least two independent changes relative to Dscho's
version.
(1) Show line breaks more prominently by avoiding "\n\n" and
breaking the string at "\n"; this matches the way how the
On Thu, Oct 13, 2016 at 01:04:43PM -0400, Jeff King wrote:
> > This patch teaches fetch to use HAS_SHA1_QUICK to sacrifice
> > accuracy for speed, in cases where we might be racy with a
> > simultaneous repack. This is similar to the fix in 0eeb077
> > (index-pack: avoid excessive re-reading of pa
On Thu, Oct 13, 2016 at 06:10:17PM +0200, Heiko Voigt wrote:
> On Fri, Oct 07, 2016 at 06:17:05PM +, David Turner wrote:
> > Presently, uninitialized submodules are materialized in the working
> > tree as empty directories. We would like to consider having them be
> > symlinks. Specifically,
Signed-off-by: Alexander Shopov
---
lib/remote.tcl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/lib/remote.tcl b/lib/remote.tcl
index 4e5c784..26af8ae 100644
--- a/lib/remote.tcl
+++ b/lib/remote.tcl
@@ -250,12 +250,12 @@ proc update_all_remotes_menu_entry {} {
On Wed, Oct 12, 2016 at 4:33 PM, Junio C Hamano wrote:
> Stefan Beller writes:
>
>> @@ -89,15 +114,20 @@ static void setup_check(void)
>>
>>
>> const char *path;
>> + struct git_attr_result *result;
>>
>> setup_check();
>> - git_check_attr(path, check);
>> +
On 10/13/2016 05:26 PM, Jeff King wrote:
On Thu, Oct 13, 2016 at 09:20:07AM +0200, Vegard Nossum wrote:
Does the patch below help?
Yes, ~2m10s -> ~1m25s when I test a git fetch this morning (the other
variation in time may be due to different CPU usage by other programs,
but I ran with/withou
On Thu, Oct 13, 2016 at 12:53:44PM -0400, Jeff King wrote:
> -- >8 --
> Subject: [PATCH] fetch: use "quick" has_sha1_file for tag following
A few comments on my own patch...
> This patch teaches fetch to use HAS_SHA1_QUICK to sacrifice
> accuracy for speed, in cases where we might be racy with a
On Thu, Oct 13, 2016 at 11:26:32AM -0400, Jeff King wrote:
> On Thu, Oct 13, 2016 at 09:20:07AM +0200, Vegard Nossum wrote:
>
> > > Does the patch below help?
> >
> > Yes, ~2m10s -> ~1m25s when I test a git fetch this morning (the other
> > variation in time may be due to different CPU usage by
On Thu, Oct 13, 2016 at 09:20:07AM +0200, Vegard Nossum wrote:
> > Does the patch below help?
>
> Yes, ~2m10s -> ~1m25s when I test a git fetch this morning (the other
> variation in time may be due to different CPU usage by other programs,
> but I ran with/without the patch multiple times and th
On Wed, Oct 12, 2016 at 10:37:33AM -0700, Junio C Hamano wrote:
> Heiko Voigt writes:
>
> >> If we do not even have these commits locally, then there is no point
> >> attempting to push, so returning 0 (i.e. it is not "needs pushing"
> >> situation) is correct but it is a but subtle. It's not "w
On Fri, Oct 07, 2016 at 06:17:05PM +, David Turner wrote:
> Presently, uninitialized submodules are materialized in the working
> tree as empty directories. We would like to consider having them be
> symlinks. Specifically, we'd like them to be symlinks into a FUSE
> filesystem which retrieve
Kevin Daudt writes:
> On Wed, Oct 12, 2016 at 07:13:22PM -0400, Jeff King wrote:
>
>> I think the answer is pretty clearly no. It's just that historically we
>> have auto-munged it into something useful. I think the viable options
>> are basically:
>>
>> 1. Tell people not to do that, and to d
On 12.10.16 18:05, David Brown wrote:
> Howdy git gurus,
>
> I have the dubious distinction of working with a remote repo (master) that
> has a class loader run-time error when cloned, built and executed.
>
> The reason for the runtime issue is a directory hierarchical path has to
> directories
On Wed, Oct 12, 2016 at 04:43:07PM +0200, Anatoly Borodin wrote:
> Hi,
>
>
> the IP will not be overwritten, you'll still have the new IP in
> master. Nothing to worry about :)
>
>
To expand on that, git does a so called 3-way merge. This means git will
look for a common base commit, and compa
On Wed, Oct 12, 2016 at 07:13:22PM -0400, Jeff King wrote:
> On Wed, Oct 12, 2016 at 01:53:52PM -0700, Junio C Hamano wrote:
>
> > Matthieu Moy writes:
> >
> > >>> If it's not in the body of the message, then where is it?
> > >>
> > >> This point is clarified in the thread
> > >> http://marc.inf
On Wed, Oct 12, 2016 at 10:18:28AM -0700, Junio C Hamano wrote:
> Heiko Voigt writes:
>
> > Which seems quite extensively long for a static function so how about
> > we shorten it a bit and add a comment:
> >
> > /* lookup or create commit object list for submodule */
> > get_commit_objec
Hi,
On Wed, 12 Oct 2016, Junio C Hamano wrote:
> Johannes Sixt writes:
>
> > Can we please have the following change instead? I think it makes sense
> > to deviate from the usual conventions in a case like this.
>
> You have at least two independent changes relative to Dscho's
> version.
>
On Thu, Oct 13, 2016 at 09:17:34AM +0200, Vegard Nossum wrote:
> Oops. I disabled gc a while ago; one reason I did that is that it takes
> a long time to run and it has a tendency to kick in at the worst time. I
> guess I should really put it in cron then.
>
> I'm not sure if this is related, but
Thanks, Khomoutov. I turned out that when I went back to version 2.7.0 of Git
(as mentioned in this post https://github.com/git-for-windows/git/issues/776)
that I no longer received the fork errors. However, then I received a
Permission error and also wasn't thrilled that I had to use an old G
Hi,
On Tue, 11 Oct 2016, Junio C Hamano wrote:
> Stefan Beller writes:
>
> > On Tue, Oct 11, 2016 at 2:06 PM, Junio C Hamano wrote:
> >>
> >> * sb/submodule-ignore-trailing-slash (2016-10-10) 2 commits
> >> (merged to 'next' on 2016-10-11 at e37425ed17)
> >> + submodule: ignore trailing sla
Hi Stefan,
On Wed, 12 Oct 2016, Stefan Beller wrote:
> On Wed, Oct 12, 2016 at 6:30 AM, Johannes Schindelin
> wrote:
> >
> > On Mon, 10 Oct 2016, Stefan Beller wrote:
> >
> >> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> >> index 444ec06..a7841a5 100644
> >> --- a/bui
Hi Junio,
On Wed, 12 Oct 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> > On Tue, 11 Oct 2016, Junio C Hamano wrote:
> >
> >> The only reason why the OPT_STRDUP appeared convenient was because
> >> options[] element happened to use a field in the structure directly.
> >> The patc
Hi Junio,
On Wed, 12 Oct 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> Hmph, didn't we recently add parse_key_value_squoted() to build
> >> read_author_script() in builtin/am.c on top of it, so that this
> >> piece of code can also take advantage of and share the parser?
> >
Hi Junio,
On Wed, 12 Oct 2016, Junio C Hamano wrote:
> Johannes Schindelin writes:
>
> >> > +const char *arg;
> >> > +int arg_len;
> >> > size_t offset_in_buf;
> >>
> >> micronit: you can make it to size_t and lose the cast below, no?
> >
> > No. The primary users of a
Hi Joshua,
On Wed, 12 Oct 2016, Joshua N Pritikin wrote:
> On Wed, Oct 12, 2016 at 06:24:37PM +0200, Johannes Schindelin wrote:
>
> > But maybe I read it all wrong and you do want to make this happen
> > yourself, and you simply want a little advice how to go about it?
>
> Ugh, if you insist.
On Thu, Oct 13, 2016 at 8:52 AM, Eric Wong wrote:
> +sub svn_dir {
> + my $git_dir = scalar @_ ? $_[0] : $ENV{GIT_DIR};
> + my $common = $ENV{GIT_COMMON_DIR} || "$git_dir/commondir";
> + $git_dir .= '/'.::file_to_s($common) if -e $common;
> + my $svn_dir = $git_dir . '/svn'
On Thu, Oct 13, 2016 at 1:50 AM, Junio C Hamano wrote:
> Junio C Hamano writes:
>
>> Dennis Kaarsemaker writes:
>>
>>> OK, so here it is as a proper patch.
>
> Here is what I queued. Duy, what do you think? It seems OK to me.
Ack. Thanks both.
--
Duy
On 10/13/2016 12:45 AM, Junio C Hamano wrote:
> Vegard Nossum writes:
>
>> A closer inspection reveals the problem to really be that this is an
>> extremely hot path with more than -- holy cow -- 4,106,756,451
>> iterations on the 'packed_git' list for a single 'git fetch' on my
>> repository. I'
On 10/13/2016 01:47 AM, Jeff King wrote:
On Wed, Oct 12, 2016 at 07:18:07PM -0400, Jeff King wrote:
Also, is it possible to make the repository in question available? I
might be able to reproduce based on your description, but it would save
time if I could directly run gdb on your example.
I
On 10/13/2016 01:01 AM, Jeff King wrote:
On Thu, Oct 13, 2016 at 12:30:52AM +0200, Vegard Nossum wrote:
However, the commit found by 'git blame' above appears just fine to me,
I haven't been able to spot a bug in it.
A closer inspection reveals the problem to really be that this is an
extremel
41 matches
Mail list logo
